diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2016-03-02 15:12:14 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2016-03-02 15:12:14 +0100 |
| commit | c7761d09cbd5a148d16760afeddefb89ee469364 (patch) | |
| tree | 06e96e97703fc26aded60df422e562ce71d30167 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui | |
| parent | 2e69952326a034bb9f1bdba4573adc9af9be3c2b (diff) | |
| download | open-keychain-c7761d09cbd5a148d16760afeddefb89ee469364.tar.gz open-keychain-c7761d09cbd5a148d16760afeddefb89ee469364.tar.bz2 open-keychain-c7761d09cbd5a148d16760afeddefb89ee469364.zip | |
handle openpgp4fpr intent filter as import rather than certify (see #1661)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index f67c6a724..72e42eec3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -131,8 +131,11 @@ public class ImportKeysActivity extends BaseActivity if (Intent.ACTION_VIEW.equals(action)) { if (FacebookKeyserver.isFacebookHost(dataUri)) { action = ACTION_IMPORT_KEY_FROM_FACEBOOK; - } else if ("http".equals(scheme) || "https".equals(scheme)) { + } else if ("http".equalsIgnoreCase(scheme) || "https".equalsIgnoreCase(scheme)) { action = ACTION_SEARCH_KEYSERVER_FROM_URL; + } else if ("openpgp4fpr".equalsIgnoreCase(scheme)) { + action = ACTION_IMPORT_KEY_FROM_KEYSERVER; + extras.putString(EXTRA_FINGERPRINT, dataUri.getSchemeSpecificPart()); } else { // Android's Action when opening file associated to Keychain (see AndroidManifest.xml) // delegate action to ACTION_IMPORT_KEY |