Replace passphrase mismatch toast with error

Display a form error instead of a toast if the passphrase
doesn't match.

Closes #5268
// FREEBIE
This commit is contained in:
Pascal Hartig 2016-02-19 23:27:31 +00:00 committed by Moxie Marlinspike
parent ca5bd84a67
commit f2c5e904e8

View file

@ -35,7 +35,6 @@ import android.view.inputmethod.EditorInfo;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import org.thoughtcrime.securesms.components.AnimatingToggle; import org.thoughtcrime.securesms.components.AnimatingToggle;
import org.thoughtcrime.securesms.crypto.InvalidPassphraseException; import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
@ -116,8 +115,8 @@ public class PassphrasePromptActivity extends PassphraseActivity {
setMasterSecret(masterSecret); setMasterSecret(masterSecret);
} catch (InvalidPassphraseException ipe) { } catch (InvalidPassphraseException ipe) {
passphraseText.setText(""); passphraseText.setText("");
Toast.makeText(this, R.string.PassphrasePromptActivity_invalid_passphrase_exclamation, passphraseText.setError(
Toast.LENGTH_SHORT).show(); getString(R.string.PassphrasePromptActivity_invalid_passphrase_exclamation));
} }
} }