From 3a1fcd2147308a35521ca64febd0d853e116f36b Mon Sep 17 00:00:00 2001
From: DEXTER <mydexterid@users.noreply.github.com>
Date: Sat, 24 Feb 2018 14:06:01 +0100
Subject: [PATCH 1/2] AndroidManifest*.xml: Add yubico's url to VIEW/BROWSABLE
 intent-filter

This patch makes it so that the user can choose keepass2android as
a handler for my.yubico.com in
Settings->Apps->App links->keepass2android->Open supported links->
Open in this app.
This is needed to be set manually by the user in order for their
Yubikey NEOs to work.
---
 src/keepass2android/Properties/AndroidManifest_debug.xml | 8 ++++++++
 src/keepass2android/Properties/AndroidManifest_light.xml | 8 ++++++++
 src/keepass2android/Properties/AndroidManifest_net.xml   | 8 ++++++++
 src/keepass2android/Properties/AndroidManifest_nonet.xml | 8 ++++++++
 4 files changed, 32 insertions(+)

diff --git a/src/keepass2android/Properties/AndroidManifest_debug.xml b/src/keepass2android/Properties/AndroidManifest_debug.xml
index 2b589145..422418a3 100644
--- a/src/keepass2android/Properties/AndroidManifest_debug.xml
+++ b/src/keepass2android/Properties/AndroidManifest_debug.xml
@@ -102,6 +102,14 @@
 				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
 				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
 			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW"/>
+				<category android:name="android.intent.category.BROWSABLE"/>
+				<data
+					android:scheme="https"
+					android:host="my.yubico.com"
+					android:pathPrefix="/neo"/>
+			</intent-filter>
 		</activity>
 		<uses-library required="false" name="com.sec.android.app.multiwindow" />
 		<meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
diff --git a/src/keepass2android/Properties/AndroidManifest_light.xml b/src/keepass2android/Properties/AndroidManifest_light.xml
index 0e57ca33..40938f31 100644
--- a/src/keepass2android/Properties/AndroidManifest_light.xml
+++ b/src/keepass2android/Properties/AndroidManifest_light.xml
@@ -40,6 +40,14 @@
 				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
 				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
 			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW"/>
+				<category android:name="android.intent.category.BROWSABLE"/>
+				<data
+					android:scheme="https"
+					android:host="my.yubico.com"
+					android:pathPrefix="/neo"/>
+			</intent-filter>
 		</activity>
 	</application>
 	<uses-permission android:name="android.permission.VIBRATE" />
diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml
index df5ac7a1..65a1ed84 100644
--- a/src/keepass2android/Properties/AndroidManifest_net.xml
+++ b/src/keepass2android/Properties/AndroidManifest_net.xml
@@ -122,6 +122,14 @@
         <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
         <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
         <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+        <data
+          android:scheme="https"
+          android:host="my.yubico.com"
+          android:pathPrefix="/neo"/>
       </intent-filter>
 		</activity>
 			<uses-library required="false" name="com.sec.android.app.multiwindow" />
diff --git a/src/keepass2android/Properties/AndroidManifest_nonet.xml b/src/keepass2android/Properties/AndroidManifest_nonet.xml
index 46914e2b..5947bf54 100644
--- a/src/keepass2android/Properties/AndroidManifest_nonet.xml
+++ b/src/keepass2android/Properties/AndroidManifest_nonet.xml
@@ -105,6 +105,14 @@
         <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
         <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
         <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+        <data
+          android:scheme="https"
+          android:host="my.yubico.com"
+          android:pathPrefix="/neo"/>
       </intent-filter>
 		</activity>
 		<uses-library required="false" name="com.sec.android.app.multiwindow" />

From 6dd6eff02c2e0a29a335b36415c464670056fee8 Mon Sep 17 00:00:00 2001
From: DEXTER <mydexterid@users.noreply.github.com>
Date: Sat, 24 Feb 2018 14:06:39 +0100
Subject: [PATCH 2/2] PasswordActivity.cs: Do not clear the password field

when Yubikey is used to fill in the password entry.
---
 src/keepass2android/PasswordActivity.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs
index 2ab722ed..111260dc 100644
--- a/src/keepass2android/PasswordActivity.cs
+++ b/src/keepass2android/PasswordActivity.cs
@@ -1770,10 +1770,9 @@ namespace keepass2android
 			if ((intent != null) && (intent.HasExtra(Intents.OtpExtraKey)))
 			{
 				string otp = intent.GetStringExtra(Intents.OtpExtraKey);
-					
+				_keepPasswordInOnResume = true;
 				if (this.KeyProviderType == KeyProviders.Otp)
 				{
-					_keepPasswordInOnResume = true;
 				
 					if (_otpInfo == null)
 					{