From 2687e79593db1595b5f5bff508a88fba1c4de87f Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Thu, 10 Dec 2015 16:21:47 +0000
Subject: [PATCH] Refactored FileUtils.
Removed methods that are no longer needed for Java 6, moved the remaining method into the utils directory.
---
briar-android/res/layout/activity_password.xml | 6 ++++--
.../src/org/briarproject/android/PasswordActivity.java | 5 ++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/briar-android/res/layout/activity_password.xml b/briar-android/res/layout/activity_password.xml
index 5a306a79cf..e29fcb6a15 100644
--- a/briar-android/res/layout/activity_password.xml
+++ b/briar-android/res/layout/activity_password.xml
@@ -43,10 +43,12 @@
style="?android:attr/progressBarStyleInverse"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignTop="@id/btn_sign_in"
- android:visibility="invisible" />
+ android:layout_below="@id/edit_password"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ android:visibility="gone" />
<TextView
+ android:id="@+id/forgot_password"
style="@style/BriarTextBody"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/briar-android/src/org/briarproject/android/PasswordActivity.java b/briar-android/src/org/briarproject/android/PasswordActivity.java
index 4089469213..6a024f9caf 100644
--- a/briar-android/src/org/briarproject/android/PasswordActivity.java
+++ b/briar-android/src/org/briarproject/android/PasswordActivity.java
@@ -33,7 +33,7 @@ public class PasswordActivity extends BaseActivity {
@Inject @CryptoExecutor private Executor cryptoExecutor;
private Button signInButton;
private ProgressBar progress;
- private TextView title;
+ private TextView title, forgotPassword;
private EditText password;
private byte[] encrypted;
@@ -57,6 +57,7 @@ public class PasswordActivity extends BaseActivity {
signInButton = (Button) findViewById(R.id.btn_sign_in);
progress = (ProgressBar) findViewById(R.id.progress_wheel);
title = (TextView) findViewById(R.id.title_password);
+ forgotPassword = (TextView) findViewById(R.id.forgot_password);
password = (EditText) findViewById(R.id.edit_password);
password.setOnEditorActionListener(new OnEditorActionListener() {
@Override
@@ -100,6 +101,7 @@ public class PasswordActivity extends BaseActivity {
hideSoftKeyboard();
// Replace the button with a progress bar
signInButton.setVisibility(GONE);
+ forgotPassword.setVisibility(GONE);
progress.setVisibility(VISIBLE);
// Decrypt the database key in a background thread
final String password = e.toString();
@@ -121,6 +123,7 @@ public class PasswordActivity extends BaseActivity {
public void run() {
title.setText(R.string.try_again);
signInButton.setVisibility(VISIBLE);
+ forgotPassword.setVisibility(VISIBLE);
progress.setVisibility(GONE);
password.setText("");
}
--
GitLab