diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-06 12:09:27 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-06 12:09:27 +0100 |
commit | 5c47570e90583458bb4d91a1f641b9ba0780e249 (patch) | |
tree | 5dfc830c3fa8c6a6965f7dba82165f6ba3651892 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp | |
parent | 33e8699be5fe7b1c756b3bdced7646772a6c6026 (diff) | |
download | open-keychain-5c47570e90583458bb4d91a1f641b9ba0780e249.tar.gz open-keychain-5c47570e90583458bb4d91a1f641b9ba0780e249.tar.bz2 open-keychain-5c47570e90583458bb4d91a1f641b9ba0780e249.zip |
import: apply fixPgpMessage to text for import from clipboard
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java index e8d1d3111..fbda90775 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java @@ -117,7 +117,7 @@ public class PgpHelper { } } - public static String getPgpContent(@NonNull CharSequence input) { + public static String getPgpMessageContent(@NonNull CharSequence input) { Log.dEscaped(Constants.TAG, "input: " + input); Matcher matcher = PgpHelper.PGP_MESSAGE.matcher(input); @@ -141,4 +141,18 @@ public class PgpHelper { } } + public static String getPgpKeyContent(@NonNull CharSequence input) { + Log.dEscaped(Constants.TAG, "input: " + input); + + Matcher matcher = PgpHelper.PGP_PUBLIC_KEY.matcher(input); + if (matcher.matches()) { + String text = matcher.group(1); + text = fixPgpMessage(text); + + Log.dEscaped(Constants.TAG, "input fixed: " + text); + return text; + } + return null; + } + } |