cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove debug code

Browse Source
This commit is contained in:
Dominik Schürmann
2015-10-15 20:11:58 +02:00
parent a5ff2f8fe3
commit 52c6d8f8e0
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
View File

@@ -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 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 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"; public static final String CLIPBOARD_LABEL = "Keychain";

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/TemporaryFileProvider.java
View File

@@ -63,7 +63,7 @@ public class TemporaryFileProvider extends ContentProvider {
private static final String DB_NAME = "tempstorage.db"; private static final String DB_NAME = "tempstorage.db";
private static final String TABLE_FILES = "files"; 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); public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY);
private static final int DB_VERSION = 3; private static final int DB_VERSION = 3;

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
View File

@@ -334,12 +334,6 @@ public class BackupCodeFragment extends CryptoOperationFragment<ExportKeyringPar
return; return;
} }
// TODO remove debug code
if (backupCodeInput.toString().startsWith("ABC")) {
switchState(BackupCodeState.STATE_OK, true);
return;
}
switchState(BackupCodeState.STATE_INPUT_ERROR, true); switchState(BackupCodeState.STATE_INPUT_ERROR, true);
} }
@@ -506,9 +500,7 @@ public class BackupCodeFragment extends CryptoOperationFragment<ExportKeyringPar
@Nullable @Nullable
@Override @Override
public ExportKeyringParcel createOperationInput() { public ExportKeyringParcel createOperationInput() {
// TODO replace debug code with real thing return new ExportKeyringParcel(new Passphrase(mBackupCode), mMasterKeyIds, mExportSecret, mCachedBackupUri);
// return new ExportKeyringParcel(new Passphrase(mBackupCode), mMasterKeyIds, mExportSecret, mCachedBackupUri);
return new ExportKeyringParcel(new Passphrase("abc"), mMasterKeyIds, mExportSecret, mCachedBackupUri);
} }
@Override @Override