From b32ff6be4495f5762e54221e4eb5882581f2de75 Mon Sep 17 00:00:00 2001 From: Timshel Date: Mon, 19 Sep 2022 18:09:39 +0200 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/26577 - resetFocus only when camera permission is denied --- .../java/org/mozilla/fenix/search/SearchDialogFragment.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt index e6068897ab..6562e59423 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt @@ -11,6 +11,7 @@ import android.app.Dialog import android.content.Context import android.content.DialogInterface import android.content.Intent +import android.content.pm.PackageManager import android.graphics.Color import android.graphics.Typeface import android.graphics.drawable.ColorDrawable @@ -655,7 +656,9 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { when (requestCode) { REQUEST_CODE_CAMERA_PERMISSIONS -> qrFeature.withFeature { it.onPermissionsResult(permissions, grantResults) - resetFocus() + if (grantResults.contains(PackageManager.PERMISSION_DENIED)) { + resetFocus() + } requireContext().settings().setCameraPermissionNeededState = false } else -> super.onRequestPermissionsResult(requestCode, permissions, grantResults)