From 9f5581463f1b2d07217f59fa32346c786069dbf5 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Sun, 22 Mar 2015 03:31:13 +0530
Subject: shifted multi-threading to own service

added multi-threaded cloud import, restored KeychainIntentService

eliminated code duplication in multi-threaded import
---
 OpenKeychain/src/main/AndroidManifest.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenKeychain/src/main/AndroidManifest.xml')

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index d9f9766c9..5692144e7 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -697,6 +697,9 @@
         <service
             android:name=".service.KeychainIntentService"
             android:exported="false" />
+        <service
+            android:name=".service.CloudImportService"
+            android:exported="false" />
 
         <provider
             android:name=".provider.KeychainProvider"
-- 
cgit v1.2.3


From eeccd7cd1475f02a9f4650f1debc38ab6a66d866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 23 Mar 2015 23:04:35 +0100
Subject: 3.2beta3

---
 OpenKeychain/src/main/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/AndroidManifest.xml')

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 5692144e7..dbc50db26 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="org.sufficientlysecure.keychain"
     android:installLocation="auto"
-    android:versionCode="31202"
-    android:versionName="3.2beta2">
+    android:versionCode="31203"
+    android:versionName="3.2beta3">
 
     <!--
         General remarks
-- 
cgit v1.2.3