Fix revoked/expired state in decrypt activity

4 files changed, 27 insertions, 37 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
index 6c1902af1..e5ddcbbd6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
@@ -309,7 +309,7 @@ public class DecryptFilesFragment extends DecryptFragment {
     }
 
     @Override
-    protected void onVerifyLoaded(boolean verified) {
+    protected void onVerifyLoaded(boolean hideErrorOverlay) {
 
     }
 }
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 9c51893ce..230f478ae 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
@@ -55,7 +55,6 @@ import org.sufficientlysecure.keychain.ui.util.Notify;
 import org.sufficientlysecure.keychain.ui.util.Notify.Style;
 import org.sufficientlysecure.keychain.util.Preferences;
 
-
 public abstract class DecryptFragment extends CryptoOperationFragment implements
         LoaderManager.LoaderCallbacks<Cursor> {
 
@@ -91,7 +90,6 @@ 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);
-
     }
 
     private void lookupUnknownKey(long unknownKeyId) {
@@ -113,12 +111,9 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
                     final ImportKeyResult result =
                             returnData.getParcelable(OperationResult.EXTRA_RESULT);
 
-                    // if (!result.success()) {
-                        result.createNotify(getActivity()).show();
-                    // }
+                    result.createNotify(getActivity()).show();
 
                     getLoaderManager().restartLoader(LOADER_ID_UNIFIED, null, DecryptFragment.this);
-
                 }
             }
         };
@@ -153,7 +148,6 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
         intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
 
         getActivity().startService(intent);
-
     }
 
     private void showKey(long keyId) {
@@ -205,7 +199,6 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
         }
 
         getLoaderManager().restartLoader(LOADER_ID_UNIFIED, null, this);
-
     }
 
     private void setSignatureLayoutVisibility(int visibility) {
@@ -228,8 +221,6 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
             KeychainContract.KeyRings._ID,
             KeychainContract.KeyRings.MASTER_KEY_ID,
             KeychainContract.KeyRings.USER_ID,
-            KeychainContract.KeyRings.IS_REVOKED,
-            KeychainContract.KeyRings.IS_EXPIRED,
             KeychainContract.KeyRings.VERIFIED,
             KeychainContract.KeyRings.HAS_ANY_SECRET,
     };
@@ -237,10 +228,8 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
     @SuppressWarnings("unused")
     static final int INDEX_MASTER_KEY_ID = 1;
     static final int INDEX_USER_ID = 2;
-    static final int INDEX_IS_REVOKED = 3;
-    static final int INDEX_IS_EXPIRED = 4;
-    static final int INDEX_VERIFIED = 5;
-    static final int INDEX_HAS_ANY_SECRET = 6;
+    static final int INDEX_VERIFIED = 3;
+    static final int INDEX_HAS_ANY_SECRET = 4;
 
     @Override
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {
@@ -282,8 +271,10 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
                     getActivity(), mSignatureResult.getKeyId()));
         }
 
-        boolean isRevoked = data.getInt(INDEX_IS_REVOKED) != 0;
-        boolean isExpired = data.getInt(INDEX_IS_EXPIRED) != 0;
+        // NOTE: Don't use revoked and expired fields from database, they don't show
+        // revoked/expired subkeys
+        boolean isRevoked = mSignatureResult.getStatus() == OpenPgpSignatureResult.SIGNATURE_KEY_REVOKED;
+        boolean isExpired = mSignatureResult.getStatus() == OpenPgpSignatureResult.SIGNATURE_KEY_EXPIRED;
         boolean isVerified = data.getInt(INDEX_VERIFIED) > 0;
         boolean isYours = data.getInt(INDEX_HAS_ANY_SECRET) != 0;
 
@@ -344,7 +335,6 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
         }
 
         setSignatureLayoutVisibility(View.GONE);
-
     }
 
     private void showUnknownKeyStatus() {
@@ -407,6 +397,6 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
 
     }
 
-    protected abstract void onVerifyLoaded(boolean verified);
+    protected abstract void onVerifyLoaded(boolean hideErrorOverlay);
 
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
index 6f576a112..b8f1aee63 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
@@ -50,8 +50,8 @@ public class DecryptTextFragment extends DecryptFragment {
     public static final String ARG_CIPHERTEXT = "ciphertext";
 
     // view
-    private LinearLayout mValidLayout;
-    private LinearLayout mInvalidLayout;
+    private LinearLayout mContentLayout;
+    private LinearLayout mErrorOverlayLayout;
     private TextView mText;
 
     // model
@@ -78,16 +78,16 @@ public class DecryptTextFragment extends DecryptFragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.decrypt_text_fragment, container, false);
-        mValidLayout = (LinearLayout) view.findViewById(R.id.decrypt_text_valid);
-        mInvalidLayout = (LinearLayout) view.findViewById(R.id.decrypt_text_invalid);
+        mContentLayout = (LinearLayout) view.findViewById(R.id.decrypt_content);
+        mErrorOverlayLayout = (LinearLayout) view.findViewById(R.id.decrypt_error_overlay);
         mText = (TextView) view.findViewById(R.id.decrypt_text_plaintext);
 
-        Button vInvalidButton = (Button) view.findViewById(R.id.decrypt_text_invalid_button);
-        vInvalidButton.setOnClickListener(new View.OnClickListener() {
+        Button vErrorOverlayButton = (Button) view.findViewById(R.id.decrypt_error_overlay_button);
+        vErrorOverlayButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mInvalidLayout.setVisibility(View.GONE);
-                mValidLayout.setVisibility(View.VISIBLE);
+                mErrorOverlayLayout.setVisibility(View.GONE);
+                mContentLayout.setVisibility(View.VISIBLE);
             }
         });
 
@@ -244,17 +244,17 @@ public class DecryptTextFragment extends DecryptFragment {
     }
 
     @Override
-    protected void onVerifyLoaded(boolean verified) {
+    protected void onVerifyLoaded(boolean hideErrorOverlay) {
 
-        mShowMenuOptions = verified;
+        mShowMenuOptions = hideErrorOverlay;
         getActivity().supportInvalidateOptionsMenu();
 
-        if (verified) {
-            mInvalidLayout.setVisibility(View.GONE);
-            mValidLayout.setVisibility(View.VISIBLE);
+        if (hideErrorOverlay) {
+            mErrorOverlayLayout.setVisibility(View.GONE);
+            mContentLayout.setVisibility(View.VISIBLE);
         } else {
-            mInvalidLayout.setVisibility(View.VISIBLE);
-            mValidLayout.setVisibility(View.GONE);
+            mErrorOverlayLayout.setVisibility(View.VISIBLE);
+            mContentLayout.setVisibility(View.GONE);
         }
 
     }
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
index 5b74905e7..ea6be462f 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
@@ -6,7 +6,7 @@
 
     <LinearLayout
         android:visibility="gone"
-        android:id="@+id/decrypt_text_valid"
+        android:id="@+id/decrypt_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
@@ -36,7 +36,7 @@
 
     <LinearLayout
         android:visibility="gone"
-        android:id="@+id/decrypt_text_invalid"
+        android:id="@+id/decrypt_error_overlay"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:orientation="vertical"
@@ -52,7 +52,7 @@
             android:textColor="@color/android_red_light" />
 
         <Button
-            android:id="@+id/decrypt_text_invalid_button"
+            android:id="@+id/decrypt_error_overlay_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/button_edgy"