TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-22 07:57:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for NPE which should never happen, but apparently does.

Browse Source
This commit is contained in:
Moxie Marlinspike 2012-08-07 19:06:23 -07:00
parent f4de6c8d84
commit b4e48f9dba
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@
package org.thoughtcrime.securesms; package org.thoughtcrime.securesms;
import android.os.Bundle; import android.os.Bundle;
import android.text.Editable;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.widget.Button; import android.widget.Button;
@ -59,7 +60,8 @@ public class PassphrasePromptActivity extends PassphraseActivity {
private class OkButtonClickListener implements OnClickListener { private class OkButtonClickListener implements OnClickListener {
public void onClick(View v) { public void onClick(View v) {
try { try {
String passphrase = passphraseText.getText().toString(); Editable text = passphraseText.getText();
String passphrase = (text == null ? "" : text.toString());
MasterSecret masterSecret = MasterSecretUtil.getMasterSecret(PassphrasePromptActivity.this, passphrase); MasterSecret masterSecret = MasterSecretUtil.getMasterSecret(PassphrasePromptActivity.this, passphrase);
MemoryCleaner.clean(passphrase); MemoryCleaner.clean(passphrase);