Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KernelModuleDisablerPreference: do not make synchronous calls to getBackend

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2020-04-07 02:28:15 -06:00
parent 3c6e06f8d5
commit b858284b1e
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ui/src/main/java/com/wireguard/android/preference/KernelModuleDisablerPreference.kt
View File

@ -18,11 +18,18 @@ import java9.util.concurrent.CompletableFuture
import kotlin.system.exitProcess import kotlin.system.exitProcess
class KernelModuleDisablerPreference(context: Context, attrs: AttributeSet?) : Preference(context, attrs) { class KernelModuleDisablerPreference(context: Context, attrs: AttributeSet?) : Preference(context, attrs) {
private var state = if (Application.getBackend() is WgQuickBackend) State.ENABLED else State.DISABLED private var state = State.UNKNOWN
override fun getSummary() = context.getString(state.summaryResourceId) init {
isVisible = false
Application.getBackendAsync().thenAccept { backend ->
setState(if (backend is WgQuickBackend) State.ENABLED else State.DISABLED)
}
}
override fun getTitle() = context.getString(state.titleResourceId) override fun getSummary() = if (state == State.UNKNOWN) "" else context.getString(state.summaryResourceId)
override fun getTitle() = if (state == State.UNKNOWN) "" else context.getString(state.titleResourceId)
@SuppressLint("ApplySharedPref") @SuppressLint("ApplySharedPref")
override fun onClick() { override fun onClick() {
@ -51,13 +58,15 @@ class KernelModuleDisablerPreference(context: Context, attrs: AttributeSet?) : P
if (this.state == state) return if (this.state == state) return
this.state = state this.state = state
if (isEnabled != state.shouldEnableView) isEnabled = state.shouldEnableView if (isEnabled != state.shouldEnableView) isEnabled = state.shouldEnableView
if (isVisible != state.visible) isVisible = state.visible
notifyChanged() notifyChanged()
} }
private enum class State(val titleResourceId: Int, val summaryResourceId: Int, val shouldEnableView: Boolean) { private enum class State(val titleResourceId: Int, val summaryResourceId: Int, val shouldEnableView: Boolean, val visible: Boolean) {
ENABLED(R.string.module_disabler_enabled_title, R.string.module_disabler_enabled_summary, true), UNKNOWN(0, 0, false, false),
DISABLED(R.string.module_disabler_disabled_title, R.string.module_disabler_disabled_summary, true), ENABLED(R.string.module_disabler_enabled_title, R.string.module_disabler_enabled_summary, true, true),
ENABLING(R.string.module_disabler_disabled_title, R.string.success_application_will_restart, false), DISABLED(R.string.module_disabler_disabled_title, R.string.module_disabler_disabled_summary, true, true),
DISABLING(R.string.module_disabler_enabled_title, R.string.success_application_will_restart, false); ENABLING(R.string.module_disabler_disabled_title, R.string.success_application_will_restart, false, true),
DISABLING(R.string.module_disabler_enabled_title, R.string.success_application_will_restart, false, true);
} }
} }