1 files changed, 17 insertions, 1 deletions
diff --git a/src/org/thialfihar/android/apg/KeyServerQueryActivity.java b/src/org/thialfihar/android/apg/KeyServerQueryActivity.java
index b1cab67ed..4ae171266 100644
--- a/src/org/thialfihar/android/apg/KeyServerQueryActivity.java
+++ b/src/org/thialfihar/android/apg/KeyServerQueryActivity.java
@@ -84,6 +84,16 @@ public class KeyServerQueryActivity extends BaseActivity {
                 search(query);
             }
         });
+
+        Intent intent = getIntent();
+        if (Apg.Intent.LOOK_UP_KEY_ID.equals(intent.getAction())) {
+            long keyId = intent.getLongExtra(Apg.EXTRA_KEY_ID, 0);
+            if (keyId != 0) {
+                String query = "0x" + Apg.keyToHex(keyId);
+                mQuery.setText(query);
+                search(query);
+            }
+        }
     }
 
     private void search(String query) {
@@ -162,7 +172,13 @@ public class KeyServerQueryActivity extends BaseActivity {
                 Intent intent = new Intent(this, PublicKeyListActivity.class);
                 intent.setAction(Apg.Intent.IMPORT);
                 intent.putExtra(Apg.EXTRA_TEXT, mKeyData);
-                startActivity(intent);
+                Intent orgIntent = getIntent();
+                if (Apg.Intent.LOOK_UP_KEY_ID.equals(orgIntent.getAction())) {
+                    setResult(RESULT_OK, intent);
+                    finish();
+                } else {
+                    startActivity(intent);
+                }
             }
         }
     }