From 2b98f2a0d7e37542a062886437c3f7b14599a4da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 15 Feb 2014 17:09:21 +0100 Subject: [PATCH] Restructure API lib folder to support Eclipse --- .../keychain/demo/OpenPgpProviderActivity.java | 2 +- .../{src/main => }/AndroidManifest.xml | 0 .../libraries/keychain-api-library/build.gradle | 13 +++++++++++++ .../org/openintents/openpgp/IOpenPgpService.aidl | 0 .../org/openintents/openpgp/OpenPgpError.java | 0 .../openintents/openpgp/OpenPgpSignatureResult.java | 0 .../org/openintents/openpgp/util/OpenPgpApi.java | 0 .../openintents/openpgp/util/OpenPgpConstants.java | 0 .../openpgp/util/OpenPgpListPreference.java | 0 .../openpgp/util/OpenPgpServiceConnection.java | 0 .../org/openintents/openpgp/util/OpenPgpUtils.java | 0 .../openpgp/util/ParcelFileDescriptorUtil.java | 0 .../service/remote/RemoteServiceActivity.java | 6 ++---- .../{src/main => }/AndroidManifest.xml | 0 libraries/keychain-api-library/build.gradle | 13 +++++++++++++ .../org/openintents/openpgp/IOpenPgpService.aidl | 0 .../org/openintents/openpgp/OpenPgpError.java | 0 .../openintents/openpgp/OpenPgpSignatureResult.java | 0 .../org/openintents/openpgp/util/OpenPgpApi.java | 0 .../openintents/openpgp/util/OpenPgpConstants.java | 0 .../openpgp/util/OpenPgpListPreference.java | 0 .../openpgp/util/OpenPgpServiceConnection.java | 0 .../org/openintents/openpgp/util/OpenPgpUtils.java | 0 .../openpgp/util/ParcelFileDescriptorUtil.java | 0 24 files changed, 29 insertions(+), 5 deletions(-) rename OpenPGP-Keychain-API/libraries/keychain-api-library/{src/main => }/AndroidManifest.xml (100%) rename OpenPGP-Keychain-API/libraries/keychain-api-library/src/{main/aidl => }/org/openintents/openpgp/IOpenPgpService.aidl (100%) rename OpenPGP-Keychain-API/libraries/keychain-api-library/src/{main/java => }/org/openintents/openpgp/OpenPgpError.java (100%) rename OpenPGP-Keychain-API/libraries/keychain-api-library/src/{main/java => }/org/openintents/openpgp/OpenPgpSignatureResult.java (100%) rename OpenPGP-Keychain-API/libraries/keychain-api-library/src/{main/java => }/org/openintents/openpgp/util/OpenPgpApi.java (100%) rename OpenPGP-Keychain-API/libraries/keychain-api-library/src/{main/java => }/org/openintents/openpgp/util/OpenPgpConstants.java (100%) rename OpenPGP-Keychain-API/libraries/keychain-api-library/src/{main/java => }/org/openintents/openpgp/util/OpenPgpListPreference.java (100%) rename OpenPGP-Keychain-API/libraries/keychain-api-library/src/{main/java => }/org/openintents/openpgp/util/OpenPgpServiceConnection.java (100%) rename OpenPGP-Keychain-API/libraries/keychain-api-library/src/{main/java => }/org/openintents/openpgp/util/OpenPgpUtils.java (100%) rename OpenPGP-Keychain-API/libraries/keychain-api-library/src/{main/java => }/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java (100%) rename libraries/keychain-api-library/{src/main => }/AndroidManifest.xml (100%) rename libraries/keychain-api-library/src/{main/aidl => }/org/openintents/openpgp/IOpenPgpService.aidl (100%) rename libraries/keychain-api-library/src/{main/java => }/org/openintents/openpgp/OpenPgpError.java (100%) rename libraries/keychain-api-library/src/{main/java => }/org/openintents/openpgp/OpenPgpSignatureResult.java (100%) rename libraries/keychain-api-library/src/{main/java => }/org/openintents/openpgp/util/OpenPgpApi.java (100%) rename libraries/keychain-api-library/src/{main/java => }/org/openintents/openpgp/util/OpenPgpConstants.java (100%) rename libraries/keychain-api-library/src/{main/java => }/org/openintents/openpgp/util/OpenPgpListPreference.java (100%) rename libraries/keychain-api-library/src/{main/java => }/org/openintents/openpgp/util/OpenPgpServiceConnection.java (100%) rename libraries/keychain-api-library/src/{main/java => }/org/openintents/openpgp/util/OpenPgpUtils.java (100%) rename libraries/keychain-api-library/src/{main/java => }/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java (100%) diff --git a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java b/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java index 7e71ca45f..bf3943e1c 100644 --- a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java +++ b/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java @@ -289,7 +289,7 @@ public class OpenPgpProviderActivity extends Activity { } private void selectCryptoProvider() { - Intent intent = new Intent(IOpenPgpService.class.getName()); + Intent intent = new Intent(OpenPgpConstants.SERVICE_INTENT); final ArrayList providerList = new ArrayList(); diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/AndroidManifest.xml b/OpenPGP-Keychain-API/libraries/keychain-api-library/AndroidManifest.xml similarity index 100% rename from OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/AndroidManifest.xml rename to OpenPGP-Keychain-API/libraries/keychain-api-library/AndroidManifest.xml diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/build.gradle b/OpenPGP-Keychain-API/libraries/keychain-api-library/build.gradle index f9da72cb8..0c8668332 100644 --- a/OpenPGP-Keychain-API/libraries/keychain-api-library/build.gradle +++ b/OpenPGP-Keychain-API/libraries/keychain-api-library/build.gradle @@ -15,6 +15,19 @@ android { compileSdkVersion 19 buildToolsVersion '19.0.1' + // NOTE: We are using the old folder structure to also support Eclipse + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + } + // Do not abort build if lint finds errors lintOptions { abortOnError false diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/aidl/org/openintents/openpgp/IOpenPgpService.aidl b/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl similarity index 100% rename from OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/aidl/org/openintents/openpgp/IOpenPgpService.aidl rename to OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/OpenPgpError.java b/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/OpenPgpError.java similarity index 100% rename from OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/OpenPgpError.java rename to OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/OpenPgpError.java diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/OpenPgpSignatureResult.java b/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java similarity index 100% rename from OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/OpenPgpSignatureResult.java rename to OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java b/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java similarity index 100% rename from OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java rename to OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpConstants.java b/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpConstants.java similarity index 100% rename from OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpConstants.java rename to OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpConstants.java diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpListPreference.java b/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java similarity index 100% rename from OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpListPreference.java rename to OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpServiceConnection.java b/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java similarity index 100% rename from OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpServiceConnection.java rename to OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpUtils.java b/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java similarity index 100% rename from OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpUtils.java rename to OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java b/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java similarity index 100% rename from OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java rename to OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java index 7c8eaab62..8f5b74650 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java @@ -182,8 +182,7 @@ public class RemoteServiceActivity extends ActionBarActivity { .getStringArrayListExtra(EXTRA_DUBLICATE_USER_IDS); // TODO: do this with spannable instead of HTML to prevent parsing failures with weird user ids - String text = new String(); - text += "" + getString(R.string.api_select_pub_keys_text) + ""; + String text = "" + getString(R.string.api_select_pub_keys_text) + ""; text += "

"; if (missingUserIds != null && missingUserIds.size() > 0) { text += getString(R.string.api_select_pub_keys_missing_text); @@ -258,8 +257,7 @@ public class RemoteServiceActivity extends ActionBarActivity { } else if (ACTION_ERROR_MESSAGE.equals(action)) { String errorMessage = intent.getStringExtra(EXTRA_ERROR_MESSAGE); - String text = new String(); - text += "" + errorMessage + ""; + String text = "" + errorMessage + ""; // Inflate a "Done" custom action bar view ActionBarHelper.setDoneView(getSupportActionBar(), R.string.btn_okay, diff --git a/libraries/keychain-api-library/src/main/AndroidManifest.xml b/libraries/keychain-api-library/AndroidManifest.xml similarity index 100% rename from libraries/keychain-api-library/src/main/AndroidManifest.xml rename to libraries/keychain-api-library/AndroidManifest.xml diff --git a/libraries/keychain-api-library/build.gradle b/libraries/keychain-api-library/build.gradle index f9da72cb8..0c8668332 100644 --- a/libraries/keychain-api-library/build.gradle +++ b/libraries/keychain-api-library/build.gradle @@ -15,6 +15,19 @@ android { compileSdkVersion 19 buildToolsVersion '19.0.1' + // NOTE: We are using the old folder structure to also support Eclipse + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + } + // Do not abort build if lint finds errors lintOptions { abortOnError false diff --git a/libraries/keychain-api-library/src/main/aidl/org/openintents/openpgp/IOpenPgpService.aidl b/libraries/keychain-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl similarity index 100% rename from libraries/keychain-api-library/src/main/aidl/org/openintents/openpgp/IOpenPgpService.aidl rename to libraries/keychain-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/OpenPgpError.java b/libraries/keychain-api-library/src/org/openintents/openpgp/OpenPgpError.java similarity index 100% rename from libraries/keychain-api-library/src/main/java/org/openintents/openpgp/OpenPgpError.java rename to libraries/keychain-api-library/src/org/openintents/openpgp/OpenPgpError.java diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/OpenPgpSignatureResult.java b/libraries/keychain-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java similarity index 100% rename from libraries/keychain-api-library/src/main/java/org/openintents/openpgp/OpenPgpSignatureResult.java rename to libraries/keychain-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java similarity index 100% rename from libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java rename to libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpConstants.java b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpConstants.java similarity index 100% rename from libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpConstants.java rename to libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpConstants.java diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpListPreference.java b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java similarity index 100% rename from libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpListPreference.java rename to libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpServiceConnection.java b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java similarity index 100% rename from libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpServiceConnection.java rename to libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpUtils.java b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java similarity index 100% rename from libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpUtils.java rename to libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java b/libraries/keychain-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java similarity index 100% rename from libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java rename to libraries/keychain-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java