From 5f56d3b85a125d86c3965b3c74ef9e6d0fde5bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 7 Feb 2017 21:17:15 +0100 Subject: [PATCH] Move intents into Constants class --- .../keychain/Constants.java | 13 ++++++ .../keychain/intents/OpenKeychainIntents.java | 45 ------------------- .../keychain/ui/DecryptActivity.java | 4 +- .../keychain/ui/EncryptFilesActivity.java | 6 +-- .../keychain/ui/EncryptTextActivity.java | 5 +-- .../keychain/ui/ImportKeysActivity.java | 11 +++-- .../keychain/ui/ImportKeysProxyActivity.java | 3 +- 7 files changed, 26 insertions(+), 61 deletions(-) delete mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/intents/OpenKeychainIntents.java diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index 3e6b1f24e..407566694 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -87,6 +87,19 @@ public final class Constants { public static final String SAFESLINGER_SERVER = "safeslinger-openpgp.appspot.com"; + // Intents API + public static final String ENCRYPT_TEXT = INTENT_PREFIX + "ENCRYPT_TEXT"; + public static final String ENCRYPT_EXTRA_TEXT = EXTRA_PREFIX + "EXTRA_TEXT"; // String + public static final String ENCRYPT_DATA = INTENT_PREFIX + "ENCRYPT_DATA"; + public static final String ENCRYPT_EXTRA_ASCII_ARMOR = EXTRA_PREFIX + "EXTRA_ASCII_ARMOR"; // boolean + public static final String DECRYPT_DATA = INTENT_PREFIX + "DECRYPT_DATA"; + public static final String IMPORT_KEY = INTENT_PREFIX + "IMPORT_KEY"; + public static final String IMPORT_EXTRA_KEY_EXTRA_KEY_BYTES = EXTRA_PREFIX + "EXTRA_KEY_BYTES"; // byte[] + public static final String IMPORT_KEY_FROM_KEYSERVER = INTENT_PREFIX + "IMPORT_KEY_FROM_KEYSERVER"; + public static final String IMPORT_KEY_FROM_KEYSERVER_EXTRA_QUERY = EXTRA_PREFIX + "EXTRA_QUERY"; // String + public static final String IMPORT_KEY_FROM_KEYSERVER_EXTRA_FINGERPRINT = EXTRA_PREFIX + "EXTRA_FINGERPRINT"; // String + public static final String IMPORT_KEY_FROM_QR_CODE = INTENT_PREFIX + "IMPORT_KEY_FROM_QR_CODE"; + public static final class Path { public static final File APP_DIR = new File(Environment.getExternalStorageDirectory(), "OpenKeychain"); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/intents/OpenKeychainIntents.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/intents/OpenKeychainIntents.java deleted file mode 100644 index 37f7c307c..000000000 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/intents/OpenKeychainIntents.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2014-2017 Dominik Schürmann - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.sufficientlysecure.keychain.intents; - -public class OpenKeychainIntents { - private static final String PACKAGE_NAME = "org.sufficientlysecure.keychain"; - - // prefix packagename for exported Intents - // as described in http://developer.android.com/guide/components/intents-filters.html - private static final String INTENT_PREFIX = PACKAGE_NAME + ".action."; - private static final String EXTRA_PREFIX = PACKAGE_NAME + "."; - - public static final String ENCRYPT_TEXT = INTENT_PREFIX + "ENCRYPT_TEXT"; - public static final String ENCRYPT_EXTRA_TEXT = EXTRA_PREFIX + "EXTRA_TEXT"; // String - - public static final String ENCRYPT_DATA = INTENT_PREFIX + "ENCRYPT_DATA"; - public static final String ENCRYPT_EXTRA_ASCII_ARMOR = EXTRA_PREFIX + "EXTRA_ASCII_ARMOR"; // boolean - - public static final String DECRYPT_DATA = INTENT_PREFIX + "DECRYPT_DATA"; - - public static final String IMPORT_KEY = INTENT_PREFIX + "IMPORT_KEY"; - public static final String IMPORT_EXTRA_KEY_EXTRA_KEY_BYTES = EXTRA_PREFIX + "EXTRA_KEY_BYTES"; // byte[] - - public static final String IMPORT_KEY_FROM_KEYSERVER = INTENT_PREFIX + "IMPORT_KEY_FROM_KEYSERVER"; - public static final String IMPORT_KEY_FROM_KEYSERVER_EXTRA_QUERY = EXTRA_PREFIX + "EXTRA_QUERY"; // String - public static final String IMPORT_KEY_FROM_KEYSERVER_EXTRA_FINGERPRINT = EXTRA_PREFIX + "EXTRA_FINGERPRINT"; // String - - public static final String IMPORT_KEY_FROM_QR_CODE = INTENT_PREFIX + "IMPORT_KEY_FROM_QR_CODE"; - -} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java index cf7a0b1d7..f7fcc4b47 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java @@ -34,8 +34,8 @@ import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.widget.Toast; +import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.intents.OpenKeychainIntents; import org.sufficientlysecure.keychain.pgp.PgpHelper; import org.sufficientlysecure.keychain.provider.TemporaryFileProvider; import org.sufficientlysecure.keychain.ui.base.BaseActivity; @@ -157,7 +157,7 @@ public class DecryptActivity extends BaseActivity { // for everything else, just work on the intent data case Intent.ACTION_VIEW: canDelete = true; - case OpenKeychainIntents.DECRYPT_DATA: + case Constants.DECRYPT_DATA: default: Uri uri = intent.getData(); if (uri != null) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java index d6b7d43bb..22a136153 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java @@ -24,18 +24,18 @@ import android.net.Uri; import android.os.Bundle; import android.support.v4.app.FragmentTransaction; +import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.intents.OpenKeychainIntents; import java.util.ArrayList; public class EncryptFilesActivity extends EncryptActivity { // Intents - public static final String ACTION_ENCRYPT_DATA = OpenKeychainIntents.ENCRYPT_DATA; + public static final String ACTION_ENCRYPT_DATA = Constants.ENCRYPT_DATA; // enables ASCII Armor for file encryption when uri is given - public static final String EXTRA_ASCII_ARMOR = OpenKeychainIntents.ENCRYPT_EXTRA_ASCII_ARMOR; + public static final String EXTRA_ASCII_ARMOR = Constants.ENCRYPT_EXTRA_ASCII_ARMOR; @Override public void onCreate(Bundle savedInstanceState) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java index 50dbc9a8b..45819bc9d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java @@ -31,7 +31,6 @@ import android.widget.Toast; import org.apache.james.mime4j.util.MimeUtil; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.intents.OpenKeychainIntents; import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.ui.util.Notify.Style; import org.sufficientlysecure.keychain.util.FileHelper; @@ -40,10 +39,10 @@ import org.sufficientlysecure.keychain.util.Log; public class EncryptTextActivity extends EncryptActivity { /* Intents */ - public static final String ACTION_ENCRYPT_TEXT = OpenKeychainIntents.ENCRYPT_TEXT; + public static final String ACTION_ENCRYPT_TEXT = Constants.ENCRYPT_TEXT; /* EXTRA keys for input */ - public static final String EXTRA_TEXT = OpenKeychainIntents.ENCRYPT_EXTRA_TEXT; + public static final String EXTRA_TEXT = Constants.ENCRYPT_EXTRA_TEXT; @Override public void onCreate(Bundle savedInstanceState) { 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 4b4463a30..a6bd1e552 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -28,7 +28,6 @@ import android.view.ViewGroup; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.intents.OpenKeychainIntents; import org.sufficientlysecure.keychain.keyimport.FacebookKeyserver; import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry; import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; @@ -53,8 +52,8 @@ import java.util.List; public class ImportKeysActivity extends BaseActivity implements ImportKeysListener { - public static final String ACTION_IMPORT_KEY = OpenKeychainIntents.IMPORT_KEY; - public static final String ACTION_IMPORT_KEY_FROM_KEYSERVER = OpenKeychainIntents.IMPORT_KEY_FROM_KEYSERVER; + public static final String ACTION_IMPORT_KEY = Constants.IMPORT_KEY; + public static final String ACTION_IMPORT_KEY_FROM_KEYSERVER = Constants.IMPORT_KEY_FROM_KEYSERVER; public static final String ACTION_IMPORT_KEY_FROM_FACEBOOK = Constants.INTENT_PREFIX + "IMPORT_KEY_FROM_FACEBOOK"; public static final String ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN_RESULT = @@ -70,12 +69,12 @@ public class ImportKeysActivity extends BaseActivity implements ImportKeysListen public static final String EXTRA_RESULT = "result"; // only used by ACTION_IMPORT_KEY - public static final String EXTRA_KEY_BYTES = OpenKeychainIntents.IMPORT_EXTRA_KEY_EXTRA_KEY_BYTES; + public static final String EXTRA_KEY_BYTES = Constants.IMPORT_EXTRA_KEY_EXTRA_KEY_BYTES; // only used by ACTION_IMPORT_KEY_FROM_KEYSERVER - public static final String EXTRA_QUERY = OpenKeychainIntents.IMPORT_KEY_FROM_KEYSERVER_EXTRA_QUERY; + public static final String EXTRA_QUERY = Constants.IMPORT_KEY_FROM_KEYSERVER_EXTRA_QUERY; public static final String EXTRA_KEY_ID = Constants.EXTRA_PREFIX + "EXTRA_KEY_ID"; - public static final String EXTRA_FINGERPRINT = OpenKeychainIntents.IMPORT_KEY_FROM_KEYSERVER_EXTRA_FINGERPRINT; + public static final String EXTRA_FINGERPRINT = Constants.IMPORT_KEY_FROM_KEYSERVER_EXTRA_FINGERPRINT; public static final String TAG_FRAG_LIST = "frag_list"; public static final String TAG_FRAG_TOP = "frag_top"; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java index fa91be2e4..89c6eaad4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java @@ -33,7 +33,6 @@ import com.google.zxing.integration.android.IntentResult; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.intents.OpenKeychainIntents; import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; import org.sufficientlysecure.keychain.operations.results.ImportKeyResult; import org.sufficientlysecure.keychain.operations.results.OperationResult; @@ -55,7 +54,7 @@ import java.util.Locale; public class ImportKeysProxyActivity extends FragmentActivity implements CryptoOperationHelper.Callback { - public static final String ACTION_QR_CODE_API = OpenKeychainIntents.IMPORT_KEY_FROM_QR_CODE; + public static final String ACTION_QR_CODE_API = Constants.IMPORT_KEY_FROM_QR_CODE; // implies activity returns scanned fingerprint as extra and does not import public static final String ACTION_SCAN_WITH_RESULT = Constants.INTENT_PREFIX + "SCAN_QR_CODE_WITH_RESULT"; public static final String ACTION_SCAN_IMPORT = Constants.INTENT_PREFIX + "SCAN_QR_CODE_IMPORT";