diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-01-08 12:58:21 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-01-08 12:58:21 +0100 |
| commit | 6cc7156fbd094265dddd66562941c90a2d9079d6 (patch) | |
| tree | 6edab99d8798be03fa704013ff8b0be4ac4ddfe5 /APG/AndroidManifest.xml | |
| parent | 9758cb673f7db8c9a5e6951a1afadaaa85b787d6 (diff) | |
| download | open-keychain-6cc7156fbd094265dddd66562941c90a2d9079d6.tar.gz open-keychain-6cc7156fbd094265dddd66562941c90a2d9079d6.tar.bz2 open-keychain-6cc7156fbd094265dddd66562941c90a2d9079d6.zip | |
Share with NFC, Qr Code sharing refactored, Receiving NFC is not ready yet
Diffstat (limited to 'APG/AndroidManifest.xml')
| -rw-r--r-- | APG/AndroidManifest.xml | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/APG/AndroidManifest.xml b/APG/AndroidManifest.xml index cff694b0f..6a31333fd 100644 --- a/APG/AndroidManifest.xml +++ b/APG/AndroidManifest.xml @@ -64,6 +64,7 @@ <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.NFC" /> <uses-permission android:name="com.fsck.k9.permission.READ_ATTACHMENT" /> <permission-group @@ -300,7 +301,7 @@ <activity android:name="org.thialfihar.android.apg.ui.ImportKeysActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" - android:label="@string/title_importFromQRCode" + android:label="@string/title_importKeys" android:uiOptions="splitActionBarWhenNarrow" > <!-- APG's own Actions --> @@ -358,6 +359,33 @@ </intent-filter> </activity> <activity + android:name="org.thialfihar.android.apg.ui.ShareNfcBeamActivity" + android:label="@string/title_shareByNfc" + android:launchMode="singleTop" + android:uiOptions="splitActionBarWhenNarrow" > + <intent-filter> + <action android:name="org.thialfihar.android.apg.intent.SHARE_WITH_NFC" /> + + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + + <!-- Handle NFC tags detected from outside our application --> + <intent-filter> + <action android:name="android.nfc.action.NDEF_DISCOVERED" /> + + <category android:name="android.intent.category.DEFAULT" /> + + <data android:mimeType="application/org.thialfihar.android.apg" /> + </intent-filter> + </activity> + <activity android:name="org.thialfihar.android.apg.ui.ShareQrCodeActivity" > + <intent-filter> + <action android:name="org.thialfihar.android.apg.intent.SHARE_WITH_QR_CODE" /> + + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + <activity android:name=".ui.HelpActivity" android:label="@string/title_help" /> |