From bdc855d618f2e4a7e7d001c13d40d336cb4c567f Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 7 Sep 2017 16:07:17 +0200 Subject: [PATCH] token-import: add debug states for locked keys --- .../securitytoken/SecurityTokenInfo.java | 21 +++++++++++++++++++ .../ui/CreateSecurityTokenWaitFragment.java | 8 +++++++ 2 files changed, 29 insertions(+) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenInfo.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenInfo.java index 2e03d0ced..2f5af414d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenInfo.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenInfo.java @@ -67,4 +67,25 @@ public abstract class SecurityTokenInfo implements Parcelable { new byte[20], new byte[20], Hex.decode("010203040506"), "yubinu2@mugenguild.com", "http://valodim.stratum0.net/mryubinu2.asc", 3, 3); } + + public static SecurityTokenInfo newInstanceDebugLocked() { + if (!BuildConfig.DEBUG) { + throw new UnsupportedOperationException("This operation is only available in debug builds!"); + } + return SecurityTokenInfo.create( + KeyFormattingUtils.convertFingerprintHexFingerprint("4700BA1AC417ABEF3CC7765AD686905837779C3E"), + new byte[20], new byte[20], Hex.decode("010203040506"), + "yubinu2@mugenguild.com", "http://valodim.stratum0.net/mryubinu2.asc", 0, 3); + } + + public static SecurityTokenInfo newInstanceDebugLockedHard() { + if (!BuildConfig.DEBUG) { + throw new UnsupportedOperationException("This operation is only available in debug builds!"); + } + return SecurityTokenInfo.create( + KeyFormattingUtils.convertFingerprintHexFingerprint("4700BA1AC417ABEF3CC7765AD686905837779C3E"), + new byte[20], new byte[20], Hex.decode("010203040506"), + "yubinu2@mugenguild.com", "http://valodim.stratum0.net/mryubinu2.asc", 0, 0); + } + } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java index 4b67b2916..022dc0f2b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java @@ -72,6 +72,14 @@ public class CreateSecurityTokenWaitFragment extends Fragment { mCreateKeyActivity.loadFragment(ManageSecurityTokenFragment.newInstance( SecurityTokenInfo.newInstanceDebugKeyserver()), FragAction.TO_RIGHT); break; + case R.id.menu_token_debug_locked: + mCreateKeyActivity.loadFragment(ManageSecurityTokenFragment.newInstance( + SecurityTokenInfo.newInstanceDebugLocked()), FragAction.TO_RIGHT); + break; + case R.id.menu_token_debug_locked_hard: + mCreateKeyActivity.loadFragment(ManageSecurityTokenFragment.newInstance( + SecurityTokenInfo.newInstanceDebugLockedHard()), FragAction.TO_RIGHT); + break; } return super.onOptionsItemSelected(item); }