Added an "Import missing key" button for the missing private keys situation.| #104.

DenBond7 · DenBond7 · commit 5ec54834e604 · 2017-11-07T17:19:06.000+02:00
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.java
@@ -7,6 +7,7 @@
 package com.flowcrypt.email.ui.activity.fragment;
 
 import android.Manifest;
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -53,6 +54,7 @@
 import com.flowcrypt.email.model.results.LoaderResult;
 import com.flowcrypt.email.service.attachment.AttachmentDownloadManagerService;
 import com.flowcrypt.email.ui.activity.CreateMessageActivity;
+import com.flowcrypt.email.ui.activity.ImportPrivateKeyActivity;
 import com.flowcrypt.email.ui.activity.MessageDetailsActivity;
 import com.flowcrypt.email.ui.activity.base.BaseSyncActivity;
 import com.flowcrypt.email.ui.activity.fragment.base.BaseGmailFragment;
@@ -74,6 +76,8 @@
  */
 public class MessageDetailsFragment extends BaseGmailFragment implements View.OnClickListener {
     private static final int REQUEST_CODE_REQUEST_WRITE_EXTERNAL_STORAGE = 100;
+    private static final int REQUEST_CODE_START_IMPORT_KEY_ACTIVITY = 101;
+
     private TextView textViewSenderAddress;
     private TextView textViewDate;
     private TextView textViewSubject;
@@ -145,6 +149,23 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         }
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+            case REQUEST_CODE_START_IMPORT_KEY_ACTIVITY:
+                switch (resultCode) {
+                    case Activity.RESULT_OK:
+                        Toast.makeText(getContext(), R.string.key_successfully_imported, Toast.LENGTH_SHORT).show();
+                        getLoaderManager().restartLoader(R.id.loader_id_load_message_info_from_database, null, this);
+                        break;
+                }
+                break;
+
+            default:
+                super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
     @Override
     public View getContentView() {
         return layoutMessageParts;
@@ -502,8 +523,8 @@ public void onClick(View v) {
     }
 
     private void updateMessageView() {
+        layoutMessageParts.removeAllViews();
         if (!TextUtils.isEmpty(incomingMessageInfo.getHtmlMessage())) {
-            layoutMessageParts.removeAllViews();
             EmailWebView emailWebView = new EmailWebView(getContext());
             emailWebView.configure();
 
@@ -744,6 +765,9 @@ private View generatePgpMessagePart(MessagePartPgpMessage messagePartPgpMessage,
                                 (messagePartPgpMessage.getValue(), layoutInflater, formatErrorLayout));
                         return formatErrorLayout;
 
+                    case MISSING_PRIVATE_KEY:
+                        return generateMissingPrivateKeyLayout(messagePartPgpMessage, layoutInflater);
+
                     default:
                         ViewGroup viewGroup = (ViewGroup) layoutInflater.inflate(
                                 R.layout.message_part_pgp_message_error, layoutMessageParts, false);
@@ -758,6 +782,36 @@ private View generatePgpMessagePart(MessagePartPgpMessage messagePartPgpMessage,
         } else return new TextView(getContext());
     }
 
+    /**
+     * Generate a layout which describes the missing private keys situation.
+     *
+     * @param messagePartPgpMessage The {@link MessagePartPgpMessage} which contains info about an error.
+     * @param layoutInflater        The {@link LayoutInflater} instance.
+     * @return Generated layout.
+     */
+    @NonNull
+    private View generateMissingPrivateKeyLayout(MessagePartPgpMessage messagePartPgpMessage,
+                                                 LayoutInflater layoutInflater) {
+        ViewGroup missingPrivateKeyLayout = (ViewGroup) layoutInflater.inflate(
+                R.layout.message_part_pgp_message_missing_private_key, layoutMessageParts, false);
+        TextView textViewErrorMessage = missingPrivateKeyLayout.findViewById(R.id.textViewErrorMessage);
+        textViewErrorMessage.setText(messagePartPgpMessage.getErrorMessage());
+
+        Button button = missingPrivateKeyLayout.findViewById(R.id.buttonImportPrivateKey);
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivityForResult(ImportPrivateKeyActivity.newIntent(
+                        getContext(), getString(R.string.import_private_key), true, ImportPrivateKeyActivity.class),
+                        REQUEST_CODE_START_IMPORT_KEY_ACTIVITY);
+            }
+        });
+
+        missingPrivateKeyLayout.addView(generateShowOriginalMessageLayout
+                (messagePartPgpMessage.getValue(), layoutInflater, missingPrivateKeyLayout));
+        return missingPrivateKeyLayout;
+    }
+
     /**
      * Generate a layout with switch button which will be regulate visibility of original message info.
      *
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/loader/DecryptMessageAsyncTaskLoader.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/loader/DecryptMessageAsyncTaskLoader.java
@@ -225,22 +225,29 @@ private MessagePartPgpMessage generateMessagePartPgpMessage(Js js, MessageBlock
             if (pgpDecrypted.isSuccess()) {
                 value = pgpDecrypted.getString();
             } else if (!TextUtils.isEmpty(pgpDecrypted.getFormatError())) {
-                errorMessage = getContext().getString(R.string.decrypt_error_message_badly_formatted) + "\n\n" +
-                        pgpDecrypted.getFormatError();
+                errorMessage = getContext().getString(R.string.decrypt_error_message_badly_formatted,
+                        getContext().getString(R.string.app_name)) + "\n\n" + pgpDecrypted.getFormatError();
                 pgpMessageDecryptError = MessagePartPgpMessage.PgpMessageDecryptError.FORMAT_ERROR;
             } else if (pgpDecrypted.getMissingPassphraseLongids() != null
                     && pgpDecrypted.getMissingPassphraseLongids().length > 0) {
                 pgpMessageDecryptError = MessagePartPgpMessage.PgpMessageDecryptError.MISSING_PASS_PHRASES;
-            } else if (Objects.equals(pgpDecrypted.countPotentiallyMatchingKeys(), pgpDecrypted.countAttempts())) {
+            } else if (Objects.equals(pgpDecrypted.countPotentiallyMatchingKeys(), pgpDecrypted.countAttempts())
+                    && Objects.equals(pgpDecrypted.countKeyMismatchErrors(), pgpDecrypted.countAttempts())) {
                 pgpMessageDecryptError = MessagePartPgpMessage.PgpMessageDecryptError.MISSING_PRIVATE_KEY;
-                errorMessage = getContext().getString(R.string.decrypt_error_could_not_open_message) +
-                        "\n\n" + getContext().getString(R.string.decrypt_error_single_sender);
+                if (pgpDecrypted.getEncryptedForLongids().length > 1) {
+                    errorMessage = getContext().getString(R.string.decrypt_error_current_key_cannot_message);
+                } else {
+                    errorMessage = getContext().getString(R.string.decrypt_error_could_not_open_message,
+                            getContext().getString(R.string.app_name)) + "\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) {
                 pgpMessageDecryptError = MessagePartPgpMessage.PgpMessageDecryptError.OTHER_ERRORS;
                 StringBuilder stringBuilder = new StringBuilder();
-                stringBuilder.append(getContext().getString(R.string.decrypt_error_could_not_open_message));
+                stringBuilder.append(getContext().getString(R.string.decrypt_error_could_not_open_message,
+                        getContext().getString(R.string.app_name)));
                 stringBuilder.append("\n\n");
                 stringBuilder.append(getContext().getString(R.string.decrypt_error_please_write_me));
                 stringBuilder.append("\n\n");
@@ -253,7 +260,8 @@ private MessagePartPgpMessage generateMessagePartPgpMessage(Js js, MessageBlock
                 errorMessage = stringBuilder.toString();
             } else {
                 pgpMessageDecryptError = MessagePartPgpMessage.PgpMessageDecryptError.UNKNOWN_ERROR;
-                errorMessage = getContext().getString(R.string.decrypt_error_could_not_open_message) +
+                errorMessage = getContext().getString(R.string.decrypt_error_could_not_open_message,
+                        getContext().getString(R.string.app_name)) +
                         "\n\n" + getContext().getString(R.string.decrypt_error_please_write_me);
             }
         } else {
diff --git a/FlowCrypt/src/main/res/layout/message_part_pgp_message_missing_private_key.xml b/FlowCrypt/src/main/res/layout/message_part_pgp_message_missing_private_key.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Business Source License 1.0 © 2017 FlowCrypt Limited (tom@cryptup.org).
+  ~ Use limitations apply. See https://github.com/FlowCrypt/flowcrypt-android/blob/master/LICENSE
+  ~ Contributors: DenBond7
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_message_part_pgp_message_error"
+    android:orientation="vertical">
+
+    <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" />
+
+    <Button
+        android:id="@+id/buttonImportPrivateKey"
+        style="@style/AppWidget.Button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/default_margin_content_small"
+        android:layout_marginTop="@dimen/default_margin_content_small"
+        android:text="@string/import_missing_key"
+        android:theme="@style/AppWidget.Button.Green" />
+</LinearLayout>
diff --git a/FlowCrypt/src/main/res/values/strings.xml b/FlowCrypt/src/main/res/values/strings.xml
@@ -203,17 +203,20 @@
     <string name="download_attachments_notification_channel">The download attachments notification channel</string>
     <string name="template_warning_max_attachments_size_for_decryption">The app cannot decrypt an attachment greater than %1$s</string>
     <string name="decrypt_error_js_tool_error">There is a JS tool error.</string>
-    <string name="decrypt_error_could_not_open_message">Could not open this message with FlowCrypt.</string>
-    <string name="decrypt_error_message_badly_formatted">Message is either badly formatted or not compatible with FlowCrypt.</string>
+    <string name="decrypt_error_could_not_open_message">Could not open this message with %1$s.</string>
+    <string name="decrypt_error_message_badly_formatted">Message is either badly formatted or not compatible with %1$s.</string>
     <string name="decrypt_error_please_write_me">Please write me at human@flowcrypt.com so that I can fix it. I
         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. Please ask them to send a new message.</string>
+    <string name="decrypt_error_current_key_cannot_message">You current key cannot open this message. If you
+        have any other keys available, you should import them  now.</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>
     <string name="google_api_is_not_available">Error: Google API is not available</string>
     <string name="show_original_message">Show the original message</string>
     <string name="hide_original_message">Hide the original message</string>
+    <string name="import_missing_key">Import missing key</string>
 </resources>
