PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

tls-psk: fix scan from proxy activity, and use Constants.SKT_SCHEME everywhere

Browse source
This commit is contained in:
Vincent Breitmoser 2017-06-20 19:28:29 +02:00
parent 4f5f5219bd
commit f76a0f47b5
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,7 +75,7 @@ public final class Constants {
public static final String FINGERPRINT_SCHEME = "openpgp4fpr"; public static final String FINGERPRINT_SCHEME = "openpgp4fpr";
// used by openpgp-skt // 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; public static final String BOUNCY_CASTLE_PROVIDER_NAME = BouncyCastleProvider.PROVIDER_NAME;

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/SktUri.java
View file

@ -17,9 +17,8 @@ import org.sufficientlysecure.keychain.util.Log;
@AutoValue @AutoValue
abstract class SktUri { abstract class SktUri {
private static final String SKT_SCHEME = "OPGPSKT"; private static final String QRCODE_URI_FORMAT = Constants.SKT_SCHEME + ":%s/%d/%s";
private static final String QRCODE_URI_FORMAT = SKT_SCHEME + ":%s/%d/%s"; private static final String QRCODE_URI_FORMAT_SSID = Constants.SKT_SCHEME + ":%s/%d/%s/SSID:%s";
private static final String QRCODE_URI_FORMAT_SSID = SKT_SCHEME + ":%s/%d/%s/SSID:%s";
public abstract String getHost(); public abstract String getHost();
@ -31,7 +30,7 @@ abstract class SktUri {
@NonNull @NonNull
public static SktUri parse(String input) throws URISyntaxException { 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"); throw new URISyntaxException(input, "invalid scheme");
} }

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
View file

@ -145,7 +145,7 @@ public class ImportKeysProxyActivity extends FragmentActivity
Log.d(Constants.TAG, "scanned: " + uri); Log.d(Constants.TAG, "scanned: " + uri);
// example: pgp+transfer: // 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 intent = new Intent(this, MainActivity.class);
intent.putExtra(MainActivity.EXTRA_INIT_FRAG, MainActivity.ID_TRANSFER); intent.putExtra(MainActivity.EXTRA_INIT_FRAG, MainActivity.ID_TRANSFER);
intent.putExtra(TransferFragment.EXTRA_OPENPGP_SKT_INFO, uri); intent.putExtra(TransferFragment.EXTRA_OPENPGP_SKT_INFO, uri);