diff --git a/mobile/src/base/java/be/mygod/vpnhotspot/EBegFragment.kt b/mobile/src/base/java/be/mygod/vpnhotspot/EBegFragment.kt
index 396e62fb..a6ff9847 100644
--- a/mobile/src/base/java/be/mygod/vpnhotspot/EBegFragment.kt
+++ b/mobile/src/base/java/be/mygod/vpnhotspot/EBegFragment.kt
@@ -11,8 +11,8 @@ import android.widget.Button
 import android.widget.Spinner
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatDialogFragment
 import androidx.core.net.toUri
-import androidx.fragment.app.DialogFragment
 import androidx.versionedparcelable.VersionedParcelable
 import be.mygod.vpnhotspot.widget.SmartSnackbar
 import com.android.billingclient.api.*
@@ -21,7 +21,7 @@ import timber.log.Timber
 /**
  * Based on: https://github.com/PrivacyApps/donations/blob/747d36a18433c7e9329691054122a8ad337a62d2/Donations/src/main/java/org/sufficientlysecure/donations/DonationsFragment.java
  */
-class EBegFragment : DialogFragment(), PurchasesUpdatedListener, BillingClientStateListener,
+class EBegFragment : AppCompatDialogFragment(), PurchasesUpdatedListener, BillingClientStateListener,
         SkuDetailsResponseListener, ConsumeResponseListener {
     data class MessageArg(@StringRes val title: Int, @StringRes val message: Int) : VersionedParcelable
     class MessageDialogFragment : AlertDialogFragment<MessageArg, Empty>() {
diff --git a/mobile/src/fdroid/java/be/mygod/vpnhotspot/EBegFragment.kt b/mobile/src/fdroid/java/be/mygod/vpnhotspot/EBegFragment.kt
index f71e5050..51d899c3 100644
--- a/mobile/src/fdroid/java/be/mygod/vpnhotspot/EBegFragment.kt
+++ b/mobile/src/fdroid/java/be/mygod/vpnhotspot/EBegFragment.kt
@@ -8,12 +8,12 @@ import android.view.ViewStub
 import android.widget.Button
 import android.widget.LinearLayout
 import androidx.core.net.toUri
-import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AppCompatDialogFragment
 
 /**
  * Based on: https://github.com/PrivacyApps/donations/blob/747d36a18433c7e9329691054122a8ad337a62d2/Donations/src/main/java/org/sufficientlysecure/donations/DonationsFragment.java
  */
-class EBegFragment : DialogFragment() {
+class EBegFragment : AppCompatDialogFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
             inflater.inflate(R.layout.fragment_ebeg, container, false)
 
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt
index d3f318e6..65e8040a 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt
@@ -5,7 +5,7 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AppCompatDialogFragment
 import androidx.versionedparcelable.ParcelUtils
 import androidx.versionedparcelable.VersionedParcelable
 
@@ -13,7 +13,7 @@ import androidx.versionedparcelable.VersionedParcelable
  * Based on: https://android.googlesource.com/platform/packages/apps/ExactCalculator/+/8c43f06/src/com/android/calculator2/AlertDialogFragment.java
  */
 abstract class AlertDialogFragment<Arg : VersionedParcelable, Ret : VersionedParcelable> :
-        DialogFragment(), DialogInterface.OnClickListener {
+        AppCompatDialogFragment(), DialogInterface.OnClickListener {
     companion object {
         private const val KEY_ARG = "arg"
         private const val KEY_RET = "ret"
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt
index ec392310..d0b4d8a9 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt
@@ -109,12 +109,10 @@ class TetheringFragment : Fragment(), ServiceConnection {
         if (Build.VERSION.SDK_INT >= 27) ManageBar.Data.notifyChange()
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        when (requestCode) {
-            REPEATER_WPS -> adapter.repeaterManager.onWpsResult(resultCode, data)
-            REPEATER_EDIT_CONFIGURATION -> adapter.repeaterManager.onEditResult(resultCode, data)
-            else -> super.onActivityResult(requestCode, resultCode, data)
-        }
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) = when (requestCode) {
+        REPEATER_WPS -> adapter.repeaterManager.onWpsResult(resultCode, data)
+        REPEATER_EDIT_CONFIGURATION -> adapter.repeaterManager.onEditResult(resultCode, data)
+        else -> super.onActivityResult(requestCode, resultCode, data)
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pDialogFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pDialogFragment.kt
index f99d15dd..68813b48 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pDialogFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pDialogFragment.kt
@@ -21,24 +21,22 @@ import java.nio.charset.Charset
  * This dialog has been deprecated in API 28, but we are still using it since it works better for our purposes.
  * Related: https://android.googlesource.com/platform/packages/apps/Settings/+/defb1183ecb00d6231bac7d934d07f58f90261ea
  */
-class WifiP2pDialogFragment : AlertDialogFragment<WifiP2pDialogFragment.Arg, WifiP2pDialogFragment.Arg>(),
-        TextWatcher, DialogInterface.OnClickListener {
+class WifiP2pDialogFragment : AlertDialogFragment<WifiP2pDialogFragment.Arg, WifiP2pDialogFragment.Arg>(), TextWatcher {
     data class Arg(val configuration: WifiConfiguration) : VersionedParcelable
 
     private lateinit var mView: View
     private lateinit var mSsid: TextView
     private lateinit var mPassword: EditText
-    override val ret: Arg?
-        get() {
-            val config = WifiConfiguration()
-            config.SSID = mSsid.text.toString()
-            config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN)
-            if (mPassword.length() != 0) {
-                val password = mPassword.text.toString()
-                config.preSharedKey = password
-            }
-            return Arg(config)
+    override val ret: Arg? get() {
+        val config = WifiConfiguration()
+        config.SSID = mSsid.text.toString()
+        config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN)
+        if (mPassword.length() != 0) {
+            val password = mPassword.text.toString()
+            config.preSharedKey = password
         }
+        return Arg(config)
+    }
 
     override fun AlertDialog.Builder.prepare(listener: DialogInterface.OnClickListener) {
         mView = requireActivity().layoutInflater.inflate(R.layout.dialog_wifi_ap, null)