Merge remote-tracking branch 'origin/master' into db-overhaul

7 files changed, 151 insertions, 120 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
index fd7aef353..e7596534c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
@@ -38,6 +38,8 @@ import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
+import org.sufficientlysecure.keychain.provider.KeychainContract;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
 import org.sufficientlysecure.keychain.util.Log;
 
@@ -88,13 +90,9 @@ public class DecryptFragment extends Fragment {
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
 
-            // this request is returned after LookupUnknownKeyDialogFragment started
-            // ImportKeysActivity and user looked uo key
             case RESULT_CODE_LOOKUP_KEY: {
-                Log.d(Constants.TAG, "Returning from Lookup Key...");
                 if (resultCode == Activity.RESULT_OK) {
-                    // decrypt again
-//                    decryptStart();
+                    // TODO: generate new OpenPgpSignatureResult and display it
                 }
                 return;
             }
@@ -189,6 +187,7 @@ public class DecryptFragment extends Fragment {
 
     /**
      * Should be overridden by MessageFragment and FileFragment to start actual decryption
+     *
      * @param passphrase
      */
     protected void decryptStart(String passphrase) {
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
index 463c99948..f81224380 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
@@ -151,6 +151,10 @@ public class DrawerActivity extends ActionBarActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
+        if (mDrawerToggle == null) {
+            return super.onCreateOptionsMenu(menu);
+        }
+
         menu.add(42, MENU_ID_PREFERENCE, 100, R.string.menu_preferences);
         menu.add(42, MENU_ID_HELP, 101, R.string.menu_help);
 
@@ -159,6 +163,10 @@ public class DrawerActivity extends ActionBarActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        if (mDrawerToggle == null) {
+            return super.onOptionsItemSelected(item);
+        }
+
         // The action bar home/up action should open or close the drawer.
         // ActionBarDrawerToggle will take care of this.
         if (mDrawerToggle.onOptionsItemSelected(item)) {
@@ -216,14 +224,18 @@ public class DrawerActivity extends ActionBarActivity {
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
         // Sync the toggle state after onRestoreInstanceState has occurred.
-        mDrawerToggle.syncState();
+        if (mDrawerToggle != null) {
+            mDrawerToggle.syncState();
+        }
     }
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         // Pass any configuration change to the drawer toggles
-        mDrawerToggle.onConfigurationChanged(newConfig);
+        if (mDrawerToggle != null) {
+            mDrawerToggle.onConfigurationChanged(newConfig);
+        }
     }
 
     private class NavItem {
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
index 11fe4a908..67d59ab7d 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
@@ -239,7 +239,6 @@ public class EncryptAsymmetricFragment extends Fragment {
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
-
             case RESULT_CODE_PUBLIC_KEYS: {
                 if (resultCode == Activity.RESULT_OK) {
                     Bundle bundle = data.getExtras();
@@ -260,11 +259,11 @@ public class EncryptAsymmetricFragment extends Fragment {
             }
 
             default: {
+                super.onActivityResult(requestCode, resultCode, data);
+
                 break;
             }
         }
-
-        super.onActivityResult(requestCode, resultCode, data);
     }
 
 }
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index b09fa4a4d..9b8b92136 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -18,6 +18,7 @@
 package org.sufficientlysecure.keychain.ui;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
@@ -34,8 +35,10 @@ import android.support.v7.app.ActionBar;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
+
 import com.beardedhen.androidbootstrap.BootstrapButton;
 import com.devspark.appmsg.AppMsg;
+
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
@@ -54,7 +57,6 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
             + "IMPORT_KEY_FROM_QR_CODE";
     public static final String ACTION_IMPORT_KEY_FROM_KEYSERVER = Constants.INTENT_PREFIX
             + "IMPORT_KEY_FROM_KEYSERVER";
-    // TODO: implement:
     public static final String ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN = Constants.INTENT_PREFIX
             + "IMPORT_KEY_FROM_KEY_SERVER_AND_RETURN";
 
@@ -72,6 +74,10 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
     public static final String EXTRA_KEY_ID = "key_id";
     public static final String EXTRA_FINGERPRINT = "fingerprint";
 
+    // only used by ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN when used from OpenPgpService
+    public static final String EXTRA_PENDING_INTENT_DATA = "data";
+    private Intent mPendingIntentData;
+
     // view
     private ImportKeysListFragment mListFragment;
     private String[] mNavigationStrings;
@@ -86,7 +92,7 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
             ImportKeysNFCFragment.class
     };
 
-    private int mCurrentNavPostition = -1;
+    private int mCurrentNavPosition = -1;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -102,17 +108,22 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
             }
         });
 
