From 9a5a1489ef7d5554b718a9620d57e4c63f8dbb42 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 11 May 2018 11:41:49 +0100
Subject: [PATCH] Remove a redundant method.
---
.../briar/android/login/PasswordFragment.java | 12 +++++++-----
.../briar/android/login/SetupController.java | 5 ++---
.../briar/android/login/SetupControllerImpl.java | 5 ++---
.../briar/android/login/PasswordFragmentTest.java | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java
index 2b9c0adebd..49c90239c9 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java
@@ -112,15 +112,17 @@ public class PasswordFragment extends SetupFragment {
@Override
public void onClick(View view) {
- if (!setupController.needToShowDozeFragment()) {
- nextButton.setVisibility(INVISIBLE);
- progressBar.setVisibility(VISIBLE);
- }
IBinder token = passwordEntry.getWindowToken();
Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
((InputMethodManager) o).hideSoftInputFromWindow(token, 0);
setupController.setPassword(passwordEntry.getText().toString());
- setupController.showDozeFragmentOrCreateAccount();
+ if (setupController.needToShowDozeFragment()) {
+ setupController.showDozeFragment();
+ } else {
+ nextButton.setVisibility(INVISIBLE);
+ progressBar.setVisibility(VISIBLE);
+ setupController.createAccount();
+ }
}
}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java
index e9681c5470..7d130b26a2 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java
@@ -22,10 +22,9 @@ public interface SetupController {
/**
* This should be called after the author name and the password have been
- * set. It decides whether to show the doze fragment or create the account
- * right away.
+ * set.
*/
- void showDozeFragmentOrCreateAccount();
+ void showDozeFragment();
/**
* This should be called after the author name and the password have been
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupControllerImpl.java
index 2d8fb420ce..a491aee7a7 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupControllerImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupControllerImpl.java
@@ -63,10 +63,9 @@ public class SetupControllerImpl extends PasswordControllerImpl
}
@Override
- public void showDozeFragmentOrCreateAccount() {
+ public void showDozeFragment() {
if (setupActivity == null) throw new IllegalStateException();
- if (needToShowDozeFragment()) setupActivity.showDozeFragment();
- else createAccount();
+ setupActivity.showDozeFragment();
}
@Override
diff --git a/briar-android/src/test/java/org/briarproject/briar/android/login/PasswordFragmentTest.java b/briar-android/src/test/java/org/briarproject/briar/android/login/PasswordFragmentTest.java
index cfad66d884..4ddc21cc97 100644
--- a/briar-android/src/test/java/org/briarproject/briar/android/login/PasswordFragmentTest.java
+++ b/briar-android/src/test/java/org/briarproject/briar/android/login/PasswordFragmentTest.java
@@ -73,7 +73,7 @@ public class PasswordFragmentTest {
// assert controller has been called properly
verify(setupController, times(1)).setPassword(safePass);
- verify(setupController, times(1)).showDozeFragmentOrCreateAccount();
+ verify(setupController, times(1)).createAccount();
}
@Test
--
GitLab