TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-16 10:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disallow zero-length passphrases.

Browse Source 
Fixes #2751
Closes #2762
This commit is contained in:
NorthwestBased 2015-03-23 19:37:31 -07:00 committed by Moxie Marlinspike
parent 472179b550
commit 6ec9ee89a7
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/strings.xml
View File

@ -251,6 +251,7 @@
<!-- PassphraseChangeActivity --> <!-- PassphraseChangeActivity -->
<string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Passphrases don\'t match!</string> <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Passphrases don\'t match!</string>
<string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Incorrect old passphrase!</string> <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Incorrect old passphrase!</string>
<string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Enter new passphrase!</string>
<!-- DeviceProvisioningActivity --> <!-- DeviceProvisioningActivity -->
<string name="DeviceProvisioningActivity_link_this_device">Link this device?</string> <string name="DeviceProvisioningActivity_link_this_device">Link this device?</string>

4
src/org/thoughtcrime/securesms/PassphraseChangeActivity.java
View File

@ -96,6 +96,10 @@ public class PassphraseChangeActivity extends PassphraseActivity {
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
this.newPassphrase.setText(""); this.newPassphrase.setText("");
this.repeatPassphrase.setText(""); this.repeatPassphrase.setText("");
} else if (passphrase.equals("")) {
Toast.makeText(getApplicationContext(),
R.string.PassphraseChangeActivity_need_new_passphrase_exclamation,
Toast.LENGTH_SHORT).show();
} else { } else {
MasterSecret masterSecret = MasterSecretUtil.changeMasterSecretPassphrase(this, original, passphrase); MasterSecret masterSecret = MasterSecretUtil.changeMasterSecretPassphrase(this, original, passphrase);
TextSecurePreferences.setPasswordDisabled(this, false); TextSecurePreferences.setPasswordDisabled(this, false);