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

Refactored FileUtils.

Browse Source 
Removed methods that are no longer needed for Java 6, moved the remaining method into the utils directory.
This commit is contained in:
akwizgran
2015-12-10 16:21:47 +00:00
parent 912ba394c5
commit 2687e79593
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/res/layout/activity_password.xml
View File

@@ -43,10 +43,12 @@
style="?android:attr/progressBarStyleInverse" style="?android:attr/progressBarStyleInverse"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignTop="@id/btn_sign_in" android:layout_below="@id/edit_password"
android:visibility="invisible" /> android:layout_marginTop="@dimen/margin_xlarge"
android:visibility="gone" />
<TextView <TextView
android:id="@+id/forgot_password"
style="@style/BriarTextBody" style="@style/BriarTextBody"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

5
briar-android/src/org/briarproject/android/PasswordActivity.java
View File

@@ -33,7 +33,7 @@ public class PasswordActivity extends BaseActivity {
@Inject @CryptoExecutor private Executor cryptoExecutor; @Inject @CryptoExecutor private Executor cryptoExecutor;
private Button signInButton; private Button signInButton;
private ProgressBar progress; private ProgressBar progress;
private TextView title; private TextView title, forgotPassword;
private EditText password; private EditText password;
private byte[] encrypted; private byte[] encrypted;
@@ -57,6 +57,7 @@ public class PasswordActivity extends BaseActivity {
signInButton = (Button) findViewById(R.id.btn_sign_in); signInButton = (Button) findViewById(R.id.btn_sign_in);
progress = (ProgressBar) findViewById(R.id.progress_wheel); progress = (ProgressBar) findViewById(R.id.progress_wheel);
title = (TextView) findViewById(R.id.title_password); title = (TextView) findViewById(R.id.title_password);
forgotPassword = (TextView) findViewById(R.id.forgot_password);
password = (EditText) findViewById(R.id.edit_password); password = (EditText) findViewById(R.id.edit_password);
password.setOnEditorActionListener(new OnEditorActionListener() { password.setOnEditorActionListener(new OnEditorActionListener() {
@Override @Override
@@ -100,6 +101,7 @@ public class PasswordActivity extends BaseActivity {
hideSoftKeyboard(); hideSoftKeyboard();
// Replace the button with a progress bar // Replace the button with a progress bar
signInButton.setVisibility(GONE); signInButton.setVisibility(GONE);
forgotPassword.setVisibility(GONE);
progress.setVisibility(VISIBLE); progress.setVisibility(VISIBLE);
// Decrypt the database key in a background thread // Decrypt the database key in a background thread
final String password = e.toString(); final String password = e.toString();
@@ -121,6 +123,7 @@ public class PasswordActivity extends BaseActivity {
public void run() { public void run() {
title.setText(R.string.try_again); title.setText(R.string.try_again);
signInButton.setVisibility(VISIBLE); signInButton.setVisibility(VISIBLE);
forgotPassword.setVisibility(VISIBLE);
progress.setVisibility(GONE); progress.setVisibility(GONE);
password.setText(""); password.setText("");
} }