Make Database return a read-only list on getKeys()

Also move some stuff around
pull/41/head
Alexander Bakker 8 years ago
parent b3079dabc2
commit 4e10e5d514

@ -36,7 +36,7 @@ import java.util.List;
import me.impy.aegis.crypto.MasterKey; import me.impy.aegis.crypto.MasterKey;
import me.impy.aegis.db.DatabaseEntry; import me.impy.aegis.db.DatabaseEntry;
import me.impy.aegis.db.DatabaseManager; import me.impy.aegis.db.DatabaseManager;
import me.impy.aegis.ext.DatabaseImporter; import me.impy.aegis.importers.DatabaseImporter;
import me.impy.aegis.helpers.SimpleItemTouchHelperCallback; import me.impy.aegis.helpers.SimpleItemTouchHelperCallback;
import me.impy.aegis.util.ByteInputStream; import me.impy.aegis.util.ByteInputStream;
@ -337,8 +337,7 @@ public class MainActivity extends AppCompatActivity {
return bottomDialog; return bottomDialog;
} }
private void deleteProfile(int position) private void deleteProfile(int position) {
{
KeyProfile profile = _keyProfiles.get(position); KeyProfile profile = _keyProfiles.get(position);
new AlertDialog.Builder(MainActivity.this) new AlertDialog.Builder(MainActivity.this)
.setTitle("Delete entry") .setTitle("Delete entry")

@ -4,6 +4,7 @@ import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
public class Database { public class Database {
@ -49,6 +50,6 @@ public class Database {
} }
public List<DatabaseEntry> getKeys() { public List<DatabaseEntry> getKeys() {
return _entries; return Collections.unmodifiableList(_entries);
} }
} }

@ -193,7 +193,7 @@ public class DatabaseFile {
} }
private static class section { private static class section {
public byte ID; byte ID;
public byte[] Data; byte[] Data;
} }
} }

@ -1,4 +1,4 @@
package me.impy.aegis.ext; package me.impy.aegis.importers;
import java.util.List; import java.util.List;

@ -1,4 +1,4 @@
package me.impy.aegis.ext; package me.impy.aegis.importers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;

@ -1,4 +1,4 @@
package me.impy.aegis.ext; package me.impy.aegis.importers;
import android.util.Xml; import android.util.Xml;
@ -22,8 +22,8 @@ public class FreeOTPImporter extends DatabaseImporter {
} }
private static class Entry { private static class Entry {
public String Name; String Name;
public String Value; String Value;
} }
@Override @Override
Loading…
Cancel
Save