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

Clean things up a bit

Browse source
This commit is contained in:
Alexander Bakker 2017-08-26 21:15:53 +02:00
parent 37e303626f
commit c0bdd261b5
24 changed files with 528 additions and 573 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,28 +1,23 @@
package me.impy.aegis.db;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
import me.impy.aegis.KeyProfile;
import me.impy.aegis.crypto.KeyInfo;
public class Database {
private static final int version = 1;
private List<DatabaseEntry> entries = new ArrayList<>();
private static final int VERSION = 1;
private List<DatabaseEntry> _entries = new ArrayList<>();
public byte[] serialize() throws JSONException, UnsupportedEncodingException {
public byte[] serialize() throws Exception {
JSONArray array = new JSONArray();
for (DatabaseEntry e : entries) {
for (DatabaseEntry e : _entries) {
array.put(e.serialize());
}
JSONObject obj = new JSONObject();
obj.put("version", version);
obj.put("version", VERSION);
obj.put("entries", array);
return obj.toString().getBytes("UTF-8");
@ -31,64 +26,30 @@ public class Database {
public void deserialize(byte[] data) throws Exception {
JSONObject obj = new JSONObject(new String(data, "UTF-8"));
// TODO: support different version deserialization providers
// TODO: support different VERSION deserialization providers
int ver = obj.getInt("version");
if (ver != version) {
if (ver != VERSION) {
throw new Exception("Unsupported version");
}
JSONArray array = obj.getJSONArray("entries");
for (int i = 0; i < array.length(); i++) {
DatabaseEntry e = new DatabaseEntry();
DatabaseEntry e = new DatabaseEntry(null);
e.deserialize(array.getJSONObject(i));
entries.add(e);
_entries.add(e);
}
}
public void addKey(KeyProfile profile) throws Exception {
DatabaseEntry e = new DatabaseEntry();
e.Name = profile.Name;
e.URL = profile.Info.getURL();
e.Order = profile.Order;
e.ID = entries.size() + 1;
profile.ID = e.ID;
entries.add(e);
public void addKey(DatabaseEntry entry) throws Exception {
entry.setID(_entries.size() + 1);
_entries.add(entry);
}
public void updateKey(KeyProfile profile) throws Exception {
DatabaseEntry e = findEntry(profile);
e.Name = profile.Name;
e.URL = profile.Info.getURL();
e.Order = profile.Order;
public void removeKey(DatabaseEntry entry) throws Exception {
_entries.remove(entry);
}
public void removeKey(KeyProfile profile) throws Exception {
DatabaseEntry e = findEntry(profile);
entries.remove(e);
}
public List<KeyProfile> getKeys() throws Exception {
List<KeyProfile> list = new ArrayList<>();
for (DatabaseEntry e : entries) {
KeyProfile profile = new KeyProfile();
profile.Name = e.Name;
profile.Info = KeyInfo.fromURL(e.URL);
profile.Order = e.Order;
profile.ID = e.ID;
list.add(profile);
}
return list;
}
private DatabaseEntry findEntry(KeyProfile profile) throws Exception {
for (DatabaseEntry e : entries) {
if (e.ID == profile.ID) {
return e;
}
}
throw new Exception("Key doesn't exist");
public List<DatabaseEntry> getKeys() throws Exception {
return _entries;
}
}