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

Don't add new entries to the view if restoring from instance state

Browse source 
Also addresses other potential issues with the same cause. Fixes #363.
This commit is contained in:
Alexander Bakker 2020-05-24 20:24:04 +02:00
parent 6a2992530e
commit 34718a7b89
3 changed files with 45 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
View file

@ -215,6 +215,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
private void onPreferencesResult(Intent data) { private void onPreferencesResult(Intent data) {
// refresh the entire entry list if needed // refresh the entire entry list if needed
if (_loaded) {
if (data.getBooleanExtra("needsRecreate", false)) { if (data.getBooleanExtra("needsRecreate", false)) {
recreate(); recreate();
} else if (data.getBooleanExtra("needsRefresh", false)) { } else if (data.getBooleanExtra("needsRefresh", false)) {
@ -235,6 +236,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
_entryListView.refresh(true); _entryListView.refresh(true);
} }
} }
}
private void startEditEntryActivity(int requestCode, VaultEntry entry, boolean isNew) { private void startEditEntryActivity(int requestCode, VaultEntry entry, boolean isNew) {
Intent intent = new Intent(this, EditEntryActivity.class); Intent intent = new Intent(this, EditEntryActivity.class);
@ -254,20 +256,25 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
} else { } else {
for (VaultEntry entry : entries) { for (VaultEntry entry : entries) {
_vault.addEntry(entry); _vault.addEntry(entry);
if (_loaded) {
_entryListView.addEntry(entry); _entryListView.addEntry(entry);
} }
}
saveVault(); saveVault();
} }
} }
private void onAddEntryResult(Intent data) { private void onAddEntryResult(Intent data) {
if (_loaded) {
UUID entryUUID = (UUID) data.getSerializableExtra("entryUUID"); UUID entryUUID = (UUID) data.getSerializableExtra("entryUUID");
VaultEntry entry = _vault.getEntryByUUID(entryUUID); VaultEntry entry = _vault.getEntryByUUID(entryUUID);
_entryListView.addEntry(entry); _entryListView.addEntry(entry);
} }
}
private void onEditEntryResult(Intent data) { private void onEditEntryResult(Intent data) {
if (_loaded) {
UUID entryUUID = (UUID) data.getSerializableExtra("entryUUID"); UUID entryUUID = (UUID) data.getSerializableExtra("entryUUID");
if (data.getBooleanExtra("delete", false)) { if (data.getBooleanExtra("delete", false)) {
@ -277,6 +284,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
_entryListView.replaceEntry(entryUUID, entry); _entryListView.replaceEntry(entryUUID, entry);
} }
} }
}
private void onScanImageResult(Intent intent) { private void onScanImageResult(Intent intent) {
Uri inputFile = (intent.getData()); Uri inputFile = (intent.getData());
@ -615,11 +623,12 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
} }
private void loadEntries() { private void loadEntries() {
List<VaultEntry> entries = new ArrayList<>(_vault.getEntries()); if (!_loaded) {
_entryListView.addEntries(entries); _entryListView.addEntries(_vault.getEntries());
_entryListView.runEntriesAnimation(); _entryListView.runEntriesAnimation();
_loaded = true; _loaded = true;
} }
}
private void startAuthActivity() { private void startAuthActivity() {
Intent intent = new Intent(this, AuthActivity.class); Intent intent = new Intent(this, AuthActivity.class);

3
app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
View file

@ -18,6 +18,7 @@ import com.beemdevelopment.aegis.otp.TotpInfo;
import com.beemdevelopment.aegis.vault.VaultEntry; import com.beemdevelopment.aegis.vault.VaultEntry;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
@ -127,7 +128,7 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
checkPeriodUniformity(); checkPeriodUniformity();
} }
public void addEntries(List<VaultEntry> entries) { public void addEntries(Collection<VaultEntry> entries) {
_entries.addAll(entries); _entries.addAll(entries);
updateShownEntries(); updateShownEntries();
checkPeriodUniformity(true); checkPeriodUniformity(true);

3
app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
View file

@ -33,6 +33,7 @@ import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader;
import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.util.ViewPreloadSizeProvider; import com.bumptech.glide.util.ViewPreloadSizeProvider;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
@ -253,7 +254,7 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
updateEmptyState(); updateEmptyState();
} }
public void addEntries(List<VaultEntry> entries) { public void addEntries(Collection<VaultEntry> entries) {
_adapter.addEntries(entries); _adapter.addEntries(entries);
updateEmptyState(); updateEmptyState();
} }