From c2d9ee4f00c07bd2113bd715ee3ced1cee3d8be4 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sun, 29 Oct 2023 18:59:30 +0100 Subject: [PATCH] start all backups this starts all backups at the same time, overwriting different progress-dialogs as needed. when the last "done" arrives, the progress dialog is closed. the progress itself, is taken from the first account (this could be improved, but maybe it is just good enough) --- .../securesms/connect/DcEventCenter.java | 4 + .../AdvancedPreferenceFragment.java | 4 +- .../preferences/ChatsPreferenceFragment.java | 6 +- .../ListSummaryPreferenceFragment.java | 77 ++++++++++++------- 4 files changed, 57 insertions(+), 34 deletions(-) diff --git a/src/org/thoughtcrime/securesms/connect/DcEventCenter.java b/src/org/thoughtcrime/securesms/connect/DcEventCenter.java index 1c0fecd9c..3ca6a6a07 100644 --- a/src/org/thoughtcrime/securesms/connect/DcEventCenter.java +++ b/src/org/thoughtcrime/securesms/connect/DcEventCenter.java @@ -147,6 +147,10 @@ public class DcEventCenter { case DcContext.DC_EVENT_MSGS_NOTICED: DcHelper.getNotificationCenter(context).removeNotifications(accountId, event.getData1Int()); break; + + case DcContext.DC_EVENT_IMEX_PROGRESS: + sendToObservers(event); + return 0; } if (accountId != context.dcContext.getAccountId()) { diff --git a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java index 7975dc098..7ac7bc75c 100644 --- a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java @@ -351,7 +351,7 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment .setTitle(R.string.pref_managekeys_import_secret_keys) .setMessage(getActivity().getString(R.string.pref_managekeys_import_explain, pathAsDisplayedToUser)) .setNegativeButton(android.R.string.cancel, null) - .setPositiveButton(android.R.string.ok, (dialogInterface2, i2) -> startImex(DcContext.DC_IMEX_IMPORT_SELF_KEYS, imexPath, pathAsDisplayedToUser)) + .setPositiveButton(android.R.string.ok, (dialogInterface2, i2) -> startImexOne(DcContext.DC_IMEX_IMPORT_SELF_KEYS, imexPath, pathAsDisplayedToUser)) .show(); } @@ -385,7 +385,7 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment .setTitle(R.string.pref_managekeys_export_secret_keys) .setMessage(getActivity().getString(R.string.pref_managekeys_export_explain, DcHelper.getImexDir().getAbsolutePath())) .setNegativeButton(android.R.string.cancel, null) - .setPositiveButton(android.R.string.ok, (dialogInterface2, i2) -> startImex(DcContext.DC_IMEX_EXPORT_SELF_KEYS)) + .setPositiveButton(android.R.string.ok, (dialogInterface2, i2) -> startImexOne(DcContext.DC_IMEX_EXPORT_SELF_KEYS)) .show(); } else { diff --git a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java index b8c1d7106..cf215f34d 100644 --- a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java @@ -273,13 +273,11 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment { .setTitle(R.string.pref_backup) .setMessage(R.string.pref_backup_export_explain) .setNeutralButton(android.R.string.cancel, null) - .setPositiveButton(getActivity().getString(R.string.pref_backup_export_x, addr), (dialogInterface, i) -> startImex(DcContext.DC_IMEX_EXPORT_BACKUP)); + .setPositiveButton(getActivity().getString(R.string.pref_backup_export_x, addr), (dialogInterface, i) -> startImexOne(DcContext.DC_IMEX_EXPORT_BACKUP)); int[] allAccounts = DcHelper.getAccounts(getActivity()).getAll(); if (allAccounts.length > 1) { String exportAllString = getActivity().getString(R.string.pref_backup_export_all, allAccounts.length); - builder.setNegativeButton(exportAllString, (dialogInterface, i) -> { - // TODO: backup all accounts - }); + builder.setNegativeButton(exportAllString, (dialogInterface, i) -> startImexAll(DcContext.DC_IMEX_EXPORT_BACKUP)); } builder.show(); }) diff --git a/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java index 6972127a6..e623125c0 100644 --- a/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java @@ -98,18 +98,38 @@ public abstract class ListSummaryPreferenceFragment extends CorrectedPreferenceF pref.setSummary(pref.getEntry()); } - protected void startImex(int what) + protected int [] imexAccounts; + protected int accountsDone; + + protected void startImexAll(int what) { + imexAccounts = DcHelper.getAccounts(getActivity()).getAll(); + accountsDone = 0; + String path = DcHelper.getImexDir().getAbsolutePath(); + for (int i = 0; i < imexAccounts.length; i++) { + startImexInner(imexAccounts[i], what, path, path); + } + } + + protected void startImexOne(int what) { String path = DcHelper.getImexDir().getAbsolutePath(); - startImex(what, path, path); + startImexOne(what, path, path); + } + + protected void startImexOne(int what, String imexPath, String pathAsDisplayedToUser) { + imexAccounts = new int[]{ dcContext.getAccountId() }; + accountsDone = 0; + startImexInner(imexAccounts[0], what, imexPath, pathAsDisplayedToUser); } protected ProgressDialog progressDialog = null; protected int progressWhat = 0; protected String pathAsDisplayedToUser = ""; protected boolean imexUserAborted = false; - protected void startImex(int what, String imexPath, String pathAsDisplayedToUser) + protected void startImexInner(int accountId, int what, String imexPath, String pathAsDisplayedToUser) { + DcContext dcContext = DcHelper.getAccounts(getActivity()).getAccount(accountId); + this.pathAsDisplayedToUser = pathAsDisplayedToUser; imexUserAborted = false; notificationController = GenericForegroundService.startForegroundTask(getContext(), getString(R.string.export_backup_desktop)); @@ -131,7 +151,6 @@ public abstract class ListSummaryPreferenceFragment extends CorrectedPreferenceF progressDialog.show(); DcHelper.getAccounts(getActivity()).stopIo(); - DcHelper.getEventCenter(getActivity()).captureNextError(); dcContext.imex(progressWhat, imexPath); } @@ -140,8 +159,8 @@ public abstract class ListSummaryPreferenceFragment extends CorrectedPreferenceF if (event.getId()== DcContext.DC_EVENT_IMEX_PROGRESS) { long progress = event.getData1Int(); Context context = getActivity(); + DcContext dcContext = DcHelper.getAccounts(context).getAccount(event.getAccountId()); if (progress==0/*error/aborted*/) { - DcHelper.getEventCenter(context).endCaptureNextError(); DcHelper.getAccounts(context).startIo(); progressDialog.dismiss(); progressDialog = null; @@ -155,32 +174,34 @@ public abstract class ListSummaryPreferenceFragment extends CorrectedPreferenceF notificationController = null; } else if (progress<1000/*progress in permille*/) { - int percent = (int)progress / 10; - String formattedPercent = String.format(" %d%%", percent); - progressDialog.setMessage(getResources().getString(R.string.one_moment) + formattedPercent); - notificationController.setProgress(1000, progress, formattedPercent); + if (dcContext.getAccountId() == imexAccounts[0]) { // show progress of the first account is good enough + int percent = (int) progress / 10; + String formattedPercent = String.format(" %d%%", percent); + progressDialog.setMessage(getResources().getString(R.string.one_moment) + formattedPercent); + notificationController.setProgress(1000, progress, formattedPercent); + } } else if (progress==1000/*done*/) { - DcHelper.getEventCenter(context).endCaptureNextError(); - DcHelper.getAccounts(context).startIo(); - progressDialog.dismiss(); - progressDialog = null; - notificationController.close(); - notificationController = null; - String msg = ""; - if (progressWhat==DcContext.DC_IMEX_EXPORT_BACKUP) { - msg = context.getString(R.string.pref_backup_written_to_x, pathAsDisplayedToUser); + accountsDone++; + if (accountsDone == imexAccounts.length) { + DcHelper.getAccounts(context).startIo(); + progressDialog.dismiss(); + progressDialog = null; + notificationController.close(); + notificationController = null; + String msg = ""; + if (progressWhat == DcContext.DC_IMEX_EXPORT_BACKUP) { + msg = context.getString(R.string.pref_backup_written_to_x, pathAsDisplayedToUser); + } else if (progressWhat == DcContext.DC_IMEX_EXPORT_SELF_KEYS) { + msg = context.getString(R.string.pref_managekeys_secret_keys_exported_to_x, pathAsDisplayedToUser); + } else if (progressWhat == DcContext.DC_IMEX_IMPORT_SELF_KEYS) { + msg = context.getString(R.string.pref_managekeys_secret_keys_imported_from_x, pathAsDisplayedToUser); + } + new AlertDialog.Builder(context) + .setMessage(msg) + .setPositiveButton(android.R.string.ok, null) + .show(); } - else if (progressWhat==DcContext.DC_IMEX_EXPORT_SELF_KEYS) { - msg = context.getString(R.string.pref_managekeys_secret_keys_exported_to_x, pathAsDisplayedToUser); - } - else if (progressWhat==DcContext.DC_IMEX_IMPORT_SELF_KEYS) { - msg = context.getString(R.string.pref_managekeys_secret_keys_imported_from_x, pathAsDisplayedToUser); - } - new AlertDialog.Builder(context) - .setMessage(msg) - .setPositiveButton(android.R.string.ok, null) - .show(); } } }