diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-13 18:52:57 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-13 18:52:57 +0200 |
| commit | 05a3163f1757d2ef398830600c2e68f1e8110130 (patch) | |
| tree | b7ed44df2404810220c4c48e1b4002748d33f72c | |
| parent | be46eabdb51918b668773607720ce71f530c4feb (diff) | |
| parent | 9c3a614ac53c4cc8fb4f5158032e5d524261790c (diff) | |
| download | open-keychain-05a3163f1757d2ef398830600c2e68f1e8110130.tar.gz open-keychain-05a3163f1757d2ef398830600c2e68f1e8110130.tar.bz2 open-keychain-05a3163f1757d2ef398830600c2e68f1e8110130.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
2 files changed, 6 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java index 8f0a3ab8d..d5d02081a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java @@ -24,7 +24,8 @@ import android.os.Handler; import android.os.Message; import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentManager; -import android.widget.Toast; + +import com.devspark.appmsg.AppMsg; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment; @@ -99,9 +100,9 @@ public class KeychainIntentServiceHandler extends Handler { // show error from service if (data.containsKey(DATA_ERROR)) { - Toast.makeText(mActivity, + AppMsg.makeText(mActivity, mActivity.getString(R.string.error_message, data.getString(DATA_ERROR)), - Toast.LENGTH_SHORT).show(); + AppMsg.STYLE_ALERT).show(); } break; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java index ddc326acf..daa48b526 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java @@ -108,11 +108,11 @@ public class DecryptMessageFragment extends DecryptFragment { mCiphertext = matcher.group(1); decryptStart(null); } else { - AppMsg.makeText(getActivity(), R.string.error_invalid_data, AppMsg.STYLE_INFO) + AppMsg.makeText(getActivity(), R.string.error_invalid_data, AppMsg.STYLE_ALERT) .show(); } } else { - AppMsg.makeText(getActivity(), R.string.error_invalid_data, AppMsg.STYLE_INFO) + AppMsg.makeText(getActivity(), R.string.error_invalid_data, AppMsg.STYLE_ALERT) .show(); } } |