kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unify the saveEntries function for the adapter

Browse source
This commit is contained in:
Jakob Nixdorf 2019-10-30 11:52:59 +01:00
parent 3516b7b90d
commit 2ea3761256
No known key found for this signature in database
GPG key ID: BE99BF86574A7DBC
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java
View file

@ -379,7 +379,6 @@ public class MainActivity extends BaseActivity
e.updateOTP();
e.setLastUsed(System.currentTimeMillis());
adapter.addEntry(e);
adapter.saveEntries();
refreshTags();
} catch (Exception e) {
Toast.makeText(this, R.string.toast_invalid_qr_code, Toast.LENGTH_LONG).show();

21
app/src/main/java/org/shadowice/flocke/andotp/View/EntriesCardAdapter.java
View file

@ -119,6 +119,7 @@ public class EntriesCardAdapter extends RecyclerView.Adapter<EntryViewHolder>
if (! entries.contains(e)) {
entries.add(e);
entriesChanged();
saveEntries(true);
} else {
Toast.makeText(context, R.string.toast_entry_exists, Toast.LENGTH_LONG).show();
}
@ -134,10 +135,10 @@ public class EntriesCardAdapter extends RecyclerView.Adapter<EntryViewHolder>
notifyDataSetChanged();
}
public void saveEntries() {
public void saveEntries(boolean auto_backup) {
DatabaseHelper.saveDatabase(context, entries, encryptionKey);
if(settings.getAutoBackupEncryptedPasswordsEnabled()) {
if(auto_backup && settings.getAutoBackupEncryptedPasswordsEnabled()) {
Constants.BackupType backupType = BackupHelper.autoBackupType(context);
if (backupType == Constants.BackupType.ENCRYPTED) {
Uri backupFilename = Tools.buildUri(settings.getBackupDir(), BackupHelper.backupFilename(context, Constants.BackupType.ENCRYPTED));
@ -286,7 +287,7 @@ public class EntriesCardAdapter extends RecyclerView.Adapter<EntryViewHolder>
realEntry.setCounter(counter);
realEntry.updateOTP();
DatabaseHelper.saveDatabase(context, entries, encryptionKey);
saveEntries(false);
}
@Override
@ -348,7 +349,7 @@ public class EntriesCardAdapter extends RecyclerView.Adapter<EntryViewHolder>
Entry e = entries.get(realIndex);
e.setCounter(newCounter);
DatabaseHelper.saveDatabase(context, entries, encryptionKey);
saveEntries(false);
}
})
.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
@ -366,7 +367,7 @@ public class EntriesCardAdapter extends RecyclerView.Adapter<EntryViewHolder>
displayedEntries.get(position).setLastUsed(timeStamp);
entries.get(realIndex).setLastUsed(timeStamp);
DatabaseHelper.saveDatabase(context, entries, encryptionKey);
saveEntries(false);
if (sortMode == SortMode.LAST_USED) {
displayedEntries = sortEntries(displayedEntries);
@ -385,7 +386,7 @@ public class EntriesCardAdapter extends RecyclerView.Adapter<EntryViewHolder>
displayedEntries = new ArrayList<>(entries);
notifyItemMoved(fromPosition, toPosition);
DatabaseHelper.saveDatabase(context, entries, encryptionKey);
saveEntries(false);
}
return true;
@ -425,7 +426,7 @@ public class EntriesCardAdapter extends RecyclerView.Adapter<EntryViewHolder>
Entry e = entries.get(realIndex);
e.setLabel(newLabel);
DatabaseHelper.saveDatabase(context, entries, encryptionKey);
saveEntries(false);
}
})
.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
@ -511,7 +512,7 @@ public class EntriesCardAdapter extends RecyclerView.Adapter<EntryViewHolder>
Entry e = entries.get(realIndex);
e.setThumbnail(thumbnail);
DatabaseHelper.saveDatabase(context, entries, encryptionKey);
saveEntries(false);
notifyItemChanged(pos);
alert.cancel();
}
@ -539,7 +540,7 @@ public class EntriesCardAdapter extends RecyclerView.Adapter<EntryViewHolder>
@Override
public Object call() throws Exception {
entries.get(realPos).setTags(tagsAdapter.getActiveTags());
DatabaseHelper.saveDatabase(context, entries, encryptionKey);
saveEntries(false);
List<String> inUseTags = getTags();
@ -584,7 +585,7 @@ public class EntriesCardAdapter extends RecyclerView.Adapter<EntryViewHolder>
notifyItemRemoved(pos);
entries.remove(realIndex);
DatabaseHelper.saveDatabase(context, entries, encryptionKey);
saveEntries(false);
}
})
.setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {

2
app/src/main/java/org/shadowice/flocke/andotp/View/ManualEntryDialog.java
View file

@ -203,7 +203,6 @@ public class ManualEntryDialog {
e.updateOTP();
e.setLastUsed(System.currentTimeMillis());
adapter.addEntry(e);
adapter.saveEntries();
callingActivity.refreshTags();
} else if (type == Entry.OTPType.HOTP) {
@ -213,7 +212,6 @@ public class ManualEntryDialog {
e.updateOTP();
e.setLastUsed(System.currentTimeMillis());
adapter.addEntry(e);
adapter.saveEntries();
}
}
})