diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-15 20:11:58 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-15 20:11:58 +0200 |
| commit | 52c6d8f8e03ab0047f5e8ed6f46273ac24a87205 (patch) | |
| tree | 3349789b9e49fc49621ef7f648f9362d6ea9516a /OpenKeychain/src/main | |
| parent | a5ff2f8fe3def958026df0716799f99b40900b3f (diff) | |
| download | open-keychain-52c6d8f8e03ab0047f5e8ed6f46273ac24a87205.tar.gz open-keychain-52c6d8f8e03ab0047f5e8ed6f46273ac24a87205.tar.bz2 open-keychain-52c6d8f8e03ab0047f5e8ed6f46273ac24a87205.zip | |
Remove debug code
Diffstat (limited to 'OpenKeychain/src/main')
3 files changed, 3 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index e59874254..e74d585af 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -40,7 +40,7 @@ public final class Constants { public static final String CUSTOM_CONTACT_DATA_MIME_TYPE = "vnd.android.cursor.item/vnd.org.sufficientlysecure.keychain.key"; public static final String PROVIDER_AUTHORITY = BuildConfig.PROVIDER_CONTENT_AUTHORITY; - public static final String TEMPSTORAGE_AUTHORITY = BuildConfig.APPLICATION_ID + ".tempstorage"; + public static final String TEMP_FILE_PROVIDER_AUTHORITY = BuildConfig.APPLICATION_ID + ".tempstorage"; public static final String CLIPBOARD_LABEL = "Keychain"; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/TemporaryFileProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/TemporaryFileProvider.java index 2995ae88a..d1a6afa86 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/TemporaryFileProvider.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/TemporaryFileProvider.java @@ -63,7 +63,7 @@ public class TemporaryFileProvider extends ContentProvider { private static final String DB_NAME = "tempstorage.db"; private static final String TABLE_FILES = "files"; - public static final String AUTHORITY = Constants.TEMPSTORAGE_AUTHORITY; + public static final String AUTHORITY = Constants.TEMP_FILE_PROVIDER_AUTHORITY; public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY); private static final int DB_VERSION = 3; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java index f14590f2a..09447ec32 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java @@ -334,12 +334,6 @@ public class BackupCodeFragment extends CryptoOperationFragment<ExportKeyringPar return; } - // TODO remove debug code - if (backupCodeInput.toString().startsWith("ABC")) { - switchState(BackupCodeState.STATE_OK, true); - return; - } - switchState(BackupCodeState.STATE_INPUT_ERROR, true); } @@ -506,9 +500,7 @@ public class BackupCodeFragment extends CryptoOperationFragment<ExportKeyringPar @Nullable @Override public ExportKeyringParcel createOperationInput() { - // TODO replace debug code with real thing - // return new ExportKeyringParcel(new Passphrase(mBackupCode), mMasterKeyIds, mExportSecret, mCachedBackupUri); - return new ExportKeyringParcel(new Passphrase("abc"), mMasterKeyIds, mExportSecret, mCachedBackupUri); + return new ExportKeyringParcel(new Passphrase(mBackupCode), mMasterKeyIds, mExportSecret, mCachedBackupUri); } @Override |