From 93e6b6f9b5debfc8fac3bad1390254e389f7432e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 29 Jun 2015 10:54:04 +0200
Subject: Use signature-level signature for TemporaryStorageProvider and
 describe the security model

---
 OpenKeychain/src/main/AndroidManifest.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain/src/main/AndroidManifest.xml')

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index d5db3c2da..c8073da00 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" />
-- 
cgit v1.2.3


From a9c606d49bf7d4e7a30b7265cd1fb04ff1c3c01c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 29 Jun 2015 20:48:11 +0200
Subject: Create key wizard for blank YubiKey

---
 OpenKeychain/src/main/AndroidManifest.xml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'OpenKeychain/src/main/AndroidManifest.xml')

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index c8073da00..a8c553add 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -95,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 key -->
+            <!--<intent-filter>-->
+                <!--<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"
@@ -687,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" />
-- 
cgit v1.2.3


From 7009e504b98d32564c6a9a549d1f5c43959bb24e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 29 Jun 2015 21:17:12 +0200
Subject: Connect YubiKey URL to OpenKeychain

---
 OpenKeychain/src/main/AndroidManifest.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'OpenKeychain/src/main/AndroidManifest.xml')

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index a8c553add..5b95423ac 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -95,15 +95,15 @@
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.MainActivity" />
-            <!-- Connect with YubiKeys. This Activity will automatically show/import/create key -->
-            <!--<intent-filter>-->
-                <!--<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>-->
+            <!-- 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"
-- 
cgit v1.2.3