From f0a89d5498c0116efabb4c939c3d1525cbbdbd44 Mon Sep 17 00:00:00 2001 From: Mygod Date: Sun, 30 Dec 2018 17:44:18 +0800 Subject: [PATCH] Do not request data onDismiss --- mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt | 2 +- .../src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt index 3791bb89..527368e4 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt @@ -20,6 +20,6 @@ abstract class AlertDialogFragment : DialogFragment(), DialogInterface.OnClickLi override fun onDismiss(dialog: DialogInterface?) { super.onDismiss(dialog) - targetFragment?.onActivityResult(targetRequestCode, Activity.RESULT_CANCELED, data) + targetFragment?.onActivityResult(targetRequestCode, Activity.RESULT_CANCELED, null) } } 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 160cf798..ded3645d 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt @@ -124,7 +124,7 @@ class RepeaterManager(private val parent: TetheringFragment) : Manager(), Servic setNeutralButton(R.string.repeater_wps_dialog_pbc, listener) } override val data: Intent get() = Intent() - .putExtra(KEY_PIN, dialog.findViewById(android.R.id.edit)?.text.toString()) + .putExtra(KEY_PIN, dialog.findViewById(android.R.id.edit)?.text?.toString()) override fun onCreateDialog(savedInstanceState: Bundle?) = super.onCreateDialog(savedInstanceState).apply { window!!.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE)