moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-01-31 07:00:24 -05:00
Code Issues Releases Wiki Activity

Merge pull request #296 from danielhass/master

Browse Source 
Replaced Toasts with AppMsg library in EncryptActivity
This commit is contained in:
Dominik Schürmann 2014-02-24 00:13:02 +01:00
commit 16284f0cfd
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
View File

@ -63,6 +63,7 @@ import android.widget.Toast;
import android.widget.ViewFlipper; import android.widget.ViewFlipper;
import com.beardedhen.androidbootstrap.BootstrapButton; import com.beardedhen.androidbootstrap.BootstrapButton;
import com.devspark.appmsg.AppMsg;
public class EncryptActivity extends DrawerActivity { public class EncryptActivity extends DrawerActivity {
@ -415,17 +416,17 @@ public class EncryptActivity extends DrawerActivity {
mOutputFilename = guessOutputFilename(mInputFilename); mOutputFilename = guessOutputFilename(mInputFilename);
if (mInputFilename.equals("")) { 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; return;
} }
if (!mInputFilename.startsWith("content")) { if (!mInputFilename.startsWith("content")) {
File file = new File(mInputFilename); File file = new File(mInputFilename);
if (!file.exists() || !file.isFile()) { if (!file.exists() || !file.isFile()) {
Toast.makeText( AppMsg.makeText(
this, this,
getString(R.string.error_message, 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(); .show();
return; return;
} }
@ -438,13 +439,13 @@ public class EncryptActivity extends DrawerActivity {
String passPhrase = mPassPhrase.getText().toString(); String passPhrase = mPassPhrase.getText().toString();
String passPhraseAgain = mPassPhraseAgain.getText().toString(); String passPhraseAgain = mPassPhraseAgain.getText().toString();
if (!passPhrase.equals(passPhraseAgain)) { 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; return;
} }
gotPassPhrase = (passPhrase.length() != 0); gotPassPhrase = (passPhrase.length() != 0);
if (!gotPassPhrase) { 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(); .show();
return; return;
} }
@ -452,13 +453,13 @@ public class EncryptActivity extends DrawerActivity {
boolean encryptIt = (mEncryptionKeyIds != null && mEncryptionKeyIds.length > 0); boolean encryptIt = (mEncryptionKeyIds != null && mEncryptionKeyIds.length > 0);
// for now require at least one form of encryption for files // for now require at least one form of encryption for files
if (!encryptIt && mEncryptTarget == Id.target.file) { 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; return;
} }
if (!encryptIt && mSecretKeyId == 0) { if (!encryptIt && mSecretKeyId == 0) {
Toast.makeText(this, R.string.select_encryption_or_signature_key, AppMsg.makeText(this, R.string.select_encryption_or_signature_key,
Toast.LENGTH_SHORT).show(); AppMsg.STYLE_ALERT).show();
return; return;
} }
@ -618,8 +619,8 @@ public class EncryptActivity extends DrawerActivity {
output = data.getString(KeychainIntentService.RESULT_ENCRYPTED_STRING); output = data.getString(KeychainIntentService.RESULT_ENCRYPTED_STRING);
Log.d(Constants.TAG, "output: " + output); Log.d(Constants.TAG, "output: " + output);
ClipboardReflection.copyToClipboard(EncryptActivity.this, output); ClipboardReflection.copyToClipboard(EncryptActivity.this, output);
Toast.makeText(EncryptActivity.this, AppMsg.makeText(EncryptActivity.this,
R.string.encryption_to_clipboard_successful, Toast.LENGTH_SHORT) R.string.encryption_to_clipboard_successful, AppMsg.STYLE_INFO)
.show(); .show();
break; break;
@ -640,8 +641,8 @@ public class EncryptActivity extends DrawerActivity {
break; break;
case Id.target.file: case Id.target.file:
Toast.makeText(EncryptActivity.this, R.string.encryption_successful, AppMsg.makeText(EncryptActivity.this, R.string.encryption_successful,
Toast.LENGTH_SHORT).show(); AppMsg.STYLE_INFO).show();
if (mDeleteAfter.isChecked()) { if (mDeleteAfter.isChecked()) {
// Create and show dialog to delete original file // Create and show dialog to delete original file