From 8bc76d2e218e5f40961d584e4eb49ca1f491ddf9 Mon Sep 17 00:00:00 2001
From: Sebastiaan Pasma <sebastiaan@enkodo.nl>
Date: Mon, 25 Jun 2018 19:51:25 +0200
Subject: [PATCH 1/2] Fix for camera permission bug after reactivating camera
 permission

---
 src/js/controllers/tab-scan.js    | 6 +++++-
 src/js/services/scannerService.js | 1 +
 www/views/tab-scan.html           | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/js/controllers/tab-scan.js b/src/js/controllers/tab-scan.js
index a96591a25..bfb8d5bef 100644
--- a/src/js/controllers/tab-scan.js
+++ b/src/js/controllers/tab-scan.js
@@ -122,8 +122,12 @@ angular.module('copayApp.controllers').controller('tabScanController', function(
     scannerService.openSettings();
   };
 
+  $scope.reactivationCount = 0;
   $scope.attemptToReactivate = function(){
-    scannerService.reinitialize();
+    scannerService.reinitialize(function(){
+      $scope.reactivationCount++;
+      activate();
+    });
   };
 
   $scope.toggleLight = function(){
diff --git a/src/js/services/scannerService.js b/src/js/services/scannerService.js
index ddf62895d..e09662396 100644
--- a/src/js/services/scannerService.js
+++ b/src/js/services/scannerService.js
@@ -103,6 +103,7 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti
           _completeInitialization(status, callback);
         });
       } else {
+        isAvailable = true; // XX SP: Availability can change after permissions are granted after being denied.
         _completeInitialization(status, callback);
       }
     });
diff --git a/www/views/tab-scan.html b/www/views/tab-scan.html
index 1445adeb8..54c5efab3 100644
--- a/www/views/tab-scan.html
+++ b/www/views/tab-scan.html
@@ -16,7 +16,7 @@
       <div class="zero-state-description" translate>You can scan bitcoin addresses, payment requests, paper wallets, and more.</div>
       <div class="zero-state-cta">
         <div class="ng-hide zero-state-tldr" ng-show="!currentState || currentState === scannerStates.unauthorized" translate>Enable the camera to get started.</div>
-        <div class="ng-hide zero-state-tldr" ng-show="currentState === scannerStates.denied" translate>Enable camera access in your device settings to get started.</div>
+        <div class="ng-hide zero-state-tldr" ng-show="currentState === scannerStates.denied || reactivationCount > 2" translate>Enable camera access in your device settings to get started.</div>
         <div class="ng-hide zero-state-tldr" ng-show="currentState === scannerStates.unavailable" translate>Please connect a camera to get started.</div>
         <button ng-show="!currentState || currentState === scannerStates.unauthorized" class="ng-hide button button-standard button-primary" ng-click="authorize()" translate>Allow Camera Access</button>
         <button ng-show="currentState === scannerStates.denied && canOpenSettings" class="ng-hide button button-standard button-primary" ng-click="openSettings()" translate>Open Settings</button>

From ecbab6a5b5cfbe4b6955decde8948b066c1137c2 Mon Sep 17 00:00:00 2001
From: Sebastiaan Pasma <sebastiaan@enkodo.nl>
Date: Tue, 26 Jun 2018 13:01:24 +0200
Subject: [PATCH 2/2] Fix double permission screen on Android

---
 src/js/controllers/tab-scan.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/js/controllers/tab-scan.js b/src/js/controllers/tab-scan.js
index bfb8d5bef..4a654d91d 100644
--- a/src/js/controllers/tab-scan.js
+++ b/src/js/controllers/tab-scan.js
@@ -126,7 +126,6 @@ angular.module('copayApp.controllers').controller('tabScanController', function(
   $scope.attemptToReactivate = function(){
     scannerService.reinitialize(function(){
       $scope.reactivationCount++;
-      activate();
     });
   };