diff options
3 files changed, 5 insertions, 11 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() } diff --git a/android/src/main/res/layout/confirm_dns.xml b/android/src/main/res/layout/confirm_dns.xml index f271d1aa6e..6c7266eae9 100644 --- a/android/src/main/res/layout/confirm_dns.xml +++ b/android/src/main/res/layout/confirm_dns.xml @@ -13,14 +13,13 @@ android:layout_marginTop="8dp" android:layout_gravity="center" android:src="@drawable/icon_alert" /> - <TextView android:id="@+id/message" - android:layout_width="wrap_content" + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="0" android:layout_marginTop="16dp" android:textColor="@color/white80" android:textSize="@dimen/text_small" - android:text="" /> + android:text="@string/confirm_local_dns" /> <Button android:id="@+id/confirm_button" android:layout_marginVertical="@dimen/button_separation" android:text="@string/add_anyway" |