diff options
author | Daniel Haß <daniel.hass@stzedn.de> | 2014-02-23 23:35:11 +0100 |
---|---|---|
committer | Daniel Haß <daniel.hass@stzedn.de> | 2014-02-23 23:35:11 +0100 |
commit | 1f36238a1b8cbaaf3f2b1d03eb0c9f97e64889ca (patch) | |
tree | 6087d5b2e0e572584706ba003c9c73bbb3001039 | |
parent | f7216841e3bc95a19fc8cd38dc29f1ebd832fe60 (diff) | |
download | open-keychain-1f36238a1b8cbaaf3f2b1d03eb0c9f97e64889ca.tar.gz open-keychain-1f36238a1b8cbaaf3f2b1d03eb0c9f97e64889ca.tar.bz2 open-keychain-1f36238a1b8cbaaf3f2b1d03eb0c9f97e64889ca.zip |
Replaced Toast with AppMsg in EncryptActivity
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java index 85bfba224..6db4aae90 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java @@ -63,6 +63,7 @@ import android.widget.Toast; import android.widget.ViewFlipper; import com.beardedhen.androidbootstrap.BootstrapButton; +import com.devspark.appmsg.AppMsg; public class EncryptActivity extends DrawerActivity { @@ -215,7 +216,8 @@ public class EncryptActivity extends DrawerActivity { // encrypt file based on Uri // get file path from uri - String path = FileHelper.getPath(this, uri); + //String path = FileHelper.getPath(this, uri); + String path = null; if (path != null) { mInputFilename = path; @@ -415,17 +417,17 @@ public class EncryptActivity extends DrawerActivity { mOutputFilename = guessOutputFilename(mInputFilename); if (mInputFilename.equals("")) { - Toast.makeText(this, R.string.no_file_selected, Toast.LENGTH_SHORT).show(); + AppMsg.makeText(this, R.string.no_file_selected, AppMsg.STYLE_ALERT).show(); return; } if (!mInputFilename.startsWith("content")) { File file = new File(mInputFilename); if (!file.exists() || !file.isFile()) { - Toast.makeText( + AppMsg.makeText( this, getString(R.string.error_message, - getString(R.string.error_file_not_found)), Toast.LENGTH_SHORT) + getString(R.string.error_file_not_found)), AppMsg.STYLE_ALERT) .show(); return; } @@ -438,13 +440,13 @@ public class EncryptActivity extends DrawerActivity { String passPhrase = mPassPhrase.getText().toString(); String passPhraseAgain = mPassPhraseAgain.getText().toString(); if (!passPhrase.equals(passPhraseAgain)) { - Toast.makeText(this, R.string.passphrases_do_not_match, Toast.LENGTH_SHORT).show(); + AppMsg.makeText(this, R.string.passphrases_do_not_match, AppMsg.STYLE_ALERT).show(); return; } gotPassPhrase = (passPhrase.length() != 0); if (!gotPassPhrase) { - Toast.makeText(this, R.string.passphrase_must_not_be_empty, Toast.LENGTH_SHORT) + AppMsg.makeText(this, R.string.passphrase_must_not_be_empty, AppMsg.STYLE_ALERT) .show(); return; } @@ -452,13 +454,13 @@ public class EncryptActivity extends DrawerActivity { boolean encryptIt = (mEncryptionKeyIds != null && mEncryptionKeyIds.length > 0); // for now require at least one form of encryption for files if (!encryptIt && mEncryptTarget == Id.target.file) { - Toast.makeText(this, R.string.select_encryption_key, Toast.LENGTH_SHORT).show(); + AppMsg.makeText(this, R.string.select_encryption_key, AppMsg.STYLE_ALERT).show(); return; } if (!encryptIt && mSecretKeyId == 0) { - Toast.makeText(this, R.string.select_encryption_or_signature_key, - Toast.LENGTH_SHORT).show(); + AppMsg.makeText(this, R.string.select_encryption_or_signature_key, + AppMsg.STYLE_ALERT).show(); return; } @@ -618,8 +620,8 @@ public class EncryptActivity extends DrawerActivity { output = data.getString(KeychainIntentService.RESULT_ENCRYPTED_STRING); Log.d(Constants.TAG, "output: " + output); ClipboardReflection.copyToClipboard(EncryptActivity.this, output); - Toast.makeText(EncryptActivity.this, - R.string.encryption_to_clipboard_successful, Toast.LENGTH_SHORT) + AppMsg.makeText(EncryptActivity.this, + R.string.encryption_to_clipboard_successful, AppMsg.STYLE_INFO) .show(); break; @@ -640,8 +642,8 @@ public class EncryptActivity extends DrawerActivity { break; case Id.target.file: - Toast.makeText(EncryptActivity.this, R.string.encryption_successful, - Toast.LENGTH_SHORT).show(); + AppMsg.makeText(EncryptActivity.this, R.string.encryption_successful, + AppMsg.STYLE_INFO).show(); if (mDeleteAfter.isChecked()) { // Create and show dialog to delete original file |