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

show Snackbar if clipboard contains key data

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-06-14 16:26:40 +02:00
committed by Dominik Schürmann
parent 700e06dcb9
commit 89aa99a13f
6 changed files with 115 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java
View File

@@ -84,22 +84,16 @@ public class PgpHelper {
}
public static String getPgpMessageContent(@NonNull CharSequence input) {
Timber.d("input: %s");
Matcher matcher = PgpHelper.PGP_MESSAGE.matcher(input);
if (matcher.matches()) {
String text = matcher.group(1);
text = fixPgpMessage(text);
Timber.d("input fixed: %s", text);
return text;
} else {
matcher = PgpHelper.PGP_CLEARTEXT_SIGNATURE.matcher(input);
if (matcher.matches()) {
String text = matcher.group(1);
text = fixPgpCleartextSignature(text);
Timber.d("input fixed: %s", text);
return text;
} else {
return null;
@@ -108,8 +102,6 @@ public class PgpHelper {
}
public static String getPgpPublicKeyContent(@NonNull CharSequence input) {
Timber.d("input: %s", input);
Matcher matcher = PgpHelper.PGP_PUBLIC_KEY.matcher(input);
if (!matcher.matches()) {
return null;