diff --git a/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupActivity.java index b7b2e4112..d0b86b316 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupActivity.java @@ -31,7 +31,7 @@ public class RemoteWipeSetupActivity extends BriarActivity implements viewModel = new ViewModelProvider(this, viewModelFactory) .get(RemoteWipeSetupViewModel.class); -// viewModel.getState().observeEvent(this, this::onStateChanged); + viewModel.getState().observe(this, this::onStateChanged); } @Override @@ -43,6 +43,7 @@ public class RemoteWipeSetupActivity extends BriarActivity implements } else { showInitialFragment(WiperSelectorFragment.newInstance()); } + } @Override @@ -57,4 +58,15 @@ public class RemoteWipeSetupActivity extends BriarActivity implements } } + private void onStateChanged(RemoteWipeSetupState state) { + if (state.equals(RemoteWipeSetupState.SUCCESS)) { + Toast.makeText(this, + "Success", + Toast.LENGTH_SHORT).show(); + } else if (state.equals(RemoteWipeSetupState.FAILED)) { + Toast.makeText(this, + "Failed", + Toast.LENGTH_SHORT).show(); + } + } } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupState.java b/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupState.java new file mode 100644 index 000000000..274f80a29 --- /dev/null +++ b/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupState.java @@ -0,0 +1,6 @@ +package org.briarproject.briar.android.remotewipe; + +public enum RemoteWipeSetupState { + FAILED, + SUCCESS +} diff --git a/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupViewModel.java index a842289e0..701a337a5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupViewModel.java @@ -16,10 +16,12 @@ import javax.inject.Inject; import androidx.annotation.NonNull; import androidx.lifecycle.AndroidViewModel; +import androidx.lifecycle.MutableLiveData; public class RemoteWipeSetupViewModel extends AndroidViewModel { private final RemoteWipeManager remoteWipeManager; private final DatabaseComponent db; + private final MutableLiveData state = new MutableLiveData<>(); @Inject RemoteWipeSetupViewModel( @@ -44,7 +46,12 @@ public class RemoteWipeSetupViewModel extends AndroidViewModel { throws DbException, FormatException { db.transaction(false, txn -> { remoteWipeManager.setup(txn, (List) wipers); + state.postValue(RemoteWipeSetupState.SUCCESS); }); } + + public MutableLiveData getState() { + return state; + } }