From 9ba66aa2ce099649728d3ea42a65750d7f2ddde6 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 30 Sep 2015 15:17:48 +0200
Subject: [PATCH] import: special treatment for application/pgp-keys

---
 .../keychain/ui/DecryptListFragment.java           | 14 ++++++++++----
 OpenKeychain/src/main/res/values/strings.xml       |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
index 32f7c5bd5..86f0d2333 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
@@ -377,6 +377,9 @@ public class DecryptListFragment
                     if (ClipDescription.compareMimeTypes(type, "text/plain")) {
                         // noinspection deprecation, this should be called from Context, but not available in minSdk
                         icon = getResources().getDrawable(R.drawable.ic_chat_black_24dp);
+                    } else if (ClipDescription.compareMimeTypes(type, "application/pgp-keys")) {
+                            // noinspection deprecation, this should be called from Context, but not available in minSdk
+                            icon = getResources().getDrawable(R.drawable.ic_key_plus_grey600_24dp);
                     } else if (ClipDescription.compareMimeTypes(type, "image/*")) {
                         int px = FormattingUtils.dpToPx(context, 32);
                         Bitmap bitmap = FileHelper.getThumbnail(context, outputUri, new Point(px, px));
@@ -767,11 +770,14 @@ public class DecryptListFragment
                 String filename;
                 if (metadata == null) {
                     filename = getString(R.string.filename_unknown);
-                } else if (TextUtils.isEmpty(metadata.getFilename())) {
-                    filename = getString("text/plain".equals(metadata.getMimeType())
-                            ? R.string.filename_unknown_text : R.string.filename_unknown);
-                } else {
+                } else if ( ! TextUtils.isEmpty(metadata.getFilename())) {
                     filename = metadata.getFilename();
+                } else if (ClipDescription.compareMimeTypes(metadata.getMimeType(), "application/pgp-keys")) {
+                    filename = getString(R.string.filename_keys);
+                } else if (ClipDescription.compareMimeTypes(metadata.getMimeType(), "text/plain")) {
+                    filename = getString(R.string.filename_unknown_text);
+                } else {
+                    filename = getString(R.string.filename_unknown);
                 }
                 fileHolder.vFilename.setText(filename);
 
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 69473c030..d6333019a 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1553,6 +1553,7 @@
     <string name="error_reading_k9">"Received incomplete data, try pressing 'Download complete message' in K-9 Mail!"</string>
     <string name="filename_unknown">Unknown filename (click to open)</string>
     <string name="filename_unknown_text">Text (click to show)</string>
+    <string name="filename_keys">"Key Backup (click to import)"</string>
     <string name="intent_show">Show Signed/Encrypted Content</string>
     <string name="intent_share">Share Signed/Encrypted Content</string>
     <string name="view_internal">"View in OpenKeychain"</string>