diff options
author | Harsh Shandilya <me@msfjarvis.dev> | 2020-03-19 14:45:07 +0530 |
---|---|---|
committer | Harsh Shandilya <me@msfjarvis.dev> | 2020-03-19 14:45:07 +0530 |
commit | 0899b49bb3d479747da960a8b2055374729eaa49 (patch) | |
tree | e28f11da71904a9adf44661d46133eaa96b6af27 /ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt | |
parent | ui: Convert fragment package to Kotlin (diff) | |
download | wireguard-android-0899b49bb3d479747da960a8b2055374729eaa49.tar.xz wireguard-android-0899b49bb3d479747da960a8b2055374729eaa49.zip |
Use more Kotlin-esque code where applicable
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt')
-rw-r--r-- | ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt index 01dadb08..34981bd3 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt @@ -19,9 +19,6 @@ import com.wireguard.android.model.ApplicationData import com.wireguard.android.util.ErrorMessages import com.wireguard.android.util.ObservableKeyedArrayList import com.wireguard.android.util.ObservableKeyedList -import java9.util.Comparators -import java9.util.function.Function -import java.util.Collections class AppListDialogFragment : DialogFragment() { private val appData: ObservableKeyedList<String, ApplicationData> = ObservableKeyedArrayList() @@ -39,8 +36,7 @@ class AppListDialogFragment : DialogFragment() { val packageName = it.activityInfo.packageName applicationData.add(ApplicationData(it.loadIcon(pm), it.loadLabel(pm).toString(), packageName, currentlyExcludedApps.contains(packageName))) } - - Collections.sort(applicationData, Comparators.comparing(Function { obj: ApplicationData -> obj.name }, java.lang.String.CASE_INSENSITIVE_ORDER)) + applicationData.sortWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.name }) applicationData }.whenComplete { data, throwable -> if (data != null) { @@ -77,7 +73,7 @@ class AppListDialogFragment : DialogFragment() { dialog.setOnShowListener { dialog.getButton(DialogInterface.BUTTON_NEUTRAL).setOnClickListener { val selectedItems = appData - .filter { obj: ApplicationData -> obj.isExcludedFromTunnel } + .filter { it.isExcludedFromTunnel } val excludeAll = selectedItems.isEmpty() appData.forEach { |