diff options
Diffstat (limited to 'ui/src/main/java')
9 files changed, 10 insertions, 10 deletions
diff --git a/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.kt b/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.kt index c3bfb3bb..56591d6f 100644 --- a/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.kt +++ b/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.kt @@ -4,7 +4,6 @@ */ package com.wireguard.android.databinding -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.ViewGroup diff --git a/ui/src/main/java/com/wireguard/android/databinding/ObservableSortedKeyedArrayList.kt b/ui/src/main/java/com/wireguard/android/databinding/ObservableSortedKeyedArrayList.kt index d00065a1..98e9e915 100644 --- a/ui/src/main/java/com/wireguard/android/databinding/ObservableSortedKeyedArrayList.kt +++ b/ui/src/main/java/com/wireguard/android/databinding/ObservableSortedKeyedArrayList.kt @@ -7,7 +7,6 @@ package com.wireguard.android.databinding import java.util.AbstractList import java.util.Collections import java.util.Comparator -import java.util.NoSuchElementException import java.util.Spliterator /** 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 20f09354..8bf0cf14 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt @@ -15,9 +15,9 @@ import androidx.fragment.app.Fragment import com.wireguard.android.Application import com.wireguard.android.R import com.wireguard.android.databinding.AppListDialogFragmentBinding +import com.wireguard.android.databinding.ObservableKeyedArrayList import com.wireguard.android.model.ApplicationData import com.wireguard.android.util.ErrorMessages -import com.wireguard.android.databinding.ObservableKeyedArrayList class AppListDialogFragment : DialogFragment() { private val appData: ObservableKeyedArrayList<String, ApplicationData> = ObservableKeyedArrayList() diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt index 1c0cf2bd..31f049ab 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt @@ -4,7 +4,6 @@ */ package com.wireguard.android.fragment -import android.app.Activity import android.content.Context import android.os.Bundle import android.text.InputType diff --git a/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt b/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt index d5645e61..bb462b27 100644 --- a/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt +++ b/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt @@ -9,9 +9,9 @@ import androidx.databinding.Bindable import com.wireguard.android.BR import com.wireguard.android.backend.Statistics import com.wireguard.android.backend.Tunnel +import com.wireguard.android.databinding.Keyed import com.wireguard.android.util.ExceptionLoggers import com.wireguard.config.Config -import com.wireguard.android.databinding.Keyed import java9.util.concurrent.CompletableFuture import java9.util.concurrent.CompletionStage diff --git a/ui/src/main/java/com/wireguard/android/model/TunnelComparator.kt b/ui/src/main/java/com/wireguard/android/model/TunnelComparator.kt index 96e69c58..9fb96cab 100644 --- a/ui/src/main/java/com/wireguard/android/model/TunnelComparator.kt +++ b/ui/src/main/java/com/wireguard/android/model/TunnelComparator.kt @@ -25,7 +25,9 @@ object TunnelComparator : Comparator<String> { return 0 } } + val tokens: MutableList<NaturalSortToken> = ArrayList() + init { for (s in NATURAL_SORT_DIGIT_FINDER.findAll(originalString.split(WHITESPACE_FINDER).joinToString(" ").toLowerCase(Locale.ENGLISH))) { try { @@ -36,6 +38,7 @@ object TunnelComparator : Comparator<String> { } } } + private companion object { private val NATURAL_SORT_DIGIT_FINDER = Regex("""\d+|\D+""") private val WHITESPACE_FINDER = Regex("""\s""") diff --git a/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt b/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt index 7d3a5e37..5091ed3b 100644 --- a/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt +++ b/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt @@ -21,8 +21,8 @@ import com.wireguard.android.R import com.wireguard.android.backend.Statistics import com.wireguard.android.backend.Tunnel import com.wireguard.android.configStore.ConfigStore -import com.wireguard.android.util.ExceptionLoggers import com.wireguard.android.databinding.ObservableSortedKeyedArrayList +import com.wireguard.android.util.ExceptionLoggers import com.wireguard.config.Config import java9.util.concurrent.CompletableFuture import java9.util.concurrent.CompletionStage diff --git a/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt b/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt index 8ddce2b1..cdd25134 100644 --- a/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt +++ b/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt @@ -97,9 +97,9 @@ class ZipExporterPreference(context: Context, attrs: AttributeSet?) : Preference } is BiometricAuthenticator.Result.Failure -> { Snackbar.make( - prefActivity.findViewById(android.R.id.content), - it.message, - Snackbar.LENGTH_SHORT + prefActivity.findViewById(android.R.id.content), + it.message, + Snackbar.LENGTH_SHORT ).show() } } diff --git a/ui/src/main/java/com/wireguard/android/util/AsyncWorker.kt b/ui/src/main/java/com/wireguard/android/util/AsyncWorker.kt index fd5eee2f..a6e5d4be 100644 --- a/ui/src/main/java/com/wireguard/android/util/AsyncWorker.kt +++ b/ui/src/main/java/com/wireguard/android/util/AsyncWorker.kt @@ -5,9 +5,9 @@ package com.wireguard.android.util import android.os.Handler -import java.util.concurrent.Executor import java9.util.concurrent.CompletableFuture import java9.util.concurrent.CompletionStage +import java.util.concurrent.Executor /** * Helper class for running asynchronous tasks and ensuring they are completed on the main thread. |