Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

[android] Combine Password and OpenDatabase Activity into StartupActivity

Browse Source
This commit is contained in:
Torsten Grote
2019-04-29 16:15:35 -03:00
parent 451edba467
commit 5ece6505da
41 changed files with 696 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
briar-android/src/test/java/org/briarproject/briar/android/login/PasswordFragmentTest.java → briar-android/src/test/java/org/briarproject/briar/android/account/SetPasswordFragmentTest.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.login;
package org.briarproject.briar.android.account;
import android.support.design.widget.TextInputLayout;
import android.view.View;
@@ -7,6 +7,10 @@ import android.widget.EditText;
import org.briarproject.briar.R;
import org.briarproject.briar.android.TestBriarApplication;
import org.briarproject.briar.android.account.SetPasswordFragment;
import org.briarproject.briar.android.account.SetupActivity;
import org.briarproject.briar.android.account.SetupController;
import org.briarproject.briar.android.login.StrengthMeter;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,9 +33,9 @@ import static org.robolectric.shadows.support.v4.SupportFragmentTestUtil.startFr
@RunWith(RobolectricTestRunner.class)
@Config(sdk = 21, application = TestBriarApplication.class)
public class PasswordFragmentTest {
public class SetPasswordFragmentTest {
private PasswordFragment passwordFragment = new PasswordFragment();
private SetPasswordFragment passwordFragment = new SetPasswordFragment();
private EditText passwordEntry;
private EditText passwordConfirmation;
private TextInputLayout passwordConfirmationWrapper;

3
briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java → briar-android/src/test/java/org/briarproject/briar/android/account/SetupActivityTest.java
View File

@@ -1,10 +1,11 @@
package org.briarproject.briar.android.login;
package org.briarproject.briar.android.account;
import android.support.design.widget.TextInputLayout;
import android.widget.EditText;
import org.briarproject.briar.R;
import org.briarproject.briar.android.TestBriarApplication;
import org.briarproject.briar.android.account.SetupActivity;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;

2
briar-android/src/test/java/org/briarproject/briar/android/login/SetupControllerImplTest.java → briar-android/src/test/java/org/briarproject/briar/android/account/SetupControllerImplTest.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.android.login;
package org.briarproject.briar.android.account;
import org.briarproject.bramble.api.account.AccountManager;
import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator;

2
briar-android/src/test/java/org/briarproject/briar/android/login/ChangePasswordActivityTest.java
View File

@@ -45,7 +45,7 @@ public class ChangePasswordActivityTest {
private Button changePasswordButton;
@Mock
private PasswordController passwordController;
private ChangePasswordController passwordController;
@Captor
private ArgumentCaptor<ResultHandler<Boolean>> resultCaptor;

6
briar-android/src/test/java/org/briarproject/briar/android/login/PasswordControllerImplTest.java → briar-android/src/test/java/org/briarproject/briar/android/login/ChangePasswordControllerImplTest.java
View File

@@ -14,7 +14,7 @@ import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
import static org.briarproject.bramble.util.StringUtils.getRandomString;
public class PasswordControllerImplTest extends BrambleMockTestCase {
public class ChangePasswordControllerImplTest extends BrambleMockTestCase {
private final AccountManager accountManager =
context.mock(AccountManager.class);
@@ -33,7 +33,7 @@ public class PasswordControllerImplTest extends BrambleMockTestCase {
will(returnValue(true));
}});
PasswordControllerImpl p = new PasswordControllerImpl(accountManager,
ChangePasswordControllerImpl p = new ChangePasswordControllerImpl(accountManager,
ioExecutor, estimator);
AtomicBoolean capturedResult = new AtomicBoolean(false);
@@ -48,7 +48,7 @@ public class PasswordControllerImplTest extends BrambleMockTestCase {
will(returnValue(false));
}});
PasswordControllerImpl p = new PasswordControllerImpl(accountManager,
ChangePasswordControllerImpl p = new ChangePasswordControllerImpl(accountManager,
ioExecutor, estimator);
AtomicBoolean capturedResult = new AtomicBoolean(true);

3
briar-android/src/test/java/org/briarproject/briar/android/login/TestChangePasswordActivity.java
View File

@@ -6,7 +6,8 @@ package org.briarproject.briar.android.login;
*/
public class TestChangePasswordActivity extends ChangePasswordActivity {
public void setPasswordController(PasswordController passwordController) {
public void setPasswordController(
ChangePasswordController passwordController) {
this.passwordController = passwordController;
}