Restructure

8 files changed, 18 insertions, 14 deletions

diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index d87e8ec0d..f011e6929 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -299,10 +299,6 @@
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_preferences" />
         <activity
-            android:name=".ui.CryptoConsumersActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:label="@string/title_crypto_consumers" />
-        <activity
             android:name=".ui.PreferencesKeyServerActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_keyServerPreference"
@@ -460,21 +456,25 @@
             android:authorities="org.sufficientlysecure.keychain.provider.apgserviceblobprovider"
             android:permission="org.sufficientlysecure.keychain.permission.ACCESS_API" />
 
-        <!-- Crypto Provider internal intents -->
+        <!-- Remote API internal intents -->
 
         <activity
-            android:name=".crypto_provider.ServiceActivity"
+            android:name="org.sufficientlysecure.keychain.remote_api.ServiceActivity"
             android:exported="false"
             android:label="TODO crypto activity"
             android:process=":crypto" >
 
             <!-- Don't publish intents, they are only used internally! -->
         </activity>
+        <activity
+            android:name="org.sufficientlysecure.keychain.remote_api.CryptoConsumersActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+            android:label="@string/title_crypto_consumers" />
 
-        <!-- Crypto Provider API -->
+        <!-- Remote API -->
 
         <service
-            android:name="org.sufficientlysecure.keychain.crypto_provider.CryptoService"
+            android:name="org.sufficientlysecure.keychain.remote_api.CryptoService"
             android:enabled="true"
             android:exported="true"
             android:process=":crypto" >
diff --git a/OpenPGP-Keychain/res/layout/crypto_consumers_activity.xml b/OpenPGP-Keychain/res/layout/crypto_consumers_activity.xml
index 87a7c1739..b314173eb 100644
--- a/OpenPGP-Keychain/res/layout/crypto_consumers_activity.xml
+++ b/OpenPGP-Keychain/res/layout/crypto_consumers_activity.xml
@@ -5,7 +5,7 @@
 
     <fragment
         android:id="@+id/crypto_consumers_list_fragment"
-        android:name="org.sufficientlysecure.keychain.ui.CryptoConsumersFragment"
+        android:name="org.sufficientlysecure.keychain.remote_api.CryptoConsumersFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersActivity.java
index 59eaa063f..e3aa0ed49 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersActivity.java
@@ -1,6 +1,7 @@
-package org.sufficientlysecure.keychain.ui;
+package org.sufficientlysecure.keychain.remote_api;
 
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.ui.MainActivity;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersFragment.java
index 8ecc5ced1..935d64560 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/CryptoConsumersFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoConsumersFragment.java
@@ -1,4 +1,4 @@
-package org.sufficientlysecure.keychain.ui;
+package org.sufficientlysecure.keychain.remote_api;
 
 import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumers;
 import org.sufficientlysecure.keychain.util.Log;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java
index e601620ea..c7d40d376 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.sufficientlysecure.keychain.crypto_provider;
+package org.sufficientlysecure.keychain.remote_api;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -33,6 +33,7 @@ import org.sufficientlysecure.keychain.util.InputData;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.remote_api.IServiceActivityCallback;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
 import org.sufficientlysecure.keychain.service.PassphraseCacheService;
 import org.sufficientlysecure.keychain.util.PausableThreadPoolExecutor;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/IServiceActivityCallback.aidl b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/IServiceActivityCallback.aidl
index 61a8da06c..871560cc8 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/IServiceActivityCallback.aidl
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/IServiceActivityCallback.aidl
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.sufficientlysecure.keychain.crypto_provider;
+package org.sufficientlysecure.keychain.remote_api;
 
 
 interface IServiceActivityCallback {
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
index 7efce85c7..055de9be1 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ServiceActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/ServiceActivity.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.sufficientlysecure.keychain.crypto_provider;
+package org.sufficientlysecure.keychain.remote_api;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.remote_api.IServiceActivityCallback;
 import org.sufficientlysecure.keychain.helper.PgpMain;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
index a108b3db4..434db7a29 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -19,6 +19,7 @@ package org.sufficientlysecure.keychain.ui;
 
 import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.remote_api.CryptoConsumersActivity;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockActivity;