From b713237ec3a30f69d876be889acd569bc00bb8ec Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Sun, 14 May 2023 13:14:27 +0200
Subject: [PATCH] fix: Small warning

---
 .../preference/IconPackListPreference.kt      |  2 +-
 .../com/kunzisoft/keepass/utils/UriUtil.kt    | 19 ++++++++-----------
 .../com/kunzisoft/keepass/utils/UriHelper.kt  |  4 ++--
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preference/IconPackListPreference.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preference/IconPackListPreference.kt
index bc90cac3d..067164f00 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/preference/IconPackListPreference.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/preference/IconPackListPreference.kt
@@ -38,7 +38,7 @@ class IconPackListPreference @JvmOverloads constructor(context: Context,
         for (iconPack in IconPackChooser.getIconPackList(context)) {
             if (iconPack.id != null) {
                 entries.add(iconPack.name)
-                values.add(iconPack.id!!)
+                values.add(iconPack.id)
             }
         }
 
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 e75a9b46f..e97fa9f83 100644
--- a/app/src/main/java/com/kunzisoft/keepass/utils/UriUtil.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/utils/UriUtil.kt
@@ -190,7 +190,7 @@ object UriUtil {
 
     fun Context.openUrl(url: String?) {
         try {
-            if (url != null && url.isNotEmpty()) {
+            if (!url.isNullOrEmpty()) {
                 // Default http:// if no protocol specified
                 val newUrl = if (!url.contains("://")) {
                     "http://$url"
@@ -210,20 +210,17 @@ object UriUtil {
 
     fun Context.isContributingUser(): Boolean {
         return (Education.isEducationScreenReclickedPerformed(this)
-                || isExternalAppInstalled(
-            this,
-            this.getString(R.string.keepro_app_id),
-            false
-            )
+                || isExternalAppInstalled(this.getString(R.string.keepro_app_id), false)
         )
     }
 
-    private fun isExternalAppInstalled(context: Context,
-                                       packageName: String,
-                                       showError: Boolean = true): Boolean {
+    fun Context.isExternalAppInstalled(packageName: String, showError: Boolean = true): Boolean {
         try {
-            context.applicationContext.packageManager.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES)
-            Education.setEducationScreenReclickedPerformed(context)
+            this.applicationContext.packageManager.getPackageInfo(
+                packageName,
+                PackageManager.GET_ACTIVITIES
+            )
+            Education.setEducationScreenReclickedPerformed(this)
             return true
         } catch (e: Exception) {
             if (showError)
diff --git a/database/src/main/java/com/kunzisoft/keepass/utils/UriHelper.kt b/database/src/main/java/com/kunzisoft/keepass/utils/UriHelper.kt
index ede2da2cc..af9561de2 100644
--- a/database/src/main/java/com/kunzisoft/keepass/utils/UriHelper.kt
+++ b/database/src/main/java/com/kunzisoft/keepass/utils/UriHelper.kt
@@ -73,7 +73,7 @@ object UriHelper {
 
     fun Uri.withFileScheme(): Boolean {
         val scheme = this.scheme
-        if (scheme == null || scheme.isEmpty() || scheme.lowercase(Locale.ENGLISH) == "file") {
+        if (scheme.isNullOrEmpty() || scheme.lowercase(Locale.ENGLISH) == "file") {
             return true
         }
         return false
@@ -87,5 +87,5 @@ object UriHelper {
         return false
     }
 
-    private const val TAG = "UriUtilDatabase"
+    private const val TAG = "UriHelper"
 }