introduce SingletonResult for... singleton results

3 files changed, 62 insertions, 10 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
index 822c069cc..ad8fb2f7a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
@@ -33,13 +33,69 @@ import com.github.johnpersano.supertoasts.util.Style;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.CanonicalizedKeyRing;
-import org.sufficientlysecure.keychain.pgp.KeyRing;
 import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
 import org.sufficientlysecure.keychain.ui.LogDisplayActivity;
 import org.sufficientlysecure.keychain.ui.LogDisplayFragment;
 
 public abstract class OperationResults {
 
+    /** This is a simple subclass meant to contain only a single log message. This log
+     * message is also shown without a log button in the createNotify SuperToast. */
+    public static class SingletonResult extends OperationResultParcel {
+
+        /** Construct from a parcel - trivial because we have no extra data. */
+        public SingletonResult(Parcel source) {
+            super(source);
+        }
+
+        public SingletonResult(int result, LogLevel level, LogType reason) {
+            super(result, new OperationLog());
+            // Prepare the log
+            mLog.add(level, reason, 0);
+        }
+
+        @Override
+        public SuperCardToast createNotify(final Activity activity) {
+
+            // there is exactly one error msg - use that one
+            String str = activity.getString(mLog.iterator().next().mType.getMsgId());
+            int color;
+
+            // Determine color by result type
+            if (cancelled()) {
+                color = Style.RED;
+            } else if (success()) {
+                if (getLog().containsWarnings()) {
+                    color = Style.ORANGE;
+                } else {
+                    color = Style.GREEN;
+                }
+            } else {
+                color = Style.RED;
+            }
+
+            SuperCardToast toast = new SuperCardToast(activity, SuperToast.Type.STANDARD,
+                    Style.getStyle(color, SuperToast.Animations.POPUP));
+            toast.setText(str);
+            toast.setDuration(SuperToast.Duration.EXTRA_LONG);
+            toast.setIndeterminate(false);
+            toast.setSwipeToDismiss(true);
+            return toast;
+
+        }
+
+        public static Creator<SingletonResult> CREATOR = new Creator<SingletonResult>() {
+            public SingletonResult createFromParcel(final Parcel source) {
+                return new SingletonResult(source);
+            }
+
+            public SingletonResult[] newArray(final int size) {
+                return new SingletonResult[size];
+            }
+        };
+
+    }
+
     public static class ImportKeyResult extends OperationResultParcel {
 
         public final int mNewKeys, mUpdatedKeys, mBadKeys, mSecret;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
index 3de01adcd..703755457 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
@@ -51,7 +51,7 @@ import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
 import org.sufficientlysecure.keychain.service.OperationResultParcel;
 import org.sufficientlysecure.keychain.service.OperationResultParcel.LogLevel;
 import org.sufficientlysecure.keychain.service.OperationResultParcel.LogType;
-import org.sufficientlysecure.keychain.service.OperationResultParcel.OperationLog;
+import org.sufficientlysecure.keychain.service.OperationResults.SingletonResult;
 import org.sufficientlysecure.keychain.service.PassphraseCacheService;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 import org.sufficientlysecure.keychain.ui.adapter.SubkeysAdapter;
@@ -580,14 +580,10 @@ public class EditKeyFragment extends LoaderFragment implements
     /** Closes this activity, returning a result parcel with a single error log entry. */
     void finishWithError(LogType reason) {
 
-        // Prepare the log
-        OperationLog log = new OperationLog();
-        log.add(LogLevel.ERROR, reason, 0);
-
         // Prepare an intent with an EXTRA_RESULT
         Intent intent = new Intent();
         intent.putExtra(OperationResultParcel.EXTRA_RESULT,
-                new OperationResultParcel(OperationResultParcel.RESULT_ERROR, log));
+                new SingletonResult(SingletonResult.RESULT_ERROR, LogLevel.ERROR, reason));
 
         // Finish with result
         getActivity().setResult(EditKeyActivity.RESULT_OK, intent);
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 2a89f15bc..64affdfde 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -757,9 +757,9 @@
     <string name="msg_con_warn_delete_secret">"Exception deleting secret cache file"</string>
 
     <!-- Other messages used in OperationLogs -->
-    <string name="msg_ek_error_divert">"editing of nfc keys is not (yet) supported"</string>
-    <string name="msg_ek_error_dummy">"cannot edit keyring with stripped master key!"</string>
-    <string name="msg_ek_error_not_found">"key not found"</string>
+    <string name="msg_ek_error_divert">"Editing of nfc keys is not (yet) supported!"</string>
+    <string name="msg_ek_error_dummy">"Cannot edit keyring with stripped master key!"</string>
+    <string name="msg_ek_error_not_found">"Key not found!"</string>
 
     <!-- PassphraseCache -->
     <string name="passp_cache_notif_click_to_clear">"Click to clear cached passphrases"</string>