Move error overlay into generalized DecryptFragment, better error handling in DecryptTextActivity

1 files changed, 40 insertions, 3 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
index 230f478ae..c5f9821d3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
@@ -30,6 +30,7 @@ import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
 import android.util.Log;
 import android.view.View;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -61,17 +62,18 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
     public static final int LOADER_ID_UNIFIED = 0;
 
     protected LinearLayout mResultLayout;
-
     protected ImageView mEncryptionIcon;
     protected TextView mEncryptionText;
     protected ImageView mSignatureIcon;
     protected TextView mSignatureText;
-
     protected View mSignatureLayout;
     protected TextView mSignatureName;
     protected TextView mSignatureEmail;
     protected TextView mSignatureAction;
 
+    private LinearLayout mContentLayout;
+    private LinearLayout mErrorOverlayLayout;
+
     private OpenPgpSignatureResult mSignatureResult;
 
     @Override
@@ -81,7 +83,6 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
         // NOTE: These views are inside the activity!
         mResultLayout = (LinearLayout) getActivity().findViewById(R.id.result_main_layout);
         mResultLayout.setVisibility(View.GONE);
-
         mEncryptionIcon = (ImageView) getActivity().findViewById(R.id.result_encryption_icon);
         mEncryptionText = (TextView) getActivity().findViewById(R.id.result_encryption_text);
         mSignatureIcon = (ImageView) getActivity().findViewById(R.id.result_signature_icon);
@@ -90,6 +91,18 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
         mSignatureName = (TextView) getActivity().findViewById(R.id.result_signature_name);
         mSignatureEmail = (TextView) getActivity().findViewById(R.id.result_signature_email);
         mSignatureAction = (TextView) getActivity().findViewById(R.id.result_signature_action);
+
+        // Overlay
+        mContentLayout = (LinearLayout) view.findViewById(R.id.decrypt_content);
+        mErrorOverlayLayout = (LinearLayout) view.findViewById(R.id.decrypt_error_overlay);
+        Button vErrorOverlayButton = (Button) view.findViewById(R.id.decrypt_error_overlay_button);
+        vErrorOverlayButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mErrorOverlayLayout.setVisibility(View.GONE);
+                mContentLayout.setVisibility(View.VISIBLE);
+            }
+        });
     }
 
     private void lookupUnknownKey(long unknownKeyId) {
@@ -185,6 +198,9 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
 
             getLoaderManager().destroyLoader(LOADER_ID_UNIFIED);
 
+            mErrorOverlayLayout.setVisibility(View.GONE);
+            mContentLayout.setVisibility(View.VISIBLE);
+
             onVerifyLoaded(true);
 
             return;
@@ -285,6 +301,9 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
             setSignatureLayoutVisibility(View.VISIBLE);
             setShowAction(signatureKeyId);
 
+            mErrorOverlayLayout.setVisibility(View.VISIBLE);
+            mContentLayout.setVisibility(View.GONE);
+
             onVerifyLoaded(false);
 
         } else if (isExpired) {
@@ -294,6 +313,9 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
             setSignatureLayoutVisibility(View.VISIBLE);
             setShowAction(signatureKeyId);
 
+            mErrorOverlayLayout.setVisibility(View.GONE);
+            mContentLayout.setVisibility(View.VISIBLE);
+
             onVerifyLoaded(true);
 
         } else if (isYours) {
@@ -304,6 +326,9 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
             setSignatureLayoutVisibility(View.VISIBLE);
             setShowAction(signatureKeyId);
 
+            mErrorOverlayLayout.setVisibility(View.GONE);
+            mContentLayout.setVisibility(View.VISIBLE);
+
             onVerifyLoaded(true);
 
         } else if (isVerified) {
@@ -313,6 +338,9 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
             setSignatureLayoutVisibility(View.VISIBLE);
             setShowAction(signatureKeyId);
 
+            mErrorOverlayLayout.setVisibility(View.GONE);
+            mContentLayout.setVisibility(View.VISIBLE);
+
             onVerifyLoaded(true);
 
         } else {
@@ -322,6 +350,9 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
             setSignatureLayoutVisibility(View.VISIBLE);
             setShowAction(signatureKeyId);
 
+            mErrorOverlayLayout.setVisibility(View.GONE);
+            mContentLayout.setVisibility(View.VISIBLE);
+
             onVerifyLoaded(true);
         }
 
@@ -378,6 +409,9 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
                     }
                 });
 
+                mErrorOverlayLayout.setVisibility(View.GONE);
+                mContentLayout.setVisibility(View.VISIBLE);
+
                 onVerifyLoaded(true);
 
                 break;
@@ -389,6 +423,9 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
 
                 setSignatureLayoutVisibility(View.GONE);
 
+                mErrorOverlayLayout.setVisibility(View.VISIBLE);
+                mContentLayout.setVisibility(View.GONE);
+
                 onVerifyLoaded(false);
                 break;
             }