aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-01-09 14:22:14 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2013-01-09 14:22:14 +0100
commit03e6843380a387abdbaa7b4fe6d8c40058cf69eb (patch)
tree7296b1f99dd275209f397f715e6a1850bbd7b17a
parent8039d70876463fb646bce6e8bd03b1c666f9bf91 (diff)
downloadopen-keychain-03e6843380a387abdbaa7b4fe6d8c40058cf69eb.tar.gz
open-keychain-03e6843380a387abdbaa7b4fe6d8c40058cf69eb.tar.bz2
open-keychain-03e6843380a387abdbaa7b4fe6d8c40058cf69eb.zip
Fixes to use import intents without file data
-rw-r--r--APG/AndroidManifest.xml10
1 files changed, 8 insertions, 2 deletions
diff --git a/APG/AndroidManifest.xml b/APG/AndroidManifest.xml
index c29626ccf..caa1eb5c1 100644
--- a/APG/AndroidManifest.xml
+++ b/APG/AndroidManifest.xml
@@ -307,13 +307,19 @@
<!-- APG's own Actions -->
<intent-filter android:label="@string/intent_import_key" >
<action android:name="org.thialfihar.android.apg.intent.IMPORT" />
- <action android:name="org.thialfihar.android.apg.intent.IMPORT_FROM_QR_CODE" />
- <action android:name="org.thialfihar.android.apg.intent.IMPORT_FROM_NFC" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="*/*" />
</intent-filter>
+ <!-- IMPORT again without mimeType to also allow data only without filename -->
+ <intent-filter android:label="@string/intent_import_key" >
+ <action android:name="org.thialfihar.android.apg.intent.IMPORT" />
+ <action android:name="org.thialfihar.android.apg.intent.IMPORT_FROM_QR_CODE" />
+ <action android:name="org.thialfihar.android.apg.intent.IMPORT_FROM_NFC" />
+
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
<!-- Linking "Import key" to file types -->
<intent-filter android:label="@string/intent_import_key" >
<action android:name="android.intent.action.VIEW" />