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

Merge pull request #2318 from wiktor-k/vcard-key

Browse Source 
Extend QR scanner to support VCards with KEY field
This commit is contained in:
Vincent Breitmoser
2018-05-11 17:17:17 +02:00
committed by GitHub
parent e7990ebe7c 01aadf6a1f
commit 225fdbb79a
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
View File

@@ -49,6 +49,8 @@ import timber.log.Timber;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale; import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* Proxy activity (just a transparent content view) to scan QR Codes using the Barcode Scanner app * Proxy activity (just a transparent content view) to scan QR Codes using the Barcode Scanner app
@@ -134,7 +136,16 @@ public class ImportKeysProxyActivity extends FragmentActivity
} }
} }
private static final Pattern VCARD_KEY_PATTERN = Pattern.compile("\nKEY:(.*)\n");
private void processScannedContent(String content) { private void processScannedContent(String content) {
// if a VCard was scanned try to extract the KEY field
if (content.startsWith("BEGIN:VCARD")) {
Matcher matcher = VCARD_KEY_PATTERN.matcher(content);
if (matcher.find()) {
content = matcher.group(1);
}
}
Uri uri = Uri.parse(content); Uri uri = Uri.parse(content);
processScannedContent(uri); processScannedContent(uri);
} }