aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-09-29 21:31:19 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-09-29 21:31:19 +0200
commit7f547afe42da896697ae605dbfb6e4734ac42c36 (patch)
treef61928f6398a27c76881b4e43423f268c7de9ac3 /OpenKeychain/src/main/AndroidManifest.xml
parent801fe4d8162ad2288eda476cf98181dba8c55b6f (diff)
downloadopen-keychain-7f547afe42da896697ae605dbfb6e4734ac42c36.tar.gz
open-keychain-7f547afe42da896697ae605dbfb6e4734ac42c36.tar.bz2
open-keychain-7f547afe42da896697ae605dbfb6e4734ac42c36.zip
add barely functional nfc intent activity (WIP!)
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml12
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index d4ff5d2d7..a18e45a8e 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -623,6 +623,18 @@
<activity
android:name=".ui.NfcActivity"
android:launchMode="singleTop" />
+
+ <activity
+ android:name=".ui.NfcIntentActivity"
+ android:launchMode="singleTop">
+ <intent-filter>
+ <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:host="my.yubico.com" android:scheme="https"/>
+ </intent-filter>
+ </activity>
+
<activity
android:name=".ui.HelpActivity"
android:label="@string/title_help" />