From 14b3c50d52f635623de78bff53315635f8551a0a Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Tue, 22 Nov 2016 12:38:52 +0100
Subject: [PATCH] fix IntentFilter for PasswordActivity

---
 src/keepass2android/PasswordActivity.cs                  | 2 +-
 src/keepass2android/Properties/AndroidManifest_debug.xml | 6 ++++++
 src/keepass2android/Properties/AndroidManifest_net.xml   | 6 ++++++
 src/keepass2android/Properties/AndroidManifest_nonet.xml | 5 +++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs
index 99f1de8c..600cf20d 100644
--- a/src/keepass2android/PasswordActivity.cs
+++ b/src/keepass2android/PasswordActivity.cs
@@ -72,7 +72,7 @@ namespace keepass2android
 		LaunchMode = LaunchMode.SingleInstance,
 		WindowSoftInputMode = SoftInput.AdjustResize,
 		Theme = "@style/MyTheme_Blue")] /*caution: also contained in AndroidManifest.xml*/
-	[IntentFilter(new[] { "kp2a.action.PasswordActivity" }, Categories = new[] { Intent.CategoryDefault })]
+	//CAUTION: don't add intent filters here, they must be set in the manifest xml file
 	public class PasswordActivity : LockingActivity, IFingerprintAuthCallback
 	{
 
diff --git a/src/keepass2android/Properties/AndroidManifest_debug.xml b/src/keepass2android/Properties/AndroidManifest_debug.xml
index fd9682a6..5ca9d4ff 100644
--- a/src/keepass2android/Properties/AndroidManifest_debug.xml
+++ b/src/keepass2android/Properties/AndroidManifest_debug.xml
@@ -86,6 +86,12 @@
 				<data android:host="*" />
 			  </intent-filter>
 			  
+			  <intent-filter>
+				<action android:name="kp2a.action.PasswordActivity" />
+				<category android:name="android.intent.category.DEFAULT" />
+			  </intent-filter>
+			  
+			  
 			<intent-filter android:label="@string/app_name">
 				<action android:name="android.intent.action.VIEW" />
 				<category android:name="android.intent.category.DEFAULT" />
diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml
index d00b6d31..0b87c6ef 100644
--- a/src/keepass2android/Properties/AndroidManifest_net.xml
+++ b/src/keepass2android/Properties/AndroidManifest_net.xml
@@ -76,6 +76,12 @@
         <data android:mimeType="application/octet-stream" />
         <data android:host="*" />
       </intent-filter>
+	  
+	  <intent-filter>
+        <action android:name="kp2a.action.PasswordActivity" />
+        <category android:name="android.intent.category.DEFAULT" />
+      </intent-filter>
+	  
 
       <intent-filter android:label="@string/app_name">
         <action android:name="android.intent.action.SEND" />
diff --git a/src/keepass2android/Properties/AndroidManifest_nonet.xml b/src/keepass2android/Properties/AndroidManifest_nonet.xml
index 03a7fb7e..c7efc624 100644
--- a/src/keepass2android/Properties/AndroidManifest_nonet.xml
+++ b/src/keepass2android/Properties/AndroidManifest_nonet.xml
@@ -61,6 +61,11 @@
         <data android:host="*" />
       </intent-filter>
 
+	  <intent-filter>
+        <action android:name="kp2a.action.PasswordActivity" />
+        <category android:name="android.intent.category.DEFAULT" />
+      </intent-filter>
+	  
       <intent-filter android:label="@string/app_name">
         <action android:name="android.intent.action.SEND" />
         <action android:name="android.intent.action.SEND_MULTIPLE" />