diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-11 20:09:01 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-11 20:09:01 +0200 |
commit | d624d1c406ae95b3fc20b35d9063f4c8ba3bc0f9 (patch) | |
tree | 80e290bde3d300c16c0f6bd9ca00fbf27d2a1b01 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui | |
parent | 305b8c1858247a0c0a1f73a405d4c2cf0733e818 (diff) | |
download | open-keychain-d624d1c406ae95b3fc20b35d9063f4c8ba3bc0f9.tar.gz open-keychain-d624d1c406ae95b3fc20b35d9063f4c8ba3bc0f9.tar.bz2 open-keychain-d624d1c406ae95b3fc20b35d9063f4c8ba3bc0f9.zip |
Remove some Ids...
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
5 files changed, 41 insertions, 44 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java index e8e5b14bc..bac68c4a7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java @@ -30,28 +30,24 @@ import android.widget.TextView; import com.beardedhen.androidbootstrap.BootstrapButton; -import org.spongycastle.openpgp.PGPPublicKey; -import org.spongycastle.openpgp.PGPPublicKeyRing; import org.spongycastle.openpgp.PGPSecretKey; import org.spongycastle.openpgp.PGPSecretKeyRing; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Id; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; -import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.util.Log; -import java.util.HashMap; import java.util.Vector; public class EncryptAsymmetricFragment extends Fragment { public static final String ARG_SIGNATURE_KEY_ID = "signature_key_id"; public static final String ARG_ENCRYPTION_KEY_IDS = "encryption_key_ids"; - public static final int RESULT_CODE_PUBLIC_KEYS = 0x00007001; - public static final int RESULT_CODE_SECRET_KEYS = 0x00007002; + public static final int REQUEST_CODE_PUBLIC_KEYS = 0x00007001; + public static final int REQUEST_CODE_SECRET_KEYS = 0x00007002; ProviderHelper mProviderHelper; @@ -242,18 +238,18 @@ public class EncryptAsymmetricFragment extends Fragment { } } intent.putExtra(SelectPublicKeyActivity.EXTRA_SELECTED_MASTER_KEY_IDS, initialKeyIds); - startActivityForResult(intent, Id.request.public_keys); + startActivityForResult(intent, REQUEST_CODE_PUBLIC_KEYS); } private void selectSecretKey() { Intent intent = new Intent(getActivity(), SelectSecretKeyActivity.class); - startActivityForResult(intent, Id.request.secret_keys); + startActivityForResult(intent, REQUEST_CODE_SECRET_KEYS); } @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { switch (requestCode) { - case RESULT_CODE_PUBLIC_KEYS: { + case REQUEST_CODE_PUBLIC_KEYS: { if (resultCode == Activity.RESULT_OK) { Bundle bundle = data.getExtras(); setEncryptionKeyIds(bundle @@ -262,7 +258,7 @@ public class EncryptAsymmetricFragment extends Fragment { break; } - case RESULT_CODE_SECRET_KEYS: { + case REQUEST_CODE_SECRET_KEYS: { if (resultCode == Activity.RESULT_OK) { Uri uriMasterKey = data.getData(); setSignatureKeyId(Long.valueOf(uriMasterKey.getLastPathSegment())); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java index 470c85715..ea54f493e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java @@ -106,12 +106,12 @@ public class EncryptFileFragment extends Fragment { mBrowse.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { FileHelper.openFile(EncryptFileFragment.this, mFilename.getText().toString(), "*/*", - Id.request.filename); + RESULT_CODE_FILE); } }); mFileCompression = (Spinner) view.findViewById(R.id.fileCompression); - Choice[] choices = new Choice[] { + Choice[] choices = new Choice[]{ new Choice(Id.choice.compression.none, getString(R.string.choice_none) + " (" + getString(R.string.compression_fast) + ")"), new Choice(Id.choice.compression.zip, "ZIP (" @@ -253,17 +253,17 @@ public class EncryptFileFragment extends Fragment { } if (mEncryptInterface.getSignatureKey() != 0 && - PassphraseCacheService.getCachedPassphrase(getActivity(), - mEncryptInterface.getSignatureKey()) == null) { + PassphraseCacheService.getCachedPassphrase(getActivity(), + mEncryptInterface.getSignatureKey()) == null) { PassphraseDialogFragment.show(getActivity(), mEncryptInterface.getSignatureKey(), - new Handler() { - @Override - public void handleMessage(Message message) { - if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) { - showOutputFileDialog(); + new Handler() { + @Override + public void handleMessage(Message message) { + if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) { + showOutputFileDialog(); + } } - } - }); + }); return; } @@ -292,9 +292,9 @@ public class EncryptFileFragment extends Fragment { data.putString(KeychainIntentService.ENCRYPT_SYMMETRIC_PASSPHRASE, passphrase); } else { data.putLong(KeychainIntentService.ENCRYPT_SIGNATURE_KEY_ID, - mEncryptInterface.getSignatureKey()); + mEncryptInterface.getSignatureKey()); data.putLongArray(KeychainIntentService.ENCRYPT_ENCRYPTION_KEYS_IDS, - mEncryptInterface.getEncryptionKeys()); + mEncryptInterface.getEncryptionKeys()); } Log.d(Constants.TAG, "mInputFilename=" + mInputFilename + ", mOutputFilename=" diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java index 31d5f3fd0..cde00a874 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java @@ -34,6 +34,8 @@ public class ImportKeysFileFragment extends Fragment { private ImportKeysActivity mImportActivity; private BootstrapButton mBrowse; + public static final int REQUEST_CODE_FILE = 0x00007003; + /** * Creates new instance of this fragment */ @@ -61,7 +63,7 @@ public class ImportKeysFileFragment extends Fragment { // setting it to text/plain prevents Cynaogenmod's file manager from selecting asc // or gpg types! FileHelper.openFile(ImportKeysFileFragment.this, Constants.Path.APP_DIR + "/", - "*/*", Id.request.filename); + "*/*", REQUEST_CODE_FILE); } }); @@ -78,7 +80,7 @@ public class ImportKeysFileFragment extends Fragment { @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { switch (requestCode & 0xFFFF) { - case Id.request.filename: { + case REQUEST_CODE_FILE: { if (resultCode == Activity.RESULT_OK && data != null) { // load data diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java index 7f02a0472..c8c99c054 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java @@ -44,6 +44,8 @@ public class PreferencesActivity extends PreferenceActivity { public static final String ACTION_PREFS_GEN = "org.sufficientlysecure.keychain.ui.PREFS_GEN"; public static final String ACTION_PREFS_ADV = "org.sufficientlysecure.keychain.ui.PREFS_ADV"; + public static final int REQUEST_CODE_KEYSERVER_PREF = 0x00007005; + private PreferenceScreen mKeyServerPreference = null; private static Preferences sPreferences; @@ -76,7 +78,7 @@ public class PreferencesActivity extends PreferenceActivity { PreferencesKeyServerActivity.class); intent.putExtra(PreferencesKeyServerActivity.EXTRA_KEY_SERVERS, sPreferences.getKeyServers()); - startActivityForResult(intent, Id.request.key_server_preference); + startActivityForResult(intent, REQUEST_CODE_KEYSERVER_PREF); return false; } }); @@ -88,12 +90,12 @@ public class PreferencesActivity extends PreferenceActivity { (IntegerListPreference) findPreference(Constants.Pref.DEFAULT_ENCRYPTION_ALGORITHM)); int[] valueIds = new int[]{Id.choice.compression.none, Id.choice.compression.zip, - Id.choice.compression.zlib, Id.choice.compression.bzip2, }; + Id.choice.compression.zlib, Id.choice.compression.bzip2,}; String[] entries = new String[]{ getString(R.string.choice_none) + " (" + getString(R.string.compression_fast) + ")", "ZIP (" + getString(R.string.compression_fast) + ")", "ZLIB (" + getString(R.string.compression_fast) + ")", - "BZIP2 (" + getString(R.string.compression_very_slow) + ")", }; + "BZIP2 (" + getString(R.string.compression_very_slow) + ")",}; String[] values = new String[valueIds.length]; for (int i = 0; i < values.length; ++i) { values[i] = "" + valueIds[i]; @@ -126,7 +128,7 @@ public class PreferencesActivity extends PreferenceActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { switch (requestCode) { - case Id.request.key_server_preference: { + case REQUEST_CODE_KEYSERVER_PREF: { if (resultCode == RESULT_CANCELED || data == null) { return; } @@ -180,7 +182,7 @@ public class PreferencesActivity extends PreferenceActivity { PreferencesKeyServerActivity.class); intent.putExtra(PreferencesKeyServerActivity.EXTRA_KEY_SERVERS, sPreferences.getKeyServers()); - startActivityForResult(intent, Id.request.key_server_preference); + startActivityForResult(intent, REQUEST_CODE_KEYSERVER_PREF); return false; } }); @@ -189,7 +191,7 @@ public class PreferencesActivity extends PreferenceActivity { @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { switch (requestCode) { - case Id.request.key_server_preference: { + case REQUEST_CODE_KEYSERVER_PREF: { if (resultCode == RESULT_CANCELED || data == null) { return; } @@ -225,12 +227,12 @@ public class PreferencesActivity extends PreferenceActivity { (IntegerListPreference) findPreference(Constants.Pref.DEFAULT_ENCRYPTION_ALGORITHM)); int[] valueIds = new int[]{Id.choice.compression.none, Id.choice.compression.zip, - Id.choice.compression.zlib, Id.choice.compression.bzip2, }; + Id.choice.compression.zlib, Id.choice.compression.bzip2,}; String[] entries = new String[]{ getString(R.string.choice_none) + " (" + getString(R.string.compression_fast) + ")", "ZIP (" + getString(R.string.compression_fast) + ")", "ZLIB (" + getString(R.string.compression_fast) + ")", - "BZIP2 (" + getString(R.string.compression_very_slow) + ")", }; + "BZIP2 (" + getString(R.string.compression_very_slow) + ")",}; String[] values = new String[valueIds.length]; for (int i = 0; i < values.length; ++i) { values[i] = "" + valueIds[i]; @@ -280,9 +282,9 @@ public class PreferencesActivity extends PreferenceActivity { int valueIds[] = {PGPEncryptedData.AES_128, PGPEncryptedData.AES_192, PGPEncryptedData.AES_256, PGPEncryptedData.BLOWFISH, PGPEncryptedData.TWOFISH, PGPEncryptedData.CAST5, PGPEncryptedData.DES, PGPEncryptedData.TRIPLE_DES, - PGPEncryptedData.IDEA, }; + PGPEncryptedData.IDEA,}; String entries[] = {"AES-128", "AES-192", "AES-256", "Blowfish", "Twofish", "CAST5", - "DES", "Triple DES", "IDEA", }; + "DES", "Triple DES", "IDEA",}; String values[] = new String[valueIds.length]; for (int i = 0; i < values.length; ++i) { values[i] = "" + valueIds[i]; @@ -307,9 +309,9 @@ public class PreferencesActivity extends PreferenceActivity { (final IntegerListPreference mHashAlgorithm, int[] valueIds, String[] entries, String[] values) { valueIds = new int[]{HashAlgorithmTags.MD5, HashAlgorithmTags.RIPEMD160, HashAlgorithmTags.SHA1, HashAlgorithmTags.SHA224, HashAlgorithmTags.SHA256, - HashAlgorithmTags.SHA384, HashAlgorithmTags.SHA512, }; + HashAlgorithmTags.SHA384, HashAlgorithmTags.SHA512,}; entries = new String[]{"MD5", "RIPEMD-160", "SHA-1", "SHA-224", "SHA-256", "SHA-384", - "SHA-512", }; + "SHA-512",}; values = new String[valueIds.length]; for (int i = 0; i < values.length; ++i) { values[i] = "" + valueIds[i]; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index 76b69ac37..4c3786315 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -41,7 +41,6 @@ import android.view.Window; import com.devspark.appmsg.AppMsg; import org.sufficientlysecure.keychain.Constants; -import org.sufficientlysecure.keychain.Id; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.compatibility.ClipboardReflection; import org.sufficientlysecure.keychain.helper.ExportHelper; @@ -54,8 +53,6 @@ import org.sufficientlysecure.keychain.ui.dialog.ShareQrCodeDialogFragment; import org.sufficientlysecure.keychain.util.Log; import java.io.IOException; -import java.security.Provider; -import java.util.ArrayList; import java.util.HashMap; public class ViewKeyActivity extends ActionBarActivity { @@ -70,7 +67,7 @@ public class ViewKeyActivity extends ActionBarActivity { ViewPager mViewPager; TabsAdapter mTabsAdapter; - private static final int RESULT_CODE_LOOKUP_KEY = 0x00007006; + public static final int REQUEST_CODE_LOOKUP_KEY = 0x00007006; // NFC private NfcAdapter mNfcAdapter; @@ -189,7 +186,7 @@ public class ViewKeyActivity extends ActionBarActivity { private void uploadToKeyserver(Uri dataUri) { Intent uploadIntent = new Intent(this, UploadKeyActivity.class); uploadIntent.setData(dataUri); - startActivityForResult(uploadIntent, Id.request.export_to_server); + startActivityForResult(uploadIntent, 0); } private void updateFromKeyserver(Uri dataUri, ProviderHelper providerHelper) { @@ -202,7 +199,7 @@ public class ViewKeyActivity extends ActionBarActivity { queryIntent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN); queryIntent.putExtra(ImportKeysActivity.EXTRA_FINGERPRINT, fingerprint); - startActivityForResult(queryIntent, RESULT_CODE_LOOKUP_KEY); + startActivityForResult(queryIntent, REQUEST_CODE_LOOKUP_KEY); } private void shareKey(Uri dataUri, boolean fingerprintOnly, ProviderHelper providerHelper) { @@ -298,7 +295,7 @@ public class ViewKeyActivity extends ActionBarActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { switch (requestCode) { - case RESULT_CODE_LOOKUP_KEY: { + case REQUEST_CODE_LOOKUP_KEY: { if (resultCode == Activity.RESULT_OK) { // TODO: reload key??? move this into fragment? } |