summaryrefslogtreecommitdiffhomepage
path: root/android/src/main/kotlin
diff options
context:
space:
mode:
Diffstat (limited to 'android/src/main/kotlin')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt7
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt4
2 files changed, 3 insertions, 8 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 defe6058d8..a045986ca8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
@@ -131,18 +131,17 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
private suspend fun confirmAddAddress(address: InetAddress): Boolean {
val isLocalAddress = address.isLinkLocalAddress() || address.isSiteLocalAddress()
- return !isLocalAddress || isAllowLanEnabled ||
- showConfirmDnsServerDialog(R.string.confirm_local_dns)
+ return !isLocalAddress || isAllowLanEnabled || showConfirmDnsServerDialog()
}
- private suspend fun showConfirmDnsServerDialog(message: Int): Boolean {
+ private suspend fun showConfirmDnsServerDialog(): Boolean {
val confirmation = CompletableDeferred<Boolean>()
val transaction = parentFragmentManager.beginTransaction()
detachBackButtonHandler()
transaction.addToBackStack(null)
- ConfirmDnsDialogFragment(message, confirmation)
+ ConfirmDnsDialogFragment(confirmation)
.show(transaction, null)
val result = confirmation.await()
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt
index 52f20f82a9..ef2aa1667b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt
@@ -9,13 +9,11 @@ import android.view.View
import android.view.ViewGroup
import android.view.ViewGroup.LayoutParams
import android.widget.Button
-import android.widget.TextView
import androidx.fragment.app.DialogFragment
import kotlinx.coroutines.CompletableDeferred
import net.mullvad.mullvadvpn.R
class ConfirmDnsDialogFragment @JvmOverloads constructor(
- private val message: Int = R.string.confirm_local_dns,
private var confirmation: CompletableDeferred<Boolean>? = null
) : DialogFragment() {
override fun onCreateView(
@@ -25,8 +23,6 @@ class ConfirmDnsDialogFragment @JvmOverloads constructor(
): View {
val view = inflater.inflate(R.layout.confirm_dns, container, false)
- view.findViewById<TextView>(R.id.message).setText(message)
-
view.findViewById<Button>(R.id.back_button).setOnClickListener {
activity?.onBackPressed()
}