luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-06-10 00:27:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a couple of bugs in the new profile edit activity

Browse source
This commit is contained in:
Alexander Bakker 2017-12-27 23:01:23 +01:00
parent 418f5aed29
commit db54d38c14
6 changed files with 39 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/me/impy/aegis/db/Database.java
View file

@ -27,6 +27,10 @@ public class Database {
}
public void deserialize(byte[] data) throws Exception {
deserialize(data, true);
}
public void deserialize(byte[] data, boolean incCount) throws Exception {
JSONObject obj = new JSONObject(new String(data, "UTF-8"));
// TODO: support different VERSION deserialization providers
@ -39,7 +43,15 @@ public class Database {
for (int i = 0; i < array.length(); i++) {
DatabaseEntry entry = new DatabaseEntry(null);
entry.deserialize(array.getJSONObject(i));
addKey(entry);
// if incCount is false, don't increment the counter and don't set an ID
// this is used by the database importer to prevent an exception down the line
// TODO: find a better solution for this ugly hack
if (incCount) {
addKey(entry);
} else {
_entries.add(entry);
}
}
}