-        getSupportActionBar().setDisplayShowTitleEnabled(false);
+        mNavigationStrings = getResources().getStringArray(R.array.import_action_list);
 
-        setupDrawerNavigation(savedInstanceState);
+        if (ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN.equals(getIntent().getAction())) {
+            setTitle(R.string.nav_import);
+        } else {
+            getSupportActionBar().setDisplayShowTitleEnabled(false);
 
-        // set drop down navigation
-        mNavigationStrings = getResources().getStringArray(R.array.import_action_list);
-        Context context = getSupportActionBar().getThemedContext();
-        ArrayAdapter<CharSequence> navigationAdapter = ArrayAdapter.createFromResource(context,
-                R.array.import_action_list, android.R.layout.simple_spinner_dropdown_item);
-        getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
-        getSupportActionBar().setListNavigationCallbacks(navigationAdapter, this);
+            setupDrawerNavigation(savedInstanceState);
+
+            // set drop down navigation
+            Context context = getSupportActionBar().getThemedContext();
+            ArrayAdapter<CharSequence> navigationAdapter = ArrayAdapter.createFromResource(context,
+                    R.array.import_action_list, android.R.layout.simple_spinner_dropdown_item);
+            getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
+            getSupportActionBar().setListNavigationCallbacks(navigationAdapter, this);
+        }
 
         handleActions(savedInstanceState, getIntent());
     }
@@ -152,34 +163,52 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
                 // action: directly load data
                 startListFragment(savedInstanceState, importData, null, null);
             }
