Added "Show the original message" switch to all errors.| #104.

Author: DenBond7

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.java

@@ -745,11 +745,14 @@ private View generatePgpMessagePart(MessagePartPgpMessage messagePartPgpMessage,
                         return formatErrorLayout;
 
                     default:
-                        TextView textViewMessagePartOther = (TextView) layoutInflater.inflate(
+                        ViewGroup viewGroup = (ViewGroup) layoutInflater.inflate(
                                 R.layout.message_part_pgp_message_error, layoutMessageParts, false);
-                        textViewMessagePartOther.setText(messagePartPgpMessage.getErrorMessage());
+                        TextView textViewErrorMessage = viewGroup.findViewById(R.id.textViewErrorMessage);
+                        textViewErrorMessage.setText(messagePartPgpMessage.getErrorMessage());
+                        viewGroup.addView(generateShowOriginalMessageLayout
+                                (messagePartPgpMessage.getValue(), layoutInflater, viewGroup));
 
-                        return textViewMessagePartOther;
+                        return viewGroup;
                 }
             }
         } else return new TextView(getContext());

FlowCrypt/src/main/java/com/flowcrypt/email/ui/loader/DecryptMessageAsyncTaskLoader.java

@@ -233,7 +233,8 @@ private MessagePartPgpMessage generateMessagePartPgpMessage(Js js, MessageBlock
                 pgpMessageDecryptError = MessagePartPgpMessage.PgpMessageDecryptError.MISSING_PASS_PHRASES;
             } else if (Objects.equals(pgpDecrypted.countPotentiallyMatchingKeys(), pgpDecrypted.countAttempts())) {
                 pgpMessageDecryptError = MessagePartPgpMessage.PgpMessageDecryptError.MISSING_PRIVATE_KEY;
-                errorMessage = getContext().getString(R.string.decrypt_error_single_sender);
+                errorMessage = getContext().getString(R.string.decrypt_error_could_not_open_message) +
+                        "\n\n" + getContext().getString(R.string.decrypt_error_single_sender);
             } else if (pgpDecrypted.countUnsecureMdcErrors() > 0) {
                 pgpMessageDecryptError = MessagePartPgpMessage.PgpMessageDecryptError.UNSECURED_MDC_ERROR;
             } else if (pgpDecrypted.getOtherErrors() != null && pgpDecrypted.getOtherErrors().length > 0) {

FlowCrypt/src/main/res/layout/message_part_pgp_message_error.xml

@@ -4,17 +4,23 @@
   ~ Contributors: DenBond7
   -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/textViewMessagePartPgpMessage"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/default_margin_medium"
-    android:autoLink="web"
     android:background="@drawable/bg_message_part_pgp_message_error"
-    android:textColor="@android:color/black"
-    android:textIsSelectable="true"
-    android:textSize="@dimen/default_text_size_medium"
-    tools:text="At nihil sequi quo maiores molestiae consequatur. Id aut nam voluptate doloribus saepe consequatur molestias. Eos sunt est ipsam accusantium saepe doloribus veritatis.
+    android:orientation="vertical">
 
-Recusandae velit sit veniam asperiores nisi. Eius tempore ab voluptatum dolorum nihil qui beatae. Et cum au" />
+    <TextView
+        android:id="@+id/textViewErrorMessage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/default_margin_medium"
+        android:autoLink="web"
+        android:textColor="@android:color/black"
+        android:textIsSelectable="true"
+        android:textSize="@dimen/default_text_size_medium"
+        tools:text="At nihil sequi quo maiores molestiae consequatur. Id aut nam voluptate doloribus saepe consequatur molestias. Eos sunt est ipsam accusantium saepe doloribus veritatis.
+
+Recusandae velit sit veniam asperiores nisi. Eius tempore ab voluptatum dolorum nihil qui beatae. Et cum au" />
+</LinearLayout>

FlowCrypt/src/main/res/values/strings.xml

@@ -209,7 +209,7 @@
         respond very promptly.</string>
     <string name="decrypt_error_single_sender">Normally, messages are encrypted for at least two people
         (sender and the receiver). It seems the sender encrypted this message manually for themselves,
-        and forgot to add you as a receiver. </string>
+        and forgot to add you as a receiver. Please ask them to send a new message.</string>
     <string name="diagnostic_info">Diagnostic info</string>
     <string name="email_does_not_available_in_this_folder">Message not found, it may have been moved to another folder.</string>
     <string name="from">From</string>