diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt
index 527368e4..19c3a939 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt
@@ -7,10 +7,17 @@ import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 
+/**
+ * Based on: https://android.googlesource.com/platform/packages/apps/ExactCalculator/+/8c43f06/src/com/android/calculator2/AlertDialogFragment.java
+ */
 abstract class AlertDialogFragment : DialogFragment(), DialogInterface.OnClickListener {
     protected abstract fun AlertDialog.Builder.prepare(listener: DialogInterface.OnClickListener)
     open val data: Intent? get() = null
 
+    init {
+        setStyle(STYLE_NO_TITLE, 0)
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): AlertDialog =
             AlertDialog.Builder(requireContext()).also { it.prepare(this) }.create()
 
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt
index ded3645d..c654f817 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt
@@ -164,18 +164,18 @@ class RepeaterManager(private val parent: TetheringFragment) : Manager(), Servic
         data.onStatusChanged()
     }
 
-    fun onWpsResult(which: Int, data: Intent) {
+    fun onWpsResult(which: Int, data: Intent?) {
         when (which) {
-            DialogInterface.BUTTON_POSITIVE -> binder?.startWps(data.getStringExtra(WpsDialogFragment.KEY_PIN))
+            DialogInterface.BUTTON_POSITIVE -> binder?.startWps(data!!.getStringExtra(WpsDialogFragment.KEY_PIN))
             DialogInterface.BUTTON_NEUTRAL -> binder?.startWps(null)
         }
     }
 
-    fun onEditResult(which: Int, data: Intent) {
+    fun onEditResult(which: Int, data: Intent?) {
         when (which) {
             DialogInterface.BUTTON_POSITIVE -> try {
                 val master = holder.config ?: return
-                val config = data.getParcelableExtra<WifiConfiguration>(WifiP2pDialogFragment.KEY_CONFIGURATION)
+                val config = data!!.getParcelableExtra<WifiConfiguration>(WifiP2pDialogFragment.KEY_CONFIGURATION)
                 master.update(config.SSID, config.preSharedKey)
                 binder!!.group = null
             } catch (e: Exception) {
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 a566fc5a..ec392310 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt
@@ -111,8 +111,8 @@ class TetheringFragment : Fragment(), ServiceConnection {
 
     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!!)
+            REPEATER_WPS -> adapter.repeaterManager.onWpsResult(resultCode, data)
+            REPEATER_EDIT_CONFIGURATION -> adapter.repeaterManager.onEditResult(resultCode, data)
             else -> super.onActivityResult(requestCode, resultCode, data)
         }
     }