Merge branch 'master' of github.com:open-keychain/open-keychain

2 files changed, 11 insertions, 10 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
index 8b553d273..adfffd8c9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java
@@ -29,9 +29,9 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.beardedhen.androidbootstrap.BootstrapButton;
+import com.devspark.appmsg.AppMsg;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
@@ -123,7 +123,7 @@ public class ImportKeysQrCodeFragment extends Fragment {
                     }
 
                     // fail...
-                    Toast.makeText(getActivity(), R.string.import_qr_code_wrong, Toast.LENGTH_LONG)
+                    AppMsg.makeText(getActivity(), R.string.import_qr_code_wrong, AppMsg.STYLE_ALERT)
                             .show();
                 }
 
@@ -159,7 +159,7 @@ public class ImportKeysQrCodeFragment extends Fragment {
         }
 
         if (mScannedContent == null || counter > mScannedContent.length) {
-            Toast.makeText(getActivity(), R.string.import_qr_code_start_with_one, Toast.LENGTH_LONG)
+            AppMsg.makeText(getActivity(), R.string.import_qr_code_start_with_one, AppMsg.STYLE_ALERT)
                     .show();
             return;
         }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index f8491849e..45ab0b174 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -37,7 +37,8 @@ import android.support.v7.app.ActionBarActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.Window;
-import android.widget.Toast;
+
+import com.devspark.appmsg.AppMsg;
 
 import com.devspark.appmsg.AppMsg;
 
@@ -213,8 +214,8 @@ public class ViewKeyActivity extends ActionBarActivity {
                 String fingerprint = PgpKeyHelper.convertFingerprintToHex(data);
                 content = Constants.FINGERPRINT_SCHEME + ":" + fingerprint;
             } else {
-                Toast.makeText(getApplicationContext(), "Bad key selected!",
-                        Toast.LENGTH_LONG).show();
+                AppMsg.makeText(this, "Bad key selected!",
+                        AppMsg.STYLE_ALERT).show();
                 return;
             }
         } else {
@@ -230,8 +231,8 @@ public class ViewKeyActivity extends ActionBarActivity {
                 // Android will fail with android.os.TransactionTooLargeException if key is too big
                 // see http://www.lonestarprod.com/?p=34
                 if (content.length() >= 86389) {
-                    Toast.makeText(getApplicationContext(), R.string.key_too_big_for_sharing,
-                            Toast.LENGTH_LONG).show();
+                    AppMsg.makeText(this, R.string.key_too_big_for_sharing,
+                        AppMsg.STYLE_ALERT).show();
                     return;
                 }
             } catch (ProviderHelper.NotFoundException e) {
@@ -266,8 +267,8 @@ public class ViewKeyActivity extends ActionBarActivity {
                     this, new long[]{masterKeyId});
 
             ClipboardReflection.copyToClipboard(this, keyringArmored.get(0));
-            Toast.makeText(getApplicationContext(), R.string.key_copied_to_clipboard, Toast.LENGTH_LONG)
-                    .show();
+            AppMsg.makeText(this, R.string.key_copied_to_clipboard, AppMsg.STYLE_INFO)
+                .show();
         } catch (ProviderHelper.NotFoundException e) {
             Log.e(Constants.TAG, "key not found!", e);
         }