-        } else if (ACTION_IMPORT_KEY_FROM_KEYSERVER.equals(action)) {
-            String query = null;
-            if (extras.containsKey(EXTRA_QUERY)) {
-                query = extras.getString(EXTRA_QUERY);
-            } else if (extras.containsKey(EXTRA_KEY_ID)) {
-                long keyId = intent.getLongExtra(EXTRA_KEY_ID, 0);
-                if (keyId != 0) {
-                    query = PgpKeyHelper.convertKeyIdToHex(keyId);
+        } else if (ACTION_IMPORT_KEY_FROM_KEYSERVER.equals(action)
+                || ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN.equals(action)) {
+
+            // only used for OpenPgpService
+            if (extras.containsKey(EXTRA_PENDING_INTENT_DATA)) {
+                mPendingIntentData = extras.getParcelable(EXTRA_PENDING_INTENT_DATA);
+            }
+            if (extras.containsKey(EXTRA_QUERY) || extras.containsKey(EXTRA_KEY_ID)) {
+                /* simple search based on query or key id */
+
+                String query = null;
+                if (extras.containsKey(EXTRA_QUERY)) {
+                    query = extras.getString(EXTRA_QUERY);
+                } else if (extras.containsKey(EXTRA_KEY_ID)) {
+                    long keyId = intent.getLongExtra(EXTRA_KEY_ID, 0);
+                    if (keyId != 0) {
+                        query = PgpKeyHelper.convertKeyIdToHex(keyId);
+                    }
+                }
+
+                if (query != null && query.length() > 0) {
+                    // display keyserver fragment with query
+                    Bundle args = new Bundle();
+                    args.putString(ImportKeysServerFragment.ARG_QUERY, query);
+                    loadNavFragment(0, args);
+
+                    // action: search immediately
+                    startListFragment(savedInstanceState, null, null, query);
+                } else {
+                    Log.e(Constants.TAG, "Query is empty!");
+                    return;
                 }
             } else if (extras.containsKey(EXTRA_FINGERPRINT)) {
+                /*
+                 * search based on fingerprint, here we can enforce a check in the end
+                 * if the right key has been downloaded
+                 */
+
                 String fingerprint = intent.getStringExtra(EXTRA_FINGERPRINT);
-                if (fingerprint != null) {
-                    query = "0x" + fingerprint;
-                }
+                loadFromFingerprint(savedInstanceState, fingerprint);
             } else {
                 Log.e(Constants.TAG,
-                "IMPORT_KEY_FROM_KEYSERVER action needs to contain the 'query', 'key_id', or " +
-                    "'fingerprint' extra!");
+                        "IMPORT_KEY_FROM_KEYSERVER action needs to contain the 'query', 'key_id', or " +
+                                "'fingerprint' extra!");
                 return;
             }
-
-            // display keyserver fragment with query
-            Bundle args = new Bundle();
-            args.putString(ImportKeysServerFragment.ARG_QUERY, query);
-            loadNavFragment(0, args);
-
-            // action: search immediately
-            startListFragment(savedInstanceState, null, null, query);
         } else if (ACTION_IMPORT_KEY_FROM_FILE.equals(action)) {
 
             // NOTE: this only displays the appropriate fragment, no actions are taken
@@ -234,14 +263,14 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
      * onNavigationItemSelected() should check whether the Fragment is already in existence
      * inside your Activity."
      * <p/>
-     * from http://bit.ly/1dBYThO
+     * from http://stackoverflow.com/a/14295474
      * <p/>
      * In our case, if we start ImportKeysActivity with parameters to directly search using a fingerprint,
      * the fragment would be loaded twice resulting in the query being empty after the second load.
      * <p/>
      * Our solution:
      * To prevent that a fragment will be loaded again even if it was already loaded loadNavFragment
-     * checks against mCurrentNavPostition.
+     * checks against mCurrentNavPosition.
      *
      * @param itemPosition
      * @param itemId
@@ -257,10 +286,12 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
     }
 
     private void loadNavFragment(int itemPosition, Bundle args) {
-        if (mCurrentNavPostition != itemPosition) {
-            getSupportActionBar().setSelectedNavigationItem(itemPosition);
+        if (mCurrentNavPosition != itemPosition) {
+            if (ActionBar.NAVIGATION_MODE_LIST == getSupportActionBar().getNavigationMode()) {
+                getSupportActionBar().setSelectedNavigationItem(itemPosition);
+            }
             loadFragment(NAVIGATION_CLASSES[itemPosition], args, mNavigationStrings[itemPosition]);
-            mCurrentNavPostition = itemPosition;
+            mCurrentNavPosition = itemPosition;
         }
     }
 
@@ -280,7 +311,11 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
 
         Log.d(Constants.TAG, "fingerprint: " + fingerprint);
 
-        if (fingerprint.length() < 16) {
+        loadFromFingerprint(savedInstanceState, fingerprint);
+    }
+
+    public void loadFromFingerprint(Bundle savedInstanceState, String fingerprint) {
+        if (fingerprint == null || fingerprint.length() < 40) {
             AppMsg.makeText(this, R.string.import_qr_code_too_short_fingerprint,
                     AppMsg.STYLE_ALERT).show();
             return;
@@ -291,6 +326,7 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
         // display keyserver fragment with query
         Bundle args = new Bundle();
         args.putString(ImportKeysServerFragment.ARG_QUERY, query);
+        args.putBoolean(ImportKeysServerFragment.ARG_DISABLE_QUERY_EDIT, true);
         loadNavFragment(0, args);
 
         // action: search directly
@@ -301,66 +337,6 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
         mListFragment.loadNew(importData, dataUri, serverQuery, keyServer);
     }
 
-    // private void importAndSignOld(final long keyId, final String expectedFingerprint) {
-    // if (expectedFingerprint != null && expectedFingerprint.length() > 0) {
-    //
-    // Thread t = new Thread() {
-    // @Override
-    // public void run() {
-    // try {
-    // // TODO: display some sort of spinner here while the user waits
-    //
-    // // TODO: there should be only 1
-    // HkpKeyServer server = new HkpKeyServer(mPreferences.getKeyServers()[0]);
-    // String encodedKey = server.get(keyId);
-    //
-    // PGPKeyRing keyring = PGPHelper.decodeKeyRing(new ByteArrayInputStream(
-    // encodedKey.getBytes()));
-    // if (keyring != null && keyring instanceof PGPPublicKeyRing) {
-    // PGPPublicKeyRing publicKeyRing = (PGPPublicKeyRing) keyring;
-    //
-    // // make sure the fingerprints match before we cache this thing
-    // String actualFingerprint = PGPHelper.convertFingerprintToHex(publicKeyRing
-    // .getPublicKey().getFingerprint());
-    // if (expectedFingerprint.equals(actualFingerprint)) {
-    // // store the signed key in our local cache
-    // int retval = PGPMain.storeKeyRingInCache(publicKeyRing);
-    // if (retval != Id.return_value.ok
-    // && retval != Id.return_value.updated) {
-    // status.putString(EXTRA_ERROR,
-    // "Failed to store signed key in local cache");
-    // } else {
-    // Intent intent = new Intent(ImportFromQRCodeActivity.this,
-    // SignKeyActivity.class);
-    // intent.putExtra(EXTRA_KEY_ID, keyId);
-    // startActivityForResult(intent, Id.request.sign_key);
-    // }
-    // } else {
-    // status.putString(
-    // EXTRA_ERROR,
-    // "Scanned fingerprint does NOT match the fingerprint of the received key. " +
-    // "You shouldnt trust this key.");
-    // }
-    // }
-    // } catch (QueryException e) {
-    // Log.e(TAG, "Failed to query KeyServer", e);
-    // status.putString(EXTRA_ERROR, "Failed to query KeyServer");
-    // status.putInt(Constants.extras.STATUS, Id.message.done);
-    // } catch (IOException e) {
-    // Log.e(TAG, "Failed to query KeyServer", e);
-    // status.putString(EXTRA_ERROR, "Failed to query KeyServer");
-    // status.putInt(Constants.extras.STATUS, Id.message.done);
-    // }
-    // }
-    // };
-    //
-    // t.setName("KeyExchange Download Thread");
-    // t.setDaemon(true);
-    // t.start();
-    // }
-    // }
-
-
     /**
      * Import keys with mImportData
      */
@@ -405,6 +381,11 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
                                 BadImportKeyDialogFragment.newInstance(bad);
                         badImportKeyDialogFragment.show(getSupportFragmentManager(), "badKeyDialog");
                     }
+
+                    if (ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN.equals(getIntent().getAction())) {
+                        ImportKeysActivity.this.setResult(Activity.RESULT_OK, mPendingIntentData);
+                        finish();
+                    }
                 }
             }
         };
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
index 0b2fff64e..3eb463dac 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
@@ -40,6 +40,7 @@ import org.sufficientlysecure.keychain.util.Log;
 public class ImportKeysServerFragment extends Fragment {
     public static final String ARG_QUERY = "query";
     public static final String ARG_KEY_SERVER = "key_server";
+    public static final String ARG_DISABLE_QUERY_EDIT = "disable_query_edit";
 
     private ImportKeysActivity mImportActivity;
 
@@ -140,6 +141,10 @@ public class ImportKeysServerFragment extends Fragment {
 
                 Log.d(Constants.TAG, "keyServer: " + keyServer);
             }
+
+            if (getArguments().getBoolean(ARG_DISABLE_QUERY_EDIT, false)) {
+                mQueryEditText.setEnabled(false);
+            }
         }
     }
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 653114c6c..d09f85c47 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -18,6 +18,7 @@
 
 package org.sufficientlysecure.keychain.ui;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -157,18 +158,13 @@ public class ViewKeyActivity extends ActionBarActivity {
     }
 
     private void updateFromKeyserver(Uri dataUri) {
-        long updateKeyId = ProviderHelper.getMasterKeyId(ViewKeyActivity.this, dataUri);
-
-        if (updateKeyId == 0) {
-            Log.e(Constants.TAG, "this shouldn't happen. KeyId == 0!");
-            return;
-        }
+        byte[] fingerprintBlob = ProviderHelper.getFingerprint(this, dataUri);
+        String fingerprint = PgpKeyHelper.convertFingerprintToHex(fingerprintBlob);
 
         Intent queryIntent = new Intent(this, ImportKeysActivity.class);
-        queryIntent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEYSERVER);
-        queryIntent.putExtra(ImportKeysActivity.EXTRA_KEY_ID, updateKeyId);
+        queryIntent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN);
+        queryIntent.putExtra(ImportKeysActivity.EXTRA_FINGERPRINT, fingerprint);
 
