Move deferred confirmation logic into show method

1 files changed, 10 insertions, 12 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
index 947ddea28c..c4dd7b267b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
@@ -123,18 +123,15 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
     }
 
     private suspend fun confirmAddAddress(address: InetAddress): Boolean {
-        if (address.isLinkLocalAddress() || address.isSiteLocalAddress()) {
+        return if (address.isLinkLocalAddress() || address.isSiteLocalAddress()) {
             return true
+        } else {
+            showConfirmDnsServerDialog()
         }
-
-        val confirmation = CompletableDeferred<Boolean>()
-
-        showConfirmDnsServerDialog(confirmation)
-
-        return confirmation.await()
     }
 
-    private fun showConfirmDnsServerDialog(confirmation: CompletableDeferred<Boolean>) {
+    private suspend fun showConfirmDnsServerDialog(): Boolean {
+        val confirmation = CompletableDeferred<Boolean>()
         val transaction = parentFragmentManager.beginTransaction()
 
         detachBackButtonHandler()
@@ -143,10 +140,11 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
         ConfirmDnsDialogFragment(confirmation)
             .show(transaction, null)
 
-        jobTracker.newUiJob("restoreBackButtonHandler") {
-            confirmation.await()
-            attachBackButtonHandler()
-        }
+        val result = confirmation.await()
+
+        attachBackButtonHandler()
+
+        return result
     }
 
     private fun attachBackButtonHandler() {