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

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java

3 files changed, 22 insertions, 15 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 6ef73cd36..1b470dd16 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -501,16 +501,25 @@ public class ImportKeysActivity extends ActionBarActivity {
             // Send all information needed to service to query keys in other thread
             Intent intent = new Intent(this, KeychainIntentService.class);
 
-            intent.setAction(KeychainIntentService.ACTION_DOWNLOAD_AND_IMPORT_KEYS);
+            intent.setAction(KeychainIntentService.ACTION_IMPORT_KEYRING);
 
             // fill values for this action
             Bundle data = new Bundle();
 
-            data.putString(KeychainIntentService.DOWNLOAD_KEY_SERVER, sls.mCloudPrefs.keyserver);
+            data.putString(KeychainIntentService.IMPORT_KEY_SERVER, sls.mCloudPrefs.keyserver);
 
             // get selected key entries
-            ArrayList<ImportKeysListEntry> selectedEntries = mListFragment.getSelectedEntries();
-            data.putParcelableArrayList(KeychainIntentService.DOWNLOAD_KEY_LIST, selectedEntries);
+            ArrayList<ParcelableKeyRing> keys = new ArrayList<ParcelableKeyRing>();
+            {
+                // change the format into ParcelableKeyRing
+                ArrayList<ImportKeysListEntry> entries = mListFragment.getSelectedEntries();
+                for (ImportKeysListEntry entry : entries) {
+                    keys.add(new ParcelableKeyRing(
+                            entry.getFingerprintHex(), entry.getKeyIdHex(), entry.getExtraData())
+                    );
+                }
+            }
+            data.putParcelableArrayList(KeychainIntentService.IMPORT_KEY_LIST, keys);
 
             intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index 1138c9e9c..0b28a2594 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -162,7 +162,7 @@ public class KeyListFragment extends LoaderFragment
                         }
                     }
                 };
-                new KeyUpdateHelper().updateAllKeys(getActivity(), finishedHandler);
+                // new KeyUpdateHelper().updateAllKeys(getActivity(), finishedHandler);
                 updateActionbarForSwipe(false);
             }
         });
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeScanActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeScanActivity.java
index 56e3fac62..ba1d03636 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeScanActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeScanActivity.java
@@ -33,6 +33,7 @@ import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.api.OpenKeychainIntents;
 import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
+import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
 import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
 import org.sufficientlysecure.keychain.operations.results.OperationResult;
 import org.sufficientlysecure.keychain.operations.results.SingletonResult;
@@ -142,7 +143,7 @@ public class QrCodeScanActivity extends FragmentActivity {
         }
     }
 
-    public void importKeys(final String fingerprint) {
+    public void importKeys(String fingerprint) {
         // Message is received after importing is done in KeychainIntentService
         KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(
                 this,
@@ -168,7 +169,7 @@ public class QrCodeScanActivity extends FragmentActivity {
                         return;
                     }
 
-                    if (!result.success()) {
+                    if ( ! result.success()) {
                         // only return if no success...
                         Intent data = new Intent();
                         data.putExtras(returnData);
@@ -191,20 +192,18 @@ public class QrCodeScanActivity extends FragmentActivity {
         // Send all information needed to service to query keys in other thread
         Intent intent = new Intent(this, KeychainIntentService.class);
 
-        intent.setAction(KeychainIntentService.ACTION_DOWNLOAD_AND_IMPORT_KEYS);
+        intent.setAction(KeychainIntentService.ACTION_IMPORT_KEYRING);
 
         // fill values for this action
         Bundle data = new Bundle();
 
-        data.putString(KeychainIntentService.DOWNLOAD_KEY_SERVER, cloudPrefs.keyserver);
+        data.putString(KeychainIntentService.IMPORT_KEY_SERVER, cloudPrefs.keyserver);
 
-        final ImportKeysListEntry keyEntry = new ImportKeysListEntry();
-        keyEntry.setFingerprintHex(fingerprint);
-        keyEntry.addOrigin(cloudPrefs.keyserver);
-        ArrayList<ImportKeysListEntry> selectedEntries = new ArrayList<ImportKeysListEntry>();
+        ParcelableKeyRing keyEntry = new ParcelableKeyRing(fingerprint, null, null);
+        ArrayList<ParcelableKeyRing> selectedEntries = new ArrayList<ParcelableKeyRing>();
         selectedEntries.add(keyEntry);
 
-        data.putParcelableArrayList(KeychainIntentService.DOWNLOAD_KEY_LIST, selectedEntries);
+        data.putParcelableArrayList(KeychainIntentService.IMPORT_KEY_LIST, selectedEntries);
 
         intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
@@ -219,5 +218,4 @@ public class QrCodeScanActivity extends FragmentActivity {
         startService(intent);
     }
 
-
 }