From 6ece2aa6cb49a6261dfbdfedc1104e0e465b88ea Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Wed, 8 Apr 2020 20:50:28 +0200
Subject: [PATCH] Add autofill web domain and app id

---
 .../keepass/autofill/AutofillHelper.kt        | 23 ++++++++--
 .../keepass/autofill/KeeAutofillService.kt    | 17 ++++++--
 .../main/res/drawable/ic_apps_white_24dp.xml  |  5 +++
 .../main/res/drawable/ic_web_white_24dp.xml   |  5 +++
 .../main/res/layout/item_autofill_app_id.xml  | 43 +++++++++++++++++++
 ...ll_service.xml => item_autofill_entry.xml} |  4 +-
 ...ce_unlock.xml => item_autofill_unlock.xml} | 11 ++---
 .../layout/item_autofill_unlock_app_id.xml    | 25 +++++++++++
 .../item_autofill_unlock_web_domain.xml       | 25 +++++++++++
 .../res/layout/item_autofill_web_domain.xml   | 43 +++++++++++++++++++
 10 files changed, 185 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_apps_white_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_web_white_24dp.xml
 create mode 100644 app/src/main/res/layout/item_autofill_app_id.xml
 rename app/src/main/res/layout/{item_autofill_service.xml => item_autofill_entry.xml} (95%)
 rename app/src/main/res/layout/{item_autofill_service_unlock.xml => item_autofill_unlock.xml} (88%)
 create mode 100644 app/src/main/res/layout/item_autofill_unlock_app_id.xml
 create mode 100644 app/src/main/res/layout/item_autofill_unlock_web_domain.xml
 create mode 100644 app/src/main/res/layout/item_autofill_web_domain.xml

diff --git a/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt
index c83af633c..0ae33b401 100644
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt
@@ -71,6 +71,23 @@ object AutofillHelper {
         return ""
     }
 
+    internal fun addHeader(responseBuilder: FillResponse.Builder,
+                           packageName: String,
+                           webDomain: String?,
+                           applicationId: String?) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            if (webDomain != null) {
+                responseBuilder.setHeader(RemoteViews(packageName, R.layout.item_autofill_web_domain).apply {
+                    setTextViewText(R.id.autofill_web_domain_text, webDomain)
+                })
+            } else if (applicationId != null) {
+                responseBuilder.setHeader(RemoteViews(packageName, R.layout.item_autofill_app_id).apply {
+                    setTextViewText(R.id.autofill_app_id_text, applicationId)
+                })
+            }
+        }
+    }
+
     internal fun buildDataset(context: Context,
                               entryInfo: EntryInfo,
                               struct: StructureParser.Result): Dataset? {
@@ -195,11 +212,11 @@ object AutofillHelper {
     private fun newRemoteViews(context: Context,
                                remoteViewsText: String,
                                remoteViewsIcon: IconImage? = null): RemoteViews {
-        val presentation = RemoteViews(context.packageName, R.layout.item_autofill_service)
-        presentation.setTextViewText(R.id.text, remoteViewsText)
+        val presentation = RemoteViews(context.packageName, R.layout.item_autofill_entry)
+        presentation.setTextViewText(R.id.autofill_entry_text, remoteViewsText)
         if (remoteViewsIcon != null) {
             presentation.assignDatabaseIcon(context,
-                    R.id.icon,
+                    R.id.autofill_entry_icon,
                     Database.getInstance().drawFactory,
                     remoteViewsIcon,
                     ContextCompat.getColor(context, R.color.green))
diff --git a/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt b/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt
index 37b877384..04007d902 100644
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt
@@ -53,6 +53,8 @@ class KeeAutofillService : AutofillService() {
                     searchInfo,
                     { items ->
                         val responseBuilder = FillResponse.Builder()
+                        AutofillHelper.addHeader(responseBuilder, packageName,
+                                parseResult.domain, parseResult.applicationId)
                         items.forEach {
                             responseBuilder.addDataset(AutofillHelper.buildDataset(this, it, parseResult))
                         }
@@ -79,10 +81,19 @@ class KeeAutofillService : AutofillService() {
                 // to generate Response.
                 val sender = AutofillLauncherActivity.getAuthIntentSenderForResponse(this,
                         searchInfo)
-                val presentation = RemoteViews(packageName, R.layout.item_autofill_service_unlock)
-
                 val responseBuilder = FillResponse.Builder()
-                responseBuilder.setAuthentication(autofillIds, sender, presentation)
+                val remoteViewsUnlock: RemoteViews = if (!parseResult.domain.isNullOrEmpty()) {
+                    RemoteViews(packageName, R.layout.item_autofill_unlock_web_domain).apply {
+                        setTextViewText(R.id.autofill_web_domain_text, parseResult.domain)
+                    }
+                } else if (!parseResult.applicationId.isNullOrEmpty()) {
+                    RemoteViews(packageName, R.layout.item_autofill_unlock_app_id).apply {
+                        setTextViewText(R.id.autofill_app_id_text, parseResult.applicationId)
+                    }
+                } else {
+                    RemoteViews(packageName, R.layout.item_autofill_unlock)
+                }
+                responseBuilder.setAuthentication(autofillIds, sender, remoteViewsUnlock)
                 callback.onSuccess(responseBuilder.build())
             }
         }
diff --git a/app/src/main/res/drawable/ic_apps_white_24dp.xml b/app/src/main/res/drawable/ic_apps_white_24dp.xml
new file mode 100644
index 000000000..373f7752b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_apps_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_web_white_24dp.xml b/app/src/main/res/drawable/ic_web_white_24dp.xml
new file mode 100644
index 000000000..880e42770
--- /dev/null
+++ b/app/src/main/res/drawable/ic_web_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
+</vector>
diff --git a/app/src/main/res/layout/item_autofill_app_id.xml b/app/src/main/res/layout/item_autofill_app_id.xml
new file mode 100644
index 000000000..5358ef3dd
--- /dev/null
+++ b/app/src/main/res/layout/item_autofill_app_id.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/green"
+    android:minHeight="24dp"
+    android:orientation="horizontal">
+    <ImageView
+        android:id="@+id/autofill_app_id_icon"
+        android:layout_width="18dp"
+        android:layout_height="18dp"
+        android:layout_gravity="center"
+        android:layout_marginStart="12dp"
+        android:layout_marginLeft="12dp"
+        android:contentDescription="@string/about"
+        android:src="@drawable/ic_apps_white_24dp"/>
+    <TextView
+        android:id="@+id/autofill_app_id_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:textColor="@color/white"
+        android:layout_gravity="center"
+        android:paddingRight="12dp"
+        android:paddingEnd="12dp"
+        android:paddingLeft="12dp"
+        android:paddingStart="12dp" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_autofill_service.xml b/app/src/main/res/layout/item_autofill_entry.xml
similarity index 95%
rename from app/src/main/res/layout/item_autofill_service.xml
rename to app/src/main/res/layout/item_autofill_entry.xml
index 14e5c95c0..a7202488b 100644
--- a/app/src/main/res/layout/item_autofill_service.xml
+++ b/app/src/main/res/layout/item_autofill_entry.xml
@@ -22,7 +22,7 @@
     android:orientation="horizontal">
 
     <ImageView
-        android:id="@+id/icon"
+        android:id="@+id/autofill_entry_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -34,7 +34,7 @@
         android:src="@drawable/ic_key_white_24dp" />
 
     <TextView
-        android:id="@+id/text"
+        android:id="@+id/autofill_entry_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/item_autofill_service_unlock.xml b/app/src/main/res/layout/item_autofill_unlock.xml
similarity index 88%
rename from app/src/main/res/layout/item_autofill_service_unlock.xml
rename to app/src/main/res/layout/item_autofill_unlock.xml
index 9ca888b90..9cf3cd995 100644
--- a/app/src/main/res/layout/item_autofill_service_unlock.xml
+++ b/app/src/main/res/layout/item_autofill_unlock.xml
@@ -16,32 +16,27 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:background="?android:attr/windowBackground"
-    android:minHeight="48dp"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:orientation="horizontal">
-
     <ImageView
-        android:id="@+id/icon"
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_gravity="center"
         android:layout_marginStart="12dp"
         android:layout_marginLeft="12dp"
+        android:contentDescription="@string/app_name"
         android:src="@mipmap/ic_launcher"/>
-
     <TextView
-        android:id="@+id/text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:text="@string/autofill_sign_in_prompt"
-        android:minHeight="?android:attr/listPreferredItemHeightSmall"
         android:layout_gravity="center"
         android:paddingRight="12dp"
         android:paddingEnd="12dp"
         android:paddingLeft="12dp"
         android:paddingStart="12dp"
         android:textAppearance="?android:attr/textAppearanceListItemSmall" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_autofill_unlock_app_id.xml b/app/src/main/res/layout/item_autofill_unlock_app_id.xml
new file mode 100644
index 000000000..b9fbfad3b
--- /dev/null
+++ b/app/src/main/res/layout/item_autofill_unlock_app_id.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <include
+        layout="@layout/item_autofill_app_id"/>
+    <include
+        layout="@layout/item_autofill_unlock"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_autofill_unlock_web_domain.xml b/app/src/main/res/layout/item_autofill_unlock_web_domain.xml
new file mode 100644
index 000000000..973baa9bf
--- /dev/null
+++ b/app/src/main/res/layout/item_autofill_unlock_web_domain.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <include
+        layout="@layout/item_autofill_web_domain"/>
+    <include
+        layout="@layout/item_autofill_unlock"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_autofill_web_domain.xml b/app/src/main/res/layout/item_autofill_web_domain.xml
new file mode 100644
index 000000000..4258b4607
--- /dev/null
+++ b/app/src/main/res/layout/item_autofill_web_domain.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/green"
+    android:minHeight="24dp"
+    android:orientation="horizontal">
+    <ImageView
+        android:id="@+id/autofill_web_domain_icon"
+        android:layout_width="18dp"
+        android:layout_height="18dp"
+        android:layout_gravity="center"
+        android:layout_marginStart="12dp"
+        android:layout_marginLeft="12dp"
+        android:contentDescription="@string/about"
+        android:src="@drawable/ic_web_white_24dp"/>
+    <TextView
+        android:id="@+id/autofill_web_domain_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:textColor="@color/white"
+        android:layout_gravity="center"
+        android:paddingRight="12dp"
+        android:paddingEnd="12dp"
+        android:paddingLeft="12dp"
+        android:paddingStart="12dp" />
+</LinearLayout>
\ No newline at end of file