Upload file

Author: Zenlua

common/src/main/java/com/omarea/common/ui/AdapterAppChooser.kt

@@ -73,7 +73,7 @@ class AdapterAppChooser(
                 results.values = list
                 results.count = list.size
             } else {
-                val prefixString = prefix.toLowerCase()
+                val prefixString = prefix.lowercase()
 
                 val values: ArrayList<AppInfo>
                 synchronized(adapter.mLock) {
@@ -89,8 +89,8 @@ class AdapterAppChooser(
                     if (selected.contains(value)) {
                         newValues.add(value)
                     } else {
-                        val labelText = value.appName.toLowerCase()
-                        val valueText = value.packageName.toLowerCase()
+                        val labelText = value.appName.lowercase()
+                        val valueText = value.packageName.lowercase()
                         if (searchStr(labelText, prefixString)) {
                             newValues.add(value)
                         } else if (searchStr(valueText, prefixString)) {
@@ -141,7 +141,12 @@ class AdapterAppChooser(
                     val installInfo = context.packageManager.getPackageInfo(packageName, 0)
                     iconCaches.put(
                             packageName,
-                            installInfo.applicationInfo.loadIcon(context.packageManager)
+                            installInfo.applicationInfo?.let {
+                                iconCaches.put(
+                                    packageName,
+                                    it.loadIcon(context.packageManager)
+                                )
+                            }
                     )
                 } catch (ex: Exception) {
                     app.notFound = true