diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-02-27 18:05:36 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-02-27 18:05:36 +0100 |
| commit | 2cd7be6373015e7e05d8418c997fa0c063c40c5a (patch) | |
| tree | 612e9b02a87fb1fe8b6278d6aa5a4a3d98f825aa /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | ea4ca9e6865e6b109c653da35beae98d3d1ded9a (diff) | |
| download | open-keychain-2cd7be6373015e7e05d8418c997fa0c063c40c5a.tar.gz open-keychain-2cd7be6373015e7e05d8418c997fa0c063c40c5a.tar.bz2 open-keychain-2cd7be6373015e7e05d8418c997fa0c063c40c5a.zip | |
go to directly to certify screen after nfc import
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 29b748410..20e618320 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -451,7 +451,7 @@ android:value=".ui.MainActivity" /> </activity> <activity - android:name=".ui.QrCodeScanActivity" + android:name=".ui.ImportKeysProxyActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/app_name" android:theme="@android:style/Theme.NoDisplay" @@ -478,6 +478,14 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <!-- NFC: 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 --> + <data android:mimeType="application/pgp-keys" /> + </intent-filter> </activity> <activity @@ -502,14 +510,6 @@ --> <data android:mimeType="text/plain" /> </intent-filter> - <!-- NFC: 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 --> - <data android:mimeType="application/pgp-keys" /> - </intent-filter> <!-- VIEW with file endings: *.gpg (e.g. to import from OI File Manager) --> <intent-filter android:label="@string/intent_import_key"> <action android:name="android.intent.action.VIEW" /> |