aboutsummaryrefslogtreecommitdiffstats
path: root/APG/AndroidManifest.xml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-01-08 22:12:23 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2013-01-08 22:12:23 +0100
commitd515b267964fd5398da8338414acbaebe8edcb21 (patch)
tree4626bb22d22758df25b268e1dea21e3facba33b9 /APG/AndroidManifest.xml
parent049dc908f8cc00b153e80a975c28325e8b4174ba (diff)
downloadopen-keychain-d515b267964fd5398da8338414acbaebe8edcb21.tar.gz
open-keychain-d515b267964fd5398da8338414acbaebe8edcb21.tar.bz2
open-keychain-d515b267964fd5398da8338414acbaebe8edcb21.zip
Generic share of keyring via Android Intent SEND, renaming of own share intents
Diffstat (limited to 'APG/AndroidManifest.xml')
-rw-r--r--APG/AndroidManifest.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/APG/AndroidManifest.xml b/APG/AndroidManifest.xml
index 6a31333fd..c29626ccf 100644
--- a/APG/AndroidManifest.xml
+++ b/APG/AndroidManifest.xml
@@ -364,7 +364,7 @@
android:launchMode="singleTop"
android:uiOptions="splitActionBarWhenNarrow" >
<intent-filter>
- <action android:name="org.thialfihar.android.apg.intent.SHARE_WITH_NFC" />
+ <action android:name="org.thialfihar.android.apg.intent.SHARE_KEYRING_WITH_NFC" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
@@ -378,9 +378,10 @@
<data android:mimeType="application/org.thialfihar.android.apg" />
</intent-filter>
</activity>
- <activity android:name="org.thialfihar.android.apg.ui.ShareQrCodeActivity" >
+ <activity android:name="org.thialfihar.android.apg.ui.ShareActivity" >
<intent-filter>
- <action android:name="org.thialfihar.android.apg.intent.SHARE_WITH_QR_CODE" />
+ <action android:name="org.thialfihar.android.apg.intent.SHARE_KEYRING" />
+ <action android:name="org.thialfihar.android.apg.intent.SHARE_KEYRING_WITH_QR_CODE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>