diff options
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index ee21c19ba..771f1b2e9 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -503,21 +503,6 @@ android:theme="@style/Theme.Keychain.Transparent" android:windowSoftInputMode="stateHidden"> - <!-- VIEW with fingerprint scheme: - Handle URIs with fingerprints when scanning directly from Barcode Scanner --> - <intent-filter android:label="@string/intent_import_key"> - <action android:name="android.intent.action.VIEW" /> - - <category android:name="android.intent.category.BROWSABLE" /> - <category android:name="android.intent.category.DEFAULT" /> - - <!-- Android's scheme matcher is case-sensitive, so include most likely variations --> - <data android:scheme="openpgp4fpr" /> - <data android:scheme="OPENPGP4FPR" /> - <data android:scheme="OpenPGP4FPR" /> - <data android:scheme="OpenPGP4Fpr" /> - <data android:scheme="OpenPGP4fpr" /> - </intent-filter> <!-- IMPORT_KEY without mimeType to allow import with extras Bundle --> <intent-filter android:label="@string/intent_import_key"> <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_QR_CODE" /> @@ -730,6 +715,23 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + + <!-- VIEW with fingerprint scheme: + Handle URIs with fingerprints when scanning directly from Barcode Scanner --> + <intent-filter android:label="@string/intent_import_key"> + <action android:name="android.intent.action.VIEW" /> + + <category android:name="android.intent.category.BROWSABLE" /> + <category android:name="android.intent.category.DEFAULT" /> + + <!-- Android's scheme matcher is case-sensitive, so include most likely variations --> + <data android:scheme="openpgp4fpr" /> + <data android:scheme="OPENPGP4FPR" /> + <data android:scheme="OpenPGP4FPR" /> + <data android:scheme="OpenPGP4Fpr" /> + <data android:scheme="OpenPGP4fpr" /> + </intent-filter> + <meta-data android:name="android.support.PARENT_ACTIVITY" android:value=".ui.MainActivity" /> |