diff --git a/src/java/KP2ASoftkeyboard_AS/.idea/workspace.xml b/src/java/KP2ASoftkeyboard_AS/.idea/workspace.xml
index 8d992ac9..2b5ccee1 100644
--- a/src/java/KP2ASoftkeyboard_AS/.idea/workspace.xml
+++ b/src/java/KP2ASoftkeyboard_AS/.idea/workspace.xml
@@ -55,8 +55,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -106,7 +134,7 @@
-
+
@@ -115,12 +143,10 @@
-
-
+
+
-
-
@@ -141,13 +167,7 @@
-
-
-
-
-
-
-
+
@@ -157,10 +177,7 @@
-
-
-
-
+
@@ -1503,6 +1520,7 @@
+
@@ -1517,7 +1535,6 @@
-
@@ -1749,13 +1766,14 @@
+
-
+
-
+
@@ -1764,11 +1782,10 @@
-
+
-
@@ -1822,8 +1839,6 @@
-
-
@@ -1840,13 +1855,7 @@
-
-
-
-
-
-
-
+
@@ -1854,10 +1863,7 @@
-
-
-
-
+
@@ -2109,10 +2115,7 @@
-
-
-
-
+
@@ -2141,8 +2144,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2159,13 +2190,7 @@
-
-
-
-
-
-
-
+
@@ -2196,19 +2221,17 @@
-
+
-
-
+
+
-
-
diff --git a/src/java/KP2ASoftkeyboard_AS/app/build/outputs/aar/app-debug.aar b/src/java/KP2ASoftkeyboard_AS/app/build/outputs/aar/app-debug.aar
new file mode 100644
index 00000000..67beae1e
Binary files /dev/null and b/src/java/KP2ASoftkeyboard_AS/app/build/outputs/aar/app-debug.aar differ
diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/autofill/AutoFillService.java b/src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/autofill/AutoFillService.java
index 18ce04c4..49949342 100644
--- a/src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/autofill/AutoFillService.java
+++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/autofill/AutoFillService.java
@@ -298,10 +298,14 @@ public class AutoFillService extends AccessibilityService {
private boolean isSame(String url1, String url2) {
- if (url1.startsWith("androidapp://"))
- return url1.equals(url2);
if (url1 == null)
return (url2 == null);
+ if (url2 == null)
+ return (url1 == null);
+
+ if (url1.startsWith("androidapp://"))
+ return url1.equals(url2);
+
return getHost(url1).equals(getHost(url2));
}