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

Fix the build

Browse Source 
Fixes #2787
This commit is contained in:
Moxie Marlinspike 2015-03-25 10:54:26 -07:00
parent d65a7f1a25
commit b9e6cff20c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@ -111,7 +111,7 @@
<string name="ConversationActivity_transport_insecure_mms">Insecure MMS</string> <string name="ConversationActivity_transport_insecure_mms">Insecure MMS</string>
<string name="ConversationActivity_transport_textsecure">TextSecure</string> <string name="ConversationActivity_transport_textsecure">TextSecure</string>
<string name="ConversationActivity_get_with_it">Get with it: %s</string> <string name="ConversationActivity_get_with_it">Get with it: %s</string>
<string name="ConversationActivity_lets_use_this_to_chat">Let's use this to chat: %s</string> <string name="ConversationActivity_lets_use_this_to_chat">Let\'s use this to chat: %s</string>
<string name="ConversationActivity_error_leaving_group">Error leaving group...</string> <string name="ConversationActivity_error_leaving_group">Error leaving group...</string>
<!-- ConversationFragment --> <!-- ConversationFragment -->

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

@ -98,7 +98,7 @@ public class PassphraseChangeActivity extends PassphraseActivity {
this.repeatPassphrase.setText(""); this.repeatPassphrase.setText("");
} else if (passphrase.equals("")) { } else if (passphrase.equals("")) {
Toast.makeText(getApplicationContext(), Toast.makeText(getApplicationContext(),
R.string.PassphraseChangeActivity_need_new_passphrase_exclamation, R.string.PassphraseChangeActivity_enter_new_passphrase_exclamation,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} else { } else {
MasterSecret masterSecret = MasterSecretUtil.changeMasterSecretPassphrase(this, original, passphrase); MasterSecret masterSecret = MasterSecretUtil.changeMasterSecretPassphrase(this, original, passphrase);