cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

integrate NFC into key view and import activities

Browse Source
This commit is contained in:
Dominik Schürmann
2014-01-03 12:24:08 +01:00
parent 9576aeabca
commit 15be9fc99b
6 changed files with 261 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenPGP-Keychain/AndroidManifest.xml
View File

@@ -276,8 +276,17 @@
<activity
android:name=".ui.ImportKeysActivity"
android:label="@string/title_import_keys"
android:launchMode="singleTop"
android:windowSoftInputMode="stateHidden" >
<!-- 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" />
<!-- mime type as defined in http://tools.ietf.org/html/rfc3156, section 7 -->
<data android:mimeType="application/pgp-keys" />
</intent-filter>
<!-- Keychain's own Actions -->
<intent-filter android:label="@string/intent_import_key" >
<action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY" />
@@ -336,21 +345,6 @@
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.asc" />
</intent-filter>
</activity>
<activity
android:name=".ui.ShareNfcBeamActivity"
android:label="@string/title_share_by_nfc"
android:launchMode="singleTop"
android:uiOptions="splitActionBarWhenNarrow" >
<!-- 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" />
<!-- mime type as defined in http://tools.ietf.org/html/rfc3156, section 7 -->
<data android:mimeType="application/pgp-keys" />
</intent-filter>
</activity>
<activity
android:name=".ui.HelpActivity"
android:label="@string/title_help" />