From 862d1267a84b6592736a2d74b8523716a96c0986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 7 Mar 2014 23:07:11 +0100 Subject: [PATCH] rename library to avoid confusion and remove OpenKeychain specific intents --- .../keychain/api/OpenKeychainIntents.java | 37 ------------------ .../.gitignore | 0 .../AndroidManifest.xml | 2 +- .../LICENSE | 0 .../build.gradle | 0 .../project.properties | 0 .../ic_action_cancel_launchersize.png | Bin .../ic_action_cancel_launchersize_light.png | Bin .../ic_action_cancel_launchersize.png | Bin .../ic_action_cancel_launchersize_light.png | Bin .../ic_action_cancel_launchersize.png | Bin .../ic_action_cancel_launchersize_light.png | Bin .../ic_action_cancel_launchersize.png | Bin .../ic_action_cancel_launchersize_light.png | Bin .../res/values/strings.xml | 0 .../openintents/openpgp/IOpenPgpService.aidl | 0 .../org/openintents/openpgp/OpenPgpError.java | 0 .../openpgp/OpenPgpSignatureResult.java | 0 .../openintents/openpgp/util/OpenPgpApi.java | 0 .../openpgp/util/OpenPgpListPreference.java | 0 .../util/OpenPgpServiceConnection.java | 0 .../openpgp/util/OpenPgpUtils.java | 0 .../util/ParcelFileDescriptorUtil.java | 0 23 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 plugins/keychain-api-library/src/org/sufficientlysecure/keychain/api/OpenKeychainIntents.java rename plugins/{keychain-api-library => openpgp-api-library}/.gitignore (100%) rename plugins/{keychain-api-library => openpgp-api-library}/AndroidManifest.xml (85%) rename plugins/{keychain-api-library => openpgp-api-library}/LICENSE (100%) rename plugins/{keychain-api-library => openpgp-api-library}/build.gradle (100%) rename plugins/{keychain-api-library => openpgp-api-library}/project.properties (100%) rename plugins/{keychain-api-library => openpgp-api-library}/res/drawable-hdpi/ic_action_cancel_launchersize.png (100%) rename plugins/{keychain-api-library => openpgp-api-library}/res/drawable-hdpi/ic_action_cancel_launchersize_light.png (100%) rename plugins/{keychain-api-library => openpgp-api-library}/res/drawable-mdpi/ic_action_cancel_launchersize.png (100%) rename plugins/{keychain-api-library => openpgp-api-library}/res/drawable-mdpi/ic_action_cancel_launchersize_light.png (100%) rename plugins/{keychain-api-library => openpgp-api-library}/res/drawable-xhdpi/ic_action_cancel_launchersize.png (100%) rename plugins/{keychain-api-library => openpgp-api-library}/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png (100%) rename plugins/{keychain-api-library => openpgp-api-library}/res/drawable-xxhdpi/ic_action_cancel_launchersize.png (100%) rename plugins/{keychain-api-library => openpgp-api-library}/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png (100%) rename plugins/{keychain-api-library => openpgp-api-library}/res/values/strings.xml (100%) rename plugins/{keychain-api-library => openpgp-api-library}/src/org/openintents/openpgp/IOpenPgpService.aidl (100%) rename plugins/{keychain-api-library => openpgp-api-library}/src/org/openintents/openpgp/OpenPgpError.java (100%) rename plugins/{keychain-api-library => openpgp-api-library}/src/org/openintents/openpgp/OpenPgpSignatureResult.java (100%) rename plugins/{keychain-api-library => openpgp-api-library}/src/org/openintents/openpgp/util/OpenPgpApi.java (100%) rename plugins/{keychain-api-library => openpgp-api-library}/src/org/openintents/openpgp/util/OpenPgpListPreference.java (100%) rename plugins/{keychain-api-library => openpgp-api-library}/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java (100%) rename plugins/{keychain-api-library => openpgp-api-library}/src/org/openintents/openpgp/util/OpenPgpUtils.java (100%) rename plugins/{keychain-api-library => openpgp-api-library}/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java (100%) diff --git a/plugins/keychain-api-library/src/org/sufficientlysecure/keychain/api/OpenKeychainIntents.java b/plugins/keychain-api-library/src/org/sufficientlysecure/keychain/api/OpenKeychainIntents.java deleted file mode 100644 index 15aceb534..000000000 --- a/plugins/keychain-api-library/src/org/sufficientlysecure/keychain/api/OpenKeychainIntents.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2014 Dominik Schürmann - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.sufficientlysecure.keychain.api; - -public class OpenKeychainIntents { - - public static final String ENCRYPT = "org.sufficientlysecure.keychain.action.ENCRYPT"; - public static final String ENCRYPT_EXTRA_TEXT = "text"; // String - public static final String ENCRYPT_ASCII_ARMOR = "ascii_armor"; // boolean - - public static final String DECRYPT = "org.sufficientlysecure.keychain.action.DECRYPT"; - public static final String DECRYPT_EXTRA_TEXT = "text"; // String - - public static final String IMPORT_KEY = "org.sufficientlysecure.keychain.action.IMPORT_KEY"; - public static final String IMPORT_KEY_EXTRA_KEY_BYTES = "key_bytes"; // byte[] - - public static final String IMPORT_KEY_FROM_KEYSERVER = "org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_KEYSERVER"; - public static final String IMPORT_KEY_FROM_KEYSERVER_QUERY = "query"; // String - public static final String IMPORT_KEY_FROM_KEYSERVER_FINGERPRINT = "fingerprint"; // String - - public static final String IMPORT_KEY_FROM_QR_CODE = "org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_QR_CODE"; - -} diff --git a/plugins/keychain-api-library/.gitignore b/plugins/openpgp-api-library/.gitignore similarity index 100% rename from plugins/keychain-api-library/.gitignore rename to plugins/openpgp-api-library/.gitignore diff --git a/plugins/keychain-api-library/AndroidManifest.xml b/plugins/openpgp-api-library/AndroidManifest.xml similarity index 85% rename from plugins/keychain-api-library/AndroidManifest.xml rename to plugins/openpgp-api-library/AndroidManifest.xml index 90bc30b8a..c65fdfdd4 100644 --- a/plugins/keychain-api-library/AndroidManifest.xml +++ b/plugins/openpgp-api-library/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/plugins/keychain-api-library/LICENSE b/plugins/openpgp-api-library/LICENSE similarity index 100% rename from plugins/keychain-api-library/LICENSE rename to plugins/openpgp-api-library/LICENSE diff --git a/plugins/keychain-api-library/build.gradle b/plugins/openpgp-api-library/build.gradle similarity index 100% rename from plugins/keychain-api-library/build.gradle rename to plugins/openpgp-api-library/build.gradle diff --git a/plugins/keychain-api-library/project.properties b/plugins/openpgp-api-library/project.properties similarity index 100% rename from plugins/keychain-api-library/project.properties rename to plugins/openpgp-api-library/project.properties diff --git a/plugins/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png b/plugins/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png similarity index 100% rename from plugins/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png rename to plugins/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png diff --git a/plugins/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize_light.png b/plugins/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize_light.png similarity index 100% rename from plugins/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize_light.png rename to plugins/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize_light.png diff --git a/plugins/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png b/plugins/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png similarity index 100% rename from plugins/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png rename to plugins/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png diff --git a/plugins/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize_light.png b/plugins/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize_light.png similarity index 100% rename from plugins/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize_light.png rename to plugins/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize_light.png diff --git a/plugins/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png b/plugins/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png similarity index 100% rename from plugins/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png rename to plugins/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png diff --git a/plugins/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png b/plugins/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png similarity index 100% rename from plugins/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png rename to plugins/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png diff --git a/plugins/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png b/plugins/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png similarity index 100% rename from plugins/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png rename to plugins/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png diff --git a/plugins/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png b/plugins/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png similarity index 100% rename from plugins/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png rename to plugins/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png diff --git a/plugins/keychain-api-library/res/values/strings.xml b/plugins/openpgp-api-library/res/values/strings.xml similarity index 100% rename from plugins/keychain-api-library/res/values/strings.xml rename to plugins/openpgp-api-library/res/values/strings.xml diff --git a/plugins/keychain-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl b/plugins/openpgp-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl similarity index 100% rename from plugins/keychain-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl rename to plugins/openpgp-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl diff --git a/plugins/keychain-api-library/src/org/openintents/openpgp/OpenPgpError.java b/plugins/openpgp-api-library/src/org/openintents/openpgp/OpenPgpError.java similarity index 100% rename from plugins/keychain-api-library/src/org/openintents/openpgp/OpenPgpError.java rename to plugins/openpgp-api-library/src/org/openintents/openpgp/OpenPgpError.java diff --git a/plugins/keychain-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java b/plugins/openpgp-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java similarity index 100% rename from plugins/keychain-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java rename to plugins/openpgp-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java diff --git a/plugins/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java b/plugins/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java similarity index 100% rename from plugins/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java rename to plugins/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java diff --git a/plugins/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java b/plugins/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java similarity index 100% rename from plugins/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java rename to plugins/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java diff --git a/plugins/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java b/plugins/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java similarity index 100% rename from plugins/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java rename to plugins/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java diff --git a/plugins/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java b/plugins/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java similarity index 100% rename from plugins/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java rename to plugins/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java diff --git a/plugins/keychain-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java b/plugins/openpgp-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java similarity index 100% rename from plugins/keychain-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java rename to plugins/openpgp-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java