- Wrong account rename fixed (again)

- AutoFill framework

Author: grigorevmp

app/src/main/java/com/mikhailgrigorev/quickpass/MyAutofillService.kt

@@ -12,6 +12,7 @@ import android.view.autofill.AutofillValue
 import android.widget.RemoteViews
 import android.widget.Toast
 import androidx.annotation.RequiresApi
+import com.google.android.material.chip.Chip
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -88,19 +89,23 @@ class MyAutofillService : AutofillService() {
             var i = 0
 
             for (mail in emails){
-                if ((mail.contains("@")) or (names[i].toLowerCase(Locale.ROOT).contains(appName.toLowerCase(
-                            Locale.ROOT
-                    )
-                    )) or (appName.toLowerCase(Locale.ROOT).contains(names[i].toLowerCase(Locale.ROOT)))
-                ) {
-                    val remoteView = RemoteViews(packageName, R.layout.autofill_suggestion)
-                    remoteView.setTextViewText(R.id.suggestion_item, mail)
-                    dataSets.add(
-                            Dataset.Builder(remoteView).setValue(
-                                    emailFields[0]?.autofillId!!,
-                                    AutofillValue.forText(mail)
-                            ).build()
-                    )
+                names[i].split("\\s".toRegex()).forEach { partName ->
+                    if ((mail.contains("@")) or (partName.toLowerCase(Locale.ROOT).contains(
+                                appName.toLowerCase(
+                                        Locale.ROOT
+                                )
+                        )) or (appName.toLowerCase(Locale.ROOT)
+                                .contains(partName.toLowerCase(Locale.ROOT)))
+                    ) {
+                        val remoteView = RemoteViews(packageName, R.layout.autofill_suggestion)
+                        remoteView.setTextViewText(R.id.suggestion_item, mail)
+                        dataSets.add(
+                                Dataset.Builder(remoteView).setValue(
+                                        emailFields[0]?.autofillId!!,
+                                        AutofillValue.forText(mail)
+                                ).build()
+                        )
+                    }
                 }
                 i += 1
             }
@@ -112,17 +117,20 @@ class MyAutofillService : AutofillService() {
             val remoteView = RemoteViews(packageName, R.layout.autofill_suggestion)
             remoteView.setTextViewText(R.id.suggestion_item, "Random")
             for (name in names){
-                if ((name.toLowerCase(Locale.ROOT).contains(appName.toLowerCase(Locale.ROOT))) or
-                    (appName.toLowerCase(Locale.ROOT).contains(name.toLowerCase(Locale.ROOT)))){
-                    val remoteView = RemoteViews(packageName, R.layout.autofill_suggestion)
-                    remoteView.setTextViewText(R.id.suggestion_item, passwords[i])
-                    dataSets.add(Dataset.Builder(remoteView).setValue(
-                            passFields[0]?.autofillId!!,
-                            AutofillValue.forText(passwords[i])
-                    ).build())
+                name.split("\\s".toRegex()).forEach { partName ->
+                    if ((partName.toLowerCase(Locale.ROOT).contains(appName.toLowerCase(Locale.ROOT))) or
+                        (appName.toLowerCase(Locale.ROOT).contains(partName.toLowerCase(Locale.ROOT)))){
+                        val remoteView = RemoteViews(packageName, R.layout.autofill_suggestion)
+                        remoteView.setTextViewText(R.id.suggestion_item, passwords[i])
+                        dataSets.add(Dataset.Builder(remoteView).setValue(
+                                passFields[0]?.autofillId!!,
+                                AutofillValue.forText(passwords[i])
+                        ).build())
+                    }
                 }
                 i += 1
-            }
+                }
+
         }
 
         if(dataSets.size != 0){

app/src/main/res/values-ru/strings.xml

@@ -127,5 +127,4 @@
     <string name="warning">Предупреждение!</string>
     <string name="latest_updates_on_my_github_page">Свежие обновления на моей странице GitHub</string>
     <string name="about_desc">Мощный менеджер паролей с дружественным пользовательским интерфейсом, защищенной системой, классным генератором паролей и собственной платформой автозаполнения</string>
-    <string name="_2020">"Версия 1.0.200 • 2020 "</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -91,7 +91,7 @@
     <string name="auto_copy_password">Auto-copy password</string>
     <string name="about_app">About app</string>
     <string name="mikhail_grigorev">Mikhail Grigorev</string>
-    <string name="_2020">"Version 1.0.200 • 2020 "</string>
+    <string name="_2020" translatable="false">"1.0.300 • 2020 "</string>
     <string name="telegram" translatable="false">Telegram</string>
     <string name="vkontakte" translatable="false">Vkontakte</string>
     <string name="sen_email" translatable="false">Send email</string>