From 580b8d199928347855e3c362ad6c9033ee2b7ed8 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Mon, 7 Sep 2020 15:04:27 +1000 Subject: [PATCH 1/4] Update version number --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 595d3c0649..dfb88a97d7 100644 --- a/build.gradle +++ b/build.gradle @@ -181,8 +181,8 @@ dependencies { testImplementation 'org.robolectric:shadows-multidex:4.2' } -def canonicalVersionCode = 87 -def canonicalVersionName = "1.5.1.2" +def canonicalVersionCode = 91 +def canonicalVersionName = "1.5.1.6" def postFixSize = 10 def abiPostFix = ['armeabi-v7a' : 1, From cf62395162a1b7a129ad5608efe90c09f9a7f4a3 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Mon, 7 Sep 2020 17:53:00 +1000 Subject: [PATCH 2/4] Update version number --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index dfb88a97d7..630cfcb1eb 100644 --- a/build.gradle +++ b/build.gradle @@ -181,8 +181,8 @@ dependencies { testImplementation 'org.robolectric:shadows-multidex:4.2' } -def canonicalVersionCode = 91 -def canonicalVersionName = "1.5.1.6" +def canonicalVersionCode = 92 +def canonicalVersionName = "1.5.1.7" def postFixSize = 10 def abiPostFix = ['armeabi-v7a' : 1, From cced7d3df192625b692a7a251a204e549497a53a Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Tue, 8 Sep 2020 10:42:21 +1000 Subject: [PATCH 3/4] Fix crash the brutalist way --- res/layout/prompt_passphrase_activity.xml | 86 +++++++++---------- .../securesms/PassphrasePromptActivity.java | 24 +++--- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml index 32e1069959..fd88069b91 100644 --- a/res/layout/prompt_passphrase_activity.xml +++ b/res/layout/prompt_passphrase_activity.xml @@ -90,53 +90,53 @@ android:paddingStart="10dp" android:paddingEnd="40dp"/> - + + + + + + + + - + + + + + + + + + + - + + + + + + + + + + - + - + + + + + + + + + + + + + + diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java index 1e8f089d72..fedb1649c0 100644 --- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java +++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java @@ -76,8 +76,8 @@ public class PassphrasePromptActivity extends PassphraseActivity { private Button lockScreenButton; private EditText passphraseText; - private ImageButton showButton; - private ImageButton hideButton; +// private ImageButton showButton; +// private ImageButton hideButton; private AnimatingToggle visibilityToggle; private FingerprintManagerCompat fingerprintManager; @@ -203,11 +203,11 @@ public class PassphrasePromptActivity extends PassphraseActivity { private void initializeResources() { - ImageButton okButton = findViewById(R.id.ok_button); +// ImageButton okButton = findViewById(R.id.ok_button); Toolbar toolbar = findViewById(R.id.toolbar); - showButton = findViewById(R.id.passphrase_visibility); - hideButton = findViewById(R.id.passphrase_visibility_off); +// showButton = findViewById(R.id.passphrase_visibility); +// hideButton = findViewById(R.id.passphrase_visibility_off); visibilityToggle = findViewById(R.id.button_toggle); passphraseText = findViewById(R.id.passphrase_edit); passphraseAuthContainer = findViewById(R.id.password_auth_container); @@ -217,17 +217,17 @@ public class PassphrasePromptActivity extends PassphraseActivity { fingerprintCancellationSignal = new CancellationSignal(); fingerprintListener = new FingerprintListener(); - setSupportActionBar(toolbar); - getSupportActionBar().setTitle(""); +// setSupportActionBar(toolbar); +// getSupportActionBar().setTitle(""); SpannableString hint = new SpannableString(" " + getString(R.string.PassphrasePromptActivity_enter_passphrase)); hint.setSpan(new RelativeSizeSpan(0.9f), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); hint.setSpan(new TypefaceSpan("sans-serif"), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); passphraseText.setHint(hint); - okButton.setOnClickListener(new OkButtonClickListener()); - showButton.setOnClickListener(new ShowButtonOnClickListener()); - hideButton.setOnClickListener(new HideButtonOnClickListener()); +// okButton.setOnClickListener(new OkButtonClickListener()); +// showButton.setOnClickListener(new ShowButtonOnClickListener()); +// hideButton.setOnClickListener(new HideButtonOnClickListener()); passphraseText.setOnEditorActionListener(new PassphraseActionListener()); passphraseText.setImeActionLabel(getString(R.string.prompt_passphrase_activity__unlock), EditorInfo.IME_ACTION_DONE); @@ -316,7 +316,7 @@ public class PassphrasePromptActivity extends PassphraseActivity { private class ShowButtonOnClickListener implements OnClickListener { @Override public void onClick(View v) { - visibilityToggle.display(hideButton); +// visibilityToggle.display(hideButton); setPassphraseVisibility(true); } } @@ -324,7 +324,7 @@ public class PassphrasePromptActivity extends PassphraseActivity { private class HideButtonOnClickListener implements OnClickListener { @Override public void onClick(View v) { - visibilityToggle.display(showButton); +// visibilityToggle.display(showButton); setPassphraseVisibility(false); } } From cc199b402257b8e10f71d581fcf5be95003a549e Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Tue, 8 Sep 2020 10:43:29 +1000 Subject: [PATCH 4/4] Update version number --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 630cfcb1eb..8d5a6f88ab 100644 --- a/build.gradle +++ b/build.gradle @@ -181,8 +181,8 @@ dependencies { testImplementation 'org.robolectric:shadows-multidex:4.2' } -def canonicalVersionCode = 92 -def canonicalVersionName = "1.5.1.7" +def canonicalVersionCode = 93 +def canonicalVersionName = "1.5.2" def postFixSize = 10 def abiPostFix = ['armeabi-v7a' : 1,