From a6f06e328be4358e55199fd8005b9b058f7ea4ba Mon Sep 17 00:00:00 2001 From: ameba23 Date: Sun, 25 Apr 2021 12:00:44 +0200 Subject: [PATCH] Dont use an observer when adding contacts --- .../recover/RestoreAccountViewModel.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/RestoreAccountViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/RestoreAccountViewModel.java index fe610ed91..beeaf22f4 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/RestoreAccountViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/RestoreAccountViewModel.java @@ -30,7 +30,7 @@ import static java.util.logging.Logger.getLogger; @MethodsNotNullByDefault @ParametersNotNullByDefault -class RestoreAccountViewModel extends AndroidViewModel implements RestoreAccount.Observer { +class RestoreAccountViewModel extends AndroidViewModel { enum State {SET_PASSWORD, DOZE, CREATED, FAILED} @@ -118,7 +118,7 @@ class RestoreAccountViewModel extends AndroidViewModel implements RestoreAccount if (accountManager.restoreAccount(identity, password)) { LOG.info("Restored account"); try { - restoreAccount.addContactsToDb(this); + restoreAccount.addContactsToDb(); } catch (DbException e) { LOG.warning("Cannot retrieve social backup"); state.postEvent(State.FAILED); @@ -130,14 +130,4 @@ class RestoreAccountViewModel extends AndroidViewModel implements RestoreAccount } }); } - - @Override - public void onAddingContactsFinished(boolean success) { - if (success) { - LOG.info("Added recovered contacts to database"); - } else { - LOG.warning("Error when adding contacts to database"); -// state.postEvent(State.FAILED); - } - } }