diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-30 22:12:16 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-30 22:12:16 +0530 |
| commit | a5257ec71d41532ac62594f59c10ba47d6a9ca38 (patch) | |
| tree | 6771ba3e13df96574e093668c77e34678511b5f7 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | 51d3daeccdc697d948c597931d804d738132b8ed (diff) | |
| parent | 677afa90fce133b81c195488e07f07a5a83e2f0b (diff) | |
| download | open-keychain-a5257ec71d41532ac62594f59c10ba47d6a9ca38.tar.gz open-keychain-a5257ec71d41532ac62594f59c10ba47d6a9ca38.tar.bz2 open-keychain-a5257ec71d41532ac62594f59c10ba47d6a9ca38.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 5c7b36874..b3754d360 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -48,9 +48,10 @@ android:name="android.hardware.screen.portrait" android:required="false" /> - <permission android:name="${applicationId}.WRITE_TEMPORARY_STORAGE" /> - - <uses-permission android:name="${applicationId}.WRITE_TEMPORARY_STORAGE" /> + <!-- TemporaryStorageProvider should be writable by OpenKeychain only, thus signature-level permission --> + <permission + android:name="${applicationId}.WRITE_TEMPORARY_STORAGE" + android:protectionLevel="signature" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> @@ -94,6 +95,15 @@ <meta-data android:name="android.support.PARENT_ACTIVITY" android:value=".ui.MainActivity" /> + <!-- Connect with YubiKeys. This Activity will automatically show/import/create YubiKeys --> + <intent-filter android:label="@string/app_name"> + <action android:name="android.nfc.action.NDEF_DISCOVERED"/> + <category android:name="android.intent.category.DEFAULT"/> + <data + android:scheme="https" + android:host="my.yubico.com" + android:pathPrefix="/neo"/> + </intent-filter> </activity> <activity android:name=".ui.EditKeyActivity" @@ -686,17 +696,6 @@ android:launchMode="singleTop" android:taskAffinity=":Nfc" /> - <!--<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" /> |