diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index 7ec395010..a8e2c99f8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -75,7 +75,7 @@ public final class Constants { public static final String FINGERPRINT_SCHEME = "openpgp4fpr"; // used by openpgp-skt - public static final String TRANSFER_SCHEME = "pgp+transfer"; + public static final String SKT_SCHEME = "OPGPSKT"; public static final String BOUNCY_CASTLE_PROVIDER_NAME = BouncyCastleProvider.PROVIDER_NAME; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/SktUri.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/SktUri.java index 21f9ee3c5..e73f756d6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/SktUri.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/SktUri.java @@ -17,9 +17,8 @@ import org.sufficientlysecure.keychain.util.Log; @AutoValue abstract class SktUri { - private static final String SKT_SCHEME = "OPGPSKT"; - private static final String QRCODE_URI_FORMAT = SKT_SCHEME + ":%s/%d/%s"; - private static final String QRCODE_URI_FORMAT_SSID = SKT_SCHEME + ":%s/%d/%s/SSID:%s"; + private static final String QRCODE_URI_FORMAT = Constants.SKT_SCHEME + ":%s/%d/%s"; + private static final String QRCODE_URI_FORMAT_SSID = Constants.SKT_SCHEME + ":%s/%d/%s/SSID:%s"; public abstract String getHost(); @@ -31,7 +30,7 @@ abstract class SktUri { @NonNull public static SktUri parse(String input) throws URISyntaxException { - if (!input.startsWith(SKT_SCHEME + ":")) { + if (!input.startsWith(Constants.SKT_SCHEME + ":")) { throw new URISyntaxException(input, "invalid scheme"); } 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 4313c05cd..0eb74f8a5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java @@ -145,7 +145,7 @@ public class ImportKeysProxyActivity extends FragmentActivity Log.d(Constants.TAG, "scanned: " + uri); // example: pgp+transfer: - if (uri != null && uri.getScheme() != null && uri.getScheme().equalsIgnoreCase(Constants.TRANSFER_SCHEME)) { + if (uri != null && uri.getScheme() != null && uri.getScheme().equalsIgnoreCase(Constants.SKT_SCHEME)) { Intent intent = new Intent(this, MainActivity.class); intent.putExtra(MainActivity.EXTRA_INIT_FRAG, MainActivity.ID_TRANSFER); intent.putExtra(TransferFragment.EXTRA_OPENPGP_SKT_INFO, uri);