-        // TODO: lookup with onactivityresult!
         startActivityForResult(queryIntent, RESULT_CODE_LOOKUP_KEY);
     }
 
@@ -246,4 +242,21 @@ public class ViewKeyActivity extends ActionBarActivity {
         mExportHelper.deleteKey(dataUri, returnHandler);
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+            case RESULT_CODE_LOOKUP_KEY: {
+                if (resultCode == Activity.RESULT_OK) {
+                    // TODO: reload key??? move this into fragment?
+                }
+                break;
+            }
+
+            default: {
+                super.onActivityResult(requestCode, resultCode, data);
+
+                break;
+            }
+        }
+    }
 }
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
index a4dd06e40..259e14319 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
@@ -19,6 +19,7 @@ package org.sufficientlysecure.keychain.ui.adapter;
 
 import android.content.Context;
 import android.support.v4.content.AsyncTaskLoader;
+
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.util.HkpKeyServer;
 import org.sufficientlysecure.keychain.util.KeyServer;
@@ -53,7 +54,12 @@ public class ImportKeysListServerLoader
             return mEntryListWrapper;
         }
 
-        queryServer(mServerQuery, mKeyServer);
+        if (mServerQuery.startsWith("0x") && mServerQuery.length() == 42) {
+            Log.d(Constants.TAG, "This search is based on a unique fingerprint. Enforce a fingerprint check!");
+            queryServer(mServerQuery, mKeyServer, true);
+        } else {
+            queryServer(mServerQuery, mKeyServer, false);
+        }
 
         return mEntryListWrapper;
     }
@@ -84,14 +90,30 @@ public class ImportKeysListServerLoader
     /**
      * Query keyserver
      */
-    private void queryServer(String query, String keyServer) {
+    private void queryServer(String query, String keyServer, boolean enforceFingerprint) {
         HkpKeyServer server = new HkpKeyServer(keyServer);
         try {
             ArrayList<ImportKeysListEntry> searchResult = server.search(query);
 
             mEntryList.clear();
             // add result to data
-            mEntryList.addAll(searchResult);
+            if (enforceFingerprint) {
+                String fingerprint = query.substring(2);
+                Log.d(Constants.TAG, "fingerprint: " + fingerprint);
+                // query must return only one result!
+                if (searchResult.size() > 0) {
+                    ImportKeysListEntry uniqueEntry = searchResult.get(0);
+                    /*
+                     * set fingerprint explicitly after query
+                     * to enforce a check when the key is imported by KeychainIntentService
+                     */
+                    uniqueEntry.setFingerPrintHex(fingerprint);
+                    uniqueEntry.setSelected(true);
+                    mEntryList.add(uniqueEntry);
+                }
+            } else {
+                mEntryList.addAll(searchResult);
+            }
             mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, null);
         } catch (KeyServer.InsufficientQuery e) {
             Log.e(Constants.TAG, "InsufficientQuery", e);