Merge branch 'development' of github.com:open-keychain/open-keychain into development

2 files changed, 27 insertions, 17 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index a4dc12a37..d26ccbe57 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
@@ -118,24 +118,21 @@ public class KeychainApplication extends Application {
      * @param context
      */
     public static void setupAccountAsNeeded(Context context) {
-        // only enabled for Jelly Bean because we need some newer methods in our sync adapter
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            try {
-                AccountManager manager = AccountManager.get(context);
-                Account[] accounts = manager.getAccountsByType(Constants.ACCOUNT_TYPE);
-                if (accounts == null || accounts.length == 0) {
-                    Account account = new Account(Constants.ACCOUNT_NAME, Constants.ACCOUNT_TYPE);
-                    if (manager.addAccountExplicitly(account, null, null)) {
-                        ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 1);
-                        ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true);
-                    } else {
-                        Log.e(Constants.TAG, "Adding account failed!");
-                    }
+        try {
+            AccountManager manager = AccountManager.get(context);
+            Account[] accounts = manager.getAccountsByType(Constants.ACCOUNT_TYPE);
+            if (accounts == null || accounts.length == 0) {
+                Account account = new Account(Constants.ACCOUNT_NAME, Constants.ACCOUNT_TYPE);
+                if (manager.addAccountExplicitly(account, null, null)) {
+                    ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 1);
+                    ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true);
+                } else {
+                    Log.e(Constants.TAG, "Adding account failed!");
                 }
-            } catch (SecurityException e) {
-                Log.e(Constants.TAG, "SecurityException when adding the account", e);
-                Toast.makeText(context, R.string.reinstall_openkeychain, Toast.LENGTH_LONG).show();
             }
+        } catch (SecurityException e) {
+            Log.e(Constants.TAG, "SecurityException when adding the account", e);
+            Toast.makeText(context, R.string.reinstall_openkeychain, Toast.LENGTH_LONG).show();
         }
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
index 02cb502d0..03439228b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
@@ -70,6 +70,8 @@ public class ImportKeysList extends ArrayList<ImportKeysListEntry> {
             modified = true;
         }
 
+        // keep track if this key result is from a HKP keyserver
+        boolean incomingFromHkpServer = true;
         // we’re going to want to try to fetch the key from everywhere we found it, so remember
         //  all the origins
         for (String origin : incoming.getOrigins()) {
@@ -78,13 +80,24 @@ public class ImportKeysList extends ArrayList<ImportKeysListEntry> {
             // to work properly, Keybase-sourced entries need to pass along the extra
             if (KeybaseKeyserver.ORIGIN.equals(origin)) {
                 existing.setExtraData(incoming.getExtraData());
+                // one of the origins is not a HKP keyserver
+                incomingFromHkpServer = false;
             }
         }
+
         ArrayList<String> incomingIDs = incoming.getUserIds();
         ArrayList<String> existingIDs = existing.getUserIds();
         for (String incomingID : incomingIDs) {
             if (!existingIDs.contains(incomingID)) {
-                existingIDs.add(incomingID);
+                // prepend  HKP server results to the start of the list,
+                // so that the UI (for cloud key search, which is picking the first list item)
+                // shows the right main email address, as mail addresses returned by HKP servers
+                // are preferred over keybase.io IDs
+                if (incomingFromHkpServer) {
+                    existingIDs.add(0, incomingID);
+                } else {
+                    existingIDs.add(incomingID);
+                }
                 modified = true;
             }
         }