Merge pull request #2133 from cmgustavo/bug/android-import

import profile/wallet on android
bitpay · Dec 12, 2014 · 97bcd37 · 97bcd37
2 parents 3ef5643 + 9727c70
commit 97bcd37
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/js/controllers/import.js b/js/controllers/import.js
@@ -1,14 +1,21 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('ImportController',
-  function($scope, $rootScope, $location, identityService, notification, isMobile, Compatibility) {
+  function($scope, $rootScope, $location, $timeout, identityService, notification, isMobile, Compatibility) {
 
     $rootScope.title = 'Import wallet';
     $scope.importStatus = 'Importing wallet - Reading backup...';
     $scope.hideAdv = true;
     $scope.is_iOS = isMobile.iOS();
     $scope.importOpts = {};
 
+    window.ignoreMobilePause = true;
+    $scope.$on('$destroy', function() {
+      $timeout(function(){
+        window.ignoreMobilePause = false;
+      }, 100);
+    });
+
     Compatibility.check($scope);
 
     var reader = new FileReader();

diff --git a/js/controllers/importProfile.js b/js/controllers/importProfile.js
@@ -1,12 +1,19 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('ImportProfileController',
-  function($scope, $rootScope, $location, notification, isMobile, identityService) {
+  function($scope, $rootScope, $location, $timeout, notification, isMobile, identityService) {
     $scope.title = 'Import a backup';
     $scope.importStatus = 'Importing wallet - Reading backup...';
     $scope.hideAdv = true;
     $scope.is_iOS = isMobile.iOS();
 
+    window.ignoreMobilePause = true;
+    $scope.$on('$destroy', function() {
+      $timeout(function(){
+        window.ignoreMobilePause = false;
+      }, 100);
+    });
+
     var reader = new FileReader();
 
     var updateStatus = function(status) {

diff --git a/js/controllers/join.js b/js/controllers/join.js
@@ -99,11 +99,11 @@ angular.module('copayApp.controllers').controller('JoinController',
     };
 
     $scope.scannerIntent = function() {
-      window.usingCamera = true;
+      window.ignoreMobilePause = true;
       cordova.plugins.barcodeScanner.scan(
         function onSuccess(result) {
           $timeout(function(){
-            window.usingCamera = false;
+            window.ignoreMobilePause = false;
           }, 100);
           if (result.cancelled) return;
 
@@ -112,7 +112,7 @@ angular.module('copayApp.controllers').controller('JoinController',
         },
         function onError(error) {
           $timeout(function(){
-            window.usingCamera = false;
+            window.ignoreMobilePause = false;
           }, 100);
           alert('Scanning error');
         });

diff --git a/js/controllers/send.js b/js/controllers/send.js
@@ -285,11 +285,11 @@ angular.module('copayApp.controllers').controller('SendController',
     };
 
     $scope.scannerIntent = function() {
-      window.usingCamera = true;
+      window.ignoreMobilePause = true;
       cordova.plugins.barcodeScanner.scan(
         function onSuccess(result) {
           $timeout(function(){
-            window.usingCamera = false;
+            window.ignoreMobilePause = false;
           }, 100);
           if (result.cancelled) return;
 
@@ -303,7 +303,7 @@ angular.module('copayApp.controllers').controller('SendController',
         },
         function onError(error) {
           $timeout(function(){
-            window.usingCamera = false;
+            window.ignoreMobilePause = false;
           }, 100);
           alert('Scanning error');
         });

diff --git a/js/init.js b/js/init.js
@@ -10,7 +10,7 @@ angular.element(document).ready(function() {
     document.addEventListener('deviceready', function() {
 
       document.addEventListener('pause', function() {
-        if (!window.usingCamera) {
+        if (!window.ignoreMobilePause) {
           window.location = '#!';
         }
       });