tls-psk: fix scan from proxy activity, and use Constants.SKT_SCHEME everywhere
This commit is contained in:
parent
4f5f5219bd
commit
f76a0f47b5
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -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");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue