From 6c167090e1c0c920e1ecdc9dd31b856d92a7cbae Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Thu, 5 May 2022 15:50:51 +0200
Subject: [PATCH] Small changes

---
 .../magikeyboard/MagikeyboardService.kt       | 23 +++++++++++--------
 .../com/kunzisoft/keepass/utils/UriUtil.kt    |  7 +++---
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/magikeyboard/MagikeyboardService.kt b/app/src/main/java/com/kunzisoft/keepass/magikeyboard/MagikeyboardService.kt
index 7928a10e5..f50d6ef69 100644
--- a/app/src/main/java/com/kunzisoft/keepass/magikeyboard/MagikeyboardService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/magikeyboard/MagikeyboardService.kt
@@ -37,6 +37,8 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.BlendModeColorFilterCompat
 import androidx.core.graphics.BlendModeCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.EntrySelectionLauncherActivity
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
@@ -93,6 +95,14 @@ class MagikeyboardService : InputMethodService(), KeyboardView.OnKeyboardActionL
             switchToPreviousKeyboard()
         }
 
+        fieldsAdapter = FieldsAdapter(this)
+        fieldsAdapter?.onItemClickListener = object : FieldsAdapter.OnItemClickListener {
+            override fun onItemClick(item: Field) {
+                currentInputConnection.commitText(getEntryInfo()?.getGeneratedFieldValue(item.name) , 1)
+                actionTabAutomatically()
+            }
+        }
+
         registerLockReceiver(lockReceiver, true)
     }
 
@@ -121,15 +131,8 @@ class MagikeyboardService : InputMethodService(), KeyboardView.OnKeyboardActionL
                 contentView = popupFieldsView
             }
 
-            val recyclerView = popupFieldsView.findViewById<androidx.recyclerview.widget.RecyclerView>(R.id.keyboard_popup_fields_list)
-            fieldsAdapter = FieldsAdapter(this)
-            fieldsAdapter?.onItemClickListener = object : FieldsAdapter.OnItemClickListener {
-                override fun onItemClick(item: Field) {
-                    currentInputConnection.commitText(getEntryInfo()?.getGeneratedFieldValue(item.name) , 1)
-                    actionTabAutomatically()
-                }
-            }
-            recyclerView.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this, androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL, true)
+            val recyclerView = popupFieldsView.findViewById<RecyclerView>(R.id.keyboard_popup_fields_list)
+            recyclerView.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, true)
             recyclerView.adapter = fieldsAdapter
 
             val closeView = popupFieldsView.findViewById<View>(R.id.keyboard_popup_close)
@@ -141,7 +144,7 @@ class MagikeyboardService : InputMethodService(), KeyboardView.OnKeyboardActionL
             return rootKeyboardView
         }
 
-        return super.onCreateInputView()
+        return rootKeyboardView
     }
 
     private fun getEntryInfo(): EntryInfo? {
diff --git a/app/src/main/java/com/kunzisoft/keepass/utils/UriUtil.kt b/app/src/main/java/com/kunzisoft/keepass/utils/UriUtil.kt
index 8ec6ce5f5..1ca58508e 100644
--- a/app/src/main/java/com/kunzisoft/keepass/utils/UriUtil.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/utils/UriUtil.kt
@@ -269,17 +269,18 @@ object UriUtil {
 
     fun contributingUser(context: Context): Boolean {
         return (Education.isEducationScreenReclickedPerformed(context)
-                || isExternalAppInstalled(context, "com.kunzisoft.keepass.pro")
+                || isExternalAppInstalled(context, "com.kunzisoft.keepass.pro", false)
                 )
     }
 
-    private fun isExternalAppInstalled(context: Context, packageName: String): Boolean {
+    private fun isExternalAppInstalled(context: Context, packageName: String, showError: Boolean = true): Boolean {
         try {
             context.applicationContext.packageManager.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES)
             Education.setEducationScreenReclickedPerformed(context)
             return true
         } catch (e: Exception) {
-            Log.e(TAG, "App not accessible", e)
+            if (showError)
+                Log.e(TAG, "App not accessible", e)
         }
         return false
     }