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

Use background tasks for automatic backups

Browse source 
That way we work around the NetworkOnMainThreadException that certain storage providers (e.g. Nextcloud) cause when called directly from the broadcast receiver
This commit is contained in:
Jakob Nixdorf 2021-03-23 07:02:06 +01:00
parent 6f67608604
commit 0c0b4455c0
No known key found for this signature in database
GPG key ID: BE99BF86574A7DBC
2 changed files with 14 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/org/shadowice/flocke/andotp/Utilities/BackupHelper.java
View file

@ -5,12 +5,10 @@ import android.net.Uri;
import androidx.documentfile.provider.DocumentFile;
import org.shadowice.flocke.andotp.Database.Entry;
import org.shadowice.flocke.andotp.R;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import javax.crypto.SecretKey;
@ -101,16 +99,9 @@ public class BackupHelper {
return Constants.BackupType.UNAVAILABLE;
}
public static boolean backupToFile(Context context, Uri uri, String password, SecretKey encryptionKey) {
ArrayList<Entry> entries = DatabaseHelper.loadDatabase(context, encryptionKey);
String plain = DatabaseHelper.entriesToString(entries);
return backupToFile(context, uri, password, plain);
}
public static boolean backupToFile(Context context, Uri uri, String password, String plain)
{
boolean success = true;
boolean success;
try {
int iter = EncryptionHelper.generateRandomIterations();

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

@ -63,10 +63,11 @@ import org.shadowice.flocke.andotp.Database.Entry;
import org.shadowice.flocke.andotp.Database.EntryList;
import org.shadowice.flocke.andotp.Dialogs.ManualEntryDialog;
import org.shadowice.flocke.andotp.R;
import org.shadowice.flocke.andotp.Tasks.EncryptedBackupTask;
import org.shadowice.flocke.andotp.Tasks.GenericBackupTask;
import org.shadowice.flocke.andotp.Utilities.BackupHelper;
import org.shadowice.flocke.andotp.Utilities.Constants;
import org.shadowice.flocke.andotp.Utilities.DatabaseHelper;
import org.shadowice.flocke.andotp.Utilities.EncryptionHelper;
import org.shadowice.flocke.andotp.Utilities.EntryThumbnail;
import org.shadowice.flocke.andotp.Utilities.Settings;
import org.shadowice.flocke.andotp.Utilities.Tools;
@ -189,25 +190,19 @@ public class EntriesCardAdapter extends RecyclerView.Adapter<EntryViewHolder>
public void saveEntries(boolean auto_backup) {
DatabaseHelper.saveDatabase(context, entries.getEntries(), encryptionKey);
if(auto_backup) {
Constants.BackupType backupType = BackupHelper.autoBackupType(context);
if (backupType == Constants.BackupType.ENCRYPTED) {
BackupHelper.BackupFile cryptBackupFile = BackupHelper.backupFile(context, settings.getBackupLocation(), Constants.BackupType.ENCRYPTED);
if(auto_backup && BackupHelper.autoBackupType(context) == Constants.BackupType.ENCRYPTED) {
EncryptedBackupTask task = new EncryptedBackupTask(context, entries.getEntries(), settings.getBackupPasswordEnc(), null);
task.setCallback(this::handleTaskResult);
if (cryptBackupFile.file != null) {
byte[] keyMaterial = encryptionKey.getEncoded();
SecretKey encryptionKey = EncryptionHelper.generateSymmetricKey(keyMaterial);
task.execute();
}
}
boolean success = BackupHelper.backupToFile(context, cryptBackupFile.file.getUri(), settings.getBackupPasswordEnc(), encryptionKey);
if (success) {
Toast.makeText(context, R.string.backup_toast_export_success, Toast.LENGTH_LONG).show();
} else {
Toast.makeText(context, R.string.backup_toast_export_failed, Toast.LENGTH_LONG).show();
}
} else {
Toast.makeText(context, cryptBackupFile.errorMessage, Toast.LENGTH_LONG).show();
}
}
private void handleTaskResult(GenericBackupTask.BackupTaskResult result) {
if (result.success) {
Toast.makeText(context, R.string.backup_toast_export_success, Toast.LENGTH_LONG).show();
} else {
Toast.makeText(context, result.messageId, Toast.LENGTH_LONG).show();
}
}