Upload file

Author: Zenlua

krscript/src/main/java/com/omarea/krscript/ui/ParamsAppChooserRender.kt

@@ -61,15 +61,15 @@ class ParamsAppChooserRender(private var actionParamInfo: ActionParamInfo, priva
 
         val options = ArrayList(packages.map {
             AdapterAppChooser.AppInfo().apply {
-                appName = "" + it.applicationInfo?.loadLabel(pm)
+                appName = "" + it.applicationInfo.loadLabel(pm)
                 packageName = it.packageName
             }
         })
 
         // 是否包含丢失的应用程序
         if (includeMissing && actionParamInfo.optionsFromShell != null) {
             for (item in actionParamInfo.optionsFromShell!!) {
-                if (options.none { it.packageName == item.value }) {
+                if (options.filter { it.packageName == item.value }.isEmpty()) {
                     options.add(AdapterAppChooser.AppInfo().apply {
                         appName = "" + item.title
                         packageName = "" + item.value
@@ -100,7 +100,7 @@ class ParamsAppChooserRender(private var actionParamInfo: ActionParamInfo, priva
             val current = packages.find { it.packageName == currentValue }
             val currentIndex = if (current != null) packages.indexOf(current) else -1
             if (currentIndex > -1) {
-                packages[currentIndex].selected = true
+                packages.get(currentIndex).selected = true
             }
         }
     }
@@ -150,8 +150,8 @@ class ParamsAppChooserRender(private var actionParamInfo: ActionParamInfo, priva
 
     override fun onConfirm(apps: List<AdapterAppChooser.AppInfo>) {
         if (actionParamInfo.multiple) {
-            val values = apps.joinToString(actionParamInfo.separator) { it.packageName }
-            val labels = apps.joinToString("，") { it.appName }
+            val values = apps.map { it.packageName }.joinToString(actionParamInfo.separator)
+            val labels = apps.map { it.appName }.joinToString("，")
             valueView.text = values
             nameView.text = labels
         } else {