From c86209ff981ec8295032823e2e877c2c953a34a8 Mon Sep 17 00:00:00 2001 From: Falaye Iyanuoluwa Date: Tue, 21 Apr 2020 05:11:54 +0100 Subject: [PATCH] Closes #9694 Bug when user denies permission --- .../org/mozilla/fenix/settings/PairFragment.kt | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt index fa104d1e6a..698cd7adac 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt @@ -4,11 +4,13 @@ package org.mozilla.fenix.settings +import android.content.pm.PackageManager import android.os.Build import android.os.Bundle import android.os.VibrationEffect import android.os.Vibrator import android.view.View +import androidx.core.content.ContextCompat import androidx.core.content.getSystemService import androidx.core.text.HtmlCompat import androidx.fragment.app.Fragment @@ -94,8 +96,18 @@ class PairFragment : Fragment(R.layout.fragment_pair), UserInteractionHandler { grantResults: IntArray ) { when (requestCode) { - REQUEST_CODE_CAMERA_PERMISSIONS -> qrFeature.withFeature { - it.onPermissionsResult(permissions, grantResults) + REQUEST_CODE_CAMERA_PERMISSIONS -> { + if (ContextCompat.checkSelfPermission( + context!!, + android.Manifest.permission.CAMERA + ) == PackageManager.PERMISSION_GRANTED + ) { + qrFeature.withFeature { + it.onPermissionsResult(permissions, grantResults) + } + } else { + findNavController().popBackStack(R.id.turnOnSyncFragment, false) + } } } }