Remove the 'id' field from database entries as it was unused

This commit is contained in:
Alexander Bakker 2017-12-04 21:06:13 +01:00
parent f4b9d4b45c
commit b3079dabc2
2 changed files with 0 additions and 10 deletions

View file

@ -41,7 +41,6 @@ public class Database {
} }
public void addKey(DatabaseEntry entry) { public void addKey(DatabaseEntry entry) {
entry.setID(_entries.size() + 1);
_entries.add(entry); _entries.add(entry);
} }

View file

@ -8,7 +8,6 @@ import java.io.Serializable;
import me.impy.aegis.crypto.KeyInfo; import me.impy.aegis.crypto.KeyInfo;
public class DatabaseEntry implements Serializable { public class DatabaseEntry implements Serializable {
public int _id;
public String _name = ""; public String _name = "";
public String _icon = ""; public String _icon = "";
public KeyInfo _info; public KeyInfo _info;
@ -20,7 +19,6 @@ public class DatabaseEntry implements Serializable {
public JSONObject serialize() throws JSONException { public JSONObject serialize() throws JSONException {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("id", _id);
obj.put("name", _name); obj.put("name", _name);
obj.put("url", _info.getURL()); obj.put("url", _info.getURL());
obj.put("order", _order); obj.put("order", _order);
@ -28,15 +26,11 @@ public class DatabaseEntry implements Serializable {
} }
public void deserialize(JSONObject obj) throws Exception { public void deserialize(JSONObject obj) throws Exception {
_id = obj.getInt("id");
_name = obj.getString("name"); _name = obj.getString("name");
_info = KeyInfo.fromURL(obj.getString("url")); _info = KeyInfo.fromURL(obj.getString("url"));
_order = obj.getInt("order"); _order = obj.getInt("order");
} }
public int getID() {
return _id;
}
public String getName() { public String getName() {
return _name; return _name;
} }
@ -50,9 +44,6 @@ public class DatabaseEntry implements Serializable {
return _order; return _order;
} }
public void setID(int id) {
_id = id;
}
public void setName(String name) { public void setName(String name) {
_name = name; _name = name;
} }