kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-10 16:02:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Crash after update due to conflicts in default.json.bak file

Browse Source
This commit is contained in:
MohitMali 2023-02-02 16:20:57 +05:30 committed by Kelson
parent d444285d35
commit d4ed327eac
2 changed files with 35 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
core/objectbox-models/default.json
View File

@ -111,14 +111,12 @@
{ {
"id": "3:452531964346972307", "id": "3:452531964346972307",
"name": "active", "name": "active",
"type": 1, "type": 1
"flags": 4
}, },
{ {
"id": "4:8812214350305159407", "id": "4:8812214350305159407",
"name": "occurencesOfLanguage", "name": "occurencesOfLanguage",
"type": 5, "type": 5
"flags": 4
} }
], ],
"relations": [] "relations": []
@ -167,8 +165,7 @@
{ {
"id": "9:6094002746638656105", "id": "9:6094002746638656105",
"name": "timeStamp", "name": "timeStamp",
"type": 6, "type": 6
"flags": 4
}, },
{ {
"id": "10:8395372122440621469", "id": "10:8395372122440621469",
@ -325,32 +322,27 @@
{ {
"id": "16:217454020763036675", "id": "16:217454020763036675",
"name": "etaInMilliSeconds", "name": "etaInMilliSeconds",
"type": 6, "type": 6
"flags": 4
}, },
{ {
"id": "17:1136630637198901642", "id": "17:1136630637198901642",
"name": "bytesDownloaded", "name": "bytesDownloaded",
"type": 6, "type": 6
"flags": 4
}, },
{ {
"id": "18:8939019296899137627", "id": "18:8939019296899137627",
"name": "totalSizeOfDownload", "name": "totalSizeOfDownload",
"type": 6, "type": 6
"flags": 4
}, },
{ {
"id": "19:3378789699620971394", "id": "19:3378789699620971394",
"name": "status", "name": "status",
"type": 5, "type": 5
"flags": 2
}, },
{ {
"id": "20:6867355950440828062", "id": "20:6867355950440828062",
"name": "error", "name": "error",
"type": 5, "type": 5
"flags": 2
}, },
{ {
"id": "21:5555873126720275555", "id": "21:5555873126720275555",
@ -360,14 +352,12 @@
{ {
"id": "22:2724607601244650879", "id": "22:2724607601244650879",
"name": "downloadId", "name": "downloadId",
"type": 6, "type": 6
"flags": 4
}, },
{ {
"id": "23:5485468735259326535", "id": "23:5485468735259326535",
"name": "progress", "name": "progress",
"type": 5, "type": 5
"flags": 4
}, },
{ {
"id": "24:4272820830206771469", "id": "24:4272820830206771469",
@ -423,7 +413,7 @@
} }
], ],
"lastEntityId": "10:3205842982118792800", "lastEntityId": "10:3205842982118792800",
"lastIndexId": "4:4868787482832538530", "lastIndexId": "5:7599267150617990347",
"lastRelationId": "0:0", "lastRelationId": "0:0",
"lastSequenceId": "0:0", "lastSequenceId": "0:0",
"modelVersion": 5, "modelVersion": 5,
@ -437,7 +427,8 @@
1293695782925933448, 1293695782925933448,
3655049272366703856, 3655049272366703856,
7576716732364166705, 7576716732364166705,
4868787482832538530 4868787482832538530,
7599267150617990347
], ],
"retiredPropertyUids": [ "retiredPropertyUids": [
4712434661554562781, 4712434661554562781,

51
core/objectbox-models/default.json.bak
View File

@ -111,14 +111,12 @@
{ {
"id": "3:452531964346972307", "id": "3:452531964346972307",
"name": "active", "name": "active",
"type": 1, "type": 1
"flags": 4
}, },
{ {
"id": "4:8812214350305159407", "id": "4:8812214350305159407",
"name": "occurencesOfLanguage", "name": "occurencesOfLanguage",
"type": 5, "type": 5
"flags": 4
} }
], ],
"relations": [] "relations": []
@ -167,8 +165,7 @@
{ {
"id": "9:6094002746638656105", "id": "9:6094002746638656105",
"name": "timeStamp", "name": "timeStamp",
"type": 6, "type": 6
"flags": 4
}, },
{ {
"id": "10:8395372122440621469", "id": "10:8395372122440621469",
@ -325,32 +322,27 @@
{ {
"id": "16:217454020763036675", "id": "16:217454020763036675",
"name": "etaInMilliSeconds", "name": "etaInMilliSeconds",
"type": 6, "type": 6
"flags": 4
}, },
{ {
"id": "17:1136630637198901642", "id": "17:1136630637198901642",
"name": "bytesDownloaded", "name": "bytesDownloaded",
"type": 6, "type": 6
"flags": 4
}, },
{ {
"id": "18:8939019296899137627", "id": "18:8939019296899137627",
"name": "totalSizeOfDownload", "name": "totalSizeOfDownload",
"type": 6, "type": 6
"flags": 4
}, },
{ {
"id": "19:3378789699620971394", "id": "19:3378789699620971394",
"name": "status", "name": "status",
"type": 5, "type": 5
"flags": 2
}, },
{ {
"id": "20:6867355950440828062", "id": "20:6867355950440828062",
"name": "error", "name": "error",
"type": 5, "type": 5
"flags": 2
}, },
{ {
"id": "21:5555873126720275555", "id": "21:5555873126720275555",
@ -360,14 +352,12 @@
{ {
"id": "22:2724607601244650879", "id": "22:2724607601244650879",
"name": "downloadId", "name": "downloadId",
"type": 6, "type": 6
"flags": 4
}, },
{ {
"id": "23:5485468735259326535", "id": "23:5485468735259326535",
"name": "progress", "name": "progress",
"type": 5, "type": 5
"flags": 4
}, },
{ {
"id": "24:4272820830206771469", "id": "24:4272820830206771469",
@ -379,7 +369,7 @@
}, },
{ {
"id": "10:3205842982118792800", "id": "10:3205842982118792800",
"lastPropertyId": "8:4304230668306976620", "lastPropertyId": "9:5286545520416917562",
"name": "NotesEntity", "name": "NotesEntity",
"properties": [ "properties": [
{ {
@ -401,12 +391,9 @@
{ {
"id": "5:7998345745727500384", "id": "5:7998345745727500384",
"name": "noteTitle", "name": "noteTitle",
"type": 9 "indexId": "5:7599267150617990347",
}, "type": 9,
{ "flags": 2080
"id": "6:1899740026144478138",
"name": "noteBody",
"type": 9
}, },
{ {
"id": "7:2160052450778801841", "id": "7:2160052450778801841",
@ -417,13 +404,18 @@
"id": "8:4304230668306976620", "id": "8:4304230668306976620",
"name": "noteFilePath", "name": "noteFilePath",
"type": 9 "type": 9
},
{
"id": "9:5286545520416917562",
"name": "zimUrl",
"type": 9
} }
], ],
"relations": [] "relations": []
} }
], ],
"lastEntityId": "10:3205842982118792800", "lastEntityId": "10:3205842982118792800",
"lastIndexId": "4:4868787482832538530", "lastIndexId": "5:7599267150617990347",
"lastRelationId": "0:0", "lastRelationId": "0:0",
"lastSequenceId": "0:0", "lastSequenceId": "0:0",
"modelVersion": 5, "modelVersion": 5,
@ -481,7 +473,8 @@
3582932035787057158, 3582932035787057158,
8819082642546094709, 8819082642546094709,
7233601933599801875, 7233601933599801875,
4335394620556092321 4335394620556092321,
1899740026144478138
], ],
"retiredRelationUids": [], "retiredRelationUids": [],
"version": 1 "version": 1