From 52a2ae36f611db3a7a0246910f64f9f48a725efc Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 16 Sep 2020 10:51:56 +0200 Subject: TunnelEditorFragment: avoid extra trip through event loop onSelectedTunnelChanged is already queueing us to Dispatchers.Main (rather than Dispatchers.Main.immediate, which would crash, but why?), so avoid the extra trip through the event loop by toggling the selected tunnel right away. Signed-off-by: Jason A. Donenfeld --- .../com/wireguard/android/fragment/TunnelEditorFragment.kt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'ui/src') 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 6ddbb56d..b7912175 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt @@ -117,14 +117,13 @@ class TunnelEditorFragment : BaseFragment(), AppSelectionListener { inputManager?.hideSoftInputFromWindow(focusedView.windowToken, InputMethodManager.HIDE_NOT_ALWAYS) } + // Tell the activity to finish itself or go back to the detail view. - activity.runOnUiThread { - // TODO(smaeul): Remove this hack when fixing the Config ViewModel - // The selected tunnel has to actually change, but we have to remember this one. - val savedTunnel = tunnel - if (savedTunnel === selectedTunnel) selectedTunnel = null - selectedTunnel = savedTunnel - } + // TODO(smaeul): Remove this hack when fixing the Config ViewModel + // The selected tunnel has to actually change, but we have to remember this one. + val savedTunnel = tunnel + if (savedTunnel === selectedTunnel) selectedTunnel = null + selectedTunnel = savedTunnel } override fun onOptionsItemSelected(item: MenuItem): Boolean { -- cgit v1.2.3-59-g8ed1b