Big error screen if signature is invalid or key is revoked/expired, also fixes signature status for expired and revoked keys

1 files changed, 91 insertions, 55 deletions

diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
index 3bd144fbf..c58e2d7e6 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
@@ -6,73 +6,109 @@
 
     <include layout="@layout/decrypt_result_include" />
 
-    <ScrollView
-        android:fillViewport="true"
-        android:paddingTop="8dp"
+    <LinearLayout
+        android:visibility="gone"
+        android:id="@+id/decrypt_text_valid"
         android:layout_width="match_parent"
-        android:scrollbars="vertical"
-        android:layout_height="0dp"
-        android:layout_weight="1">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/decrypt_text_plaintext"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+        <ScrollView
+            android:fillViewport="true"
+            android:paddingTop="8dp"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="top"
-            android:hint=""
-            android:textIsSelectable="true" />
+            android:scrollbars="vertical"
+            android:layout_height="0dp"
+            android:layout_weight="1">
 
-    </ScrollView>
+            <TextView
+                android:id="@+id/decrypt_text_plaintext"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="top"
+                android:hint=""
+                android:textIsSelectable="true" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:background="?android:attr/listDivider" />
+        </ScrollView>
 
-    <LinearLayout
-        android:id="@+id/action_decrypt_share_plaintext"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:clickable="true"
-        style="@style/SelectableItem"
-        android:orientation="horizontal">
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:background="?android:attr/listDivider" />
 
-        <TextView
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:id="@+id/action_decrypt_share_plaintext"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:text="@string/btn_add_share_decrypted_text"
-            android:drawableRight="@drawable/ic_action_share"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical"
-            android:layout_weight="1" />
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
 
-        <View
-            android:layout_width="1dip"
-            android:layout_height="match_parent"
-            android:gravity="right"
-            android:layout_marginBottom="8dp"
-            android:layout_marginTop="8dp"
-            android:background="?android:attr/listDivider" />
+            <TextView
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:text="@string/btn_add_share_decrypted_text"
+                android:drawableRight="@drawable/ic_action_share"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:layout_weight="1" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <ImageButton
+                android:id="@+id/action_decrypt_copy_plaintext"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_copy"
+                android:layout_gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+        </LinearLayout>
 
-        <ImageButton
-            android:id="@+id/action_decrypt_copy_plaintext"
+    </LinearLayout>
+
+    <LinearLayout
+        android:visibility="gone"
+        android:id="@+id/decrypt_text_invalid"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center_vertical">
+
+        <TextView
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/decrypt_invalid_text"
             android:padding="8dp"
-            android:src="@drawable/ic_action_copy"
-            android:layout_gravity="center_vertical"
-            style="@style/SelectableItem" />
+            android:layout_gravity="center"
+            android:textColor="@color/android_red_dark" />
 
+        <Button
+            android:id="@+id/decrypt_text_invalid_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/button_edgy"
+            android:textColor="@color/android_red_dark"
+            android:text="@string/decrypt_invalid_button"
+            android:layout_gravity="center_horizontal" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file