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

Refactor the database classes to be more reusable

Browse source
This commit is contained in:
Alexander Bakker 2018-10-06 22:23:38 +02:00
parent 571cf20eda
commit 0434513820
18 changed files with 311 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,14 +12,13 @@ import me.impy.aegis.otp.OtpInfoException;
public class Database {
private static final int VERSION = 1;
private DatabaseEntryList _entries = new DatabaseEntryList();
public JSONObject serialize() {
public JSONObject toJson() {
try {
JSONArray array = new JSONArray();
for (DatabaseEntry e : _entries) {
array.put(e.serialize());
array.put(e.toJson());
}
JSONObject obj = new JSONObject();
@ -31,8 +30,9 @@ public class Database {
}
}
public void deserialize(JSONObject obj) throws DatabaseException {
// TODO: support different VERSION deserialization providers
public static Database fromJson(JSONObject obj) throws DatabaseException {
Database db = new Database();
try {
int ver = obj.getInt("version");
if (ver != VERSION) {
@ -41,13 +41,14 @@ public class Database {
JSONArray array = obj.getJSONArray("entries");
for (int i = 0; i < array.length(); i++) {
DatabaseEntry entry = new DatabaseEntry(null);
entry.deserialize(array.getJSONObject(i));
addEntry(entry);
DatabaseEntry entry = DatabaseEntry.fromJson(array.getJSONObject(i));
db.addEntry(entry);
}
} catch (Base64Exception | OtpInfoException | JSONException e) {
throw new DatabaseException(e);
}
return db;
}
public void addEntry(DatabaseEntry entry) {