Merge branch 'development' into linked-identities

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java

6 files changed, 16 insertions, 16 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java
index 2e6181f07..c0e2fd29c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java
@@ -118,7 +118,7 @@ public class LinkedIdCreateDnsStep2Fragment extends LinkedIdCreateFinalFragment
 
     private void proofToClipboard() {
         ClipboardReflection.copyToClipboard(getActivity(), mResourceString);
-        Notify.showNotify(getActivity(), R.string.linked_text_clipboard, Notify.Style.OK);
+        Notify.create(getActivity(), R.string.linked_text_clipboard, Notify.Style.OK).show();
     }
 
     private void saveFile(Uri uri) {
@@ -127,10 +127,10 @@ public class LinkedIdCreateDnsStep2Fragment extends LinkedIdCreateFinalFragment
                     new PrintWriter(getActivity().getContentResolver().openOutputStream(uri));
             out.print(mResourceString);
             if (out.checkError()) {
-                Notify.showNotify(getActivity(), "Error writing file!", Style.ERROR);
+                Notify.create(getActivity(), "Error writing file!", Style.ERROR).show();
             }
         } catch (FileNotFoundException e) {
-            Notify.showNotify(getActivity(), "File could not be opened for writing!", Style.ERROR);
+            Notify.create(getActivity(), "File could not be opened for writing!", Style.ERROR).show();
             e.printStackTrace();
         }
     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java
index 28fbe6f19..99e770857 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java
@@ -168,7 +168,7 @@ public abstract class LinkedIdCreateFinalFragment extends Fragment {
     private void startCertify() {
 
         if (mVerifiedResource == null) {
-            Notify.showNotify(getActivity(), R.string.linked_need_verify, Notify.Style.ERROR);
+            Notify.create(getActivity(), R.string.linked_need_verify, Notify.Style.ERROR).show();
             return;
         }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateGithubStep1Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateGithubStep1Fragment.java
index 86a514fa9..77eccf3be 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateGithubStep1Fragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateGithubStep1Fragment.java
@@ -80,14 +80,14 @@ public class LinkedIdCreateGithubStep1Fragment extends Fragment {
                         super.onPostExecute(result);
 
                         if (result == null) {
-                            Notify.showNotify(getActivity(),
-                                    "Connection error while checking username!", Notify.Style.ERROR);
+                            Notify.create(getActivity(),
+                                    "Connection error while checking username!", Notify.Style.ERROR).show();
                             return;
                         }
 
                         if (!result) {
-                            Notify.showNotify(getActivity(),
-                                    "This handle does not exist on Github!", Notify.Style.ERROR);
+                            Notify.create(getActivity(),
+                                    "This handle does not exist on Github!", Notify.Style.ERROR).show();
                             return;
                         }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java
index 55ac6e075..5559c0daf 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java
@@ -125,7 +125,7 @@ public class LinkedIdCreateHttpsStep2Fragment extends LinkedIdCreateFinalFragmen
     private void proofSave () {
         String state = Environment.getExternalStorageState();
         if (!Environment.MEDIA_MOUNTED.equals(state)) {
-            Notify.showNotify(getActivity(), "External storage not available!", Style.ERROR);
+            Notify.create(getActivity(), "External storage not available!", Style.ERROR);
             return;
         }
 
@@ -146,11 +146,10 @@ public class LinkedIdCreateHttpsStep2Fragment extends LinkedIdCreateFinalFragmen
                     new PrintWriter(getActivity().getContentResolver().openOutputStream(uri));
             out.print(mResourceString);
             if (out.checkError()) {
-                Notify.showNotify(getActivity(), "Error writing file!", Style.ERROR);
+                Notify.create(getActivity(), "Error writing file!", Style.ERROR).show();
             }
         } catch (FileNotFoundException e) {
-            Notify.showNotify(getActivity(), "File could not be opened for writing!", Style.ERROR);
-            e.printStackTrace();
+            Notify.create(getActivity(), "File could not be opened for writing!", Style.ERROR).show();
         }
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep1Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep1Fragment.java
index c22351f87..c36f98058 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep1Fragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep1Fragment.java
@@ -78,13 +78,13 @@ public class LinkedIdCreateTwitterStep1Fragment extends Fragment {
                         super.onPostExecute(result);
 
                         if (result == null) {
-                            Notify.showNotify(getActivity(),
+                            Notify.create(getActivity(),
                                     "Connection error while checking username!", Notify.Style.ERROR);
                             return;
                         }
 
                         if (!result) {
-                            Notify.showNotify(getActivity(),
+                            Notify.create(getActivity(),
                                     "This handle does not exist on Twitter!", Notify.Style.ERROR);
                             return;
                         }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
index 502abe8e6..41d0178a3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
@@ -55,6 +55,7 @@ import org.sufficientlysecure.keychain.ui.util.Notify.Style;
 import org.sufficientlysecure.keychain.ui.widget.CertListWidget;
 import org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner;
 import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.util.Passphrase;
 
 
 public class LinkedIdViewFragment extends Fragment implements
@@ -153,7 +154,7 @@ public class LinkedIdViewFragment extends Fragment implements
 
                 } catch (IOException e) {
                     Log.e(Constants.TAG, "error parsing identity", e);
-                    Notify.createNotify(getActivity(), "Error parsing identity!",
+                    Notify.create(getActivity(), "Error parsing identity!",
                             Notify.LENGTH_LONG, Style.ERROR).show();
                     finishFragment();
                 }
@@ -492,7 +493,7 @@ public class LinkedIdViewFragment extends Fragment implements
         }
 
         // get the user's passphrase for this key (if required)
-        String passphrase;
+        Passphrase passphrase;
         long certifyKeyId = mViewHolder.vKeySpinner.getSelectedItemId();
         try {
             passphrase = PassphraseCacheService.getCachedPassphrase(