Don't check for Orbot until the next time the app is opened if the us…

…er bypasses it #69
iilab · Feb 11, 2016 · 6a8f479 · 6a8f479
1 parent 5e5de49
commit 6a8f479
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 40 deletions.
diff --git a/platforms/android/assets/www/js/app.js b/platforms/android/assets/www/js/app.js
@@ -20,15 +20,14 @@ angular.module('starter', ['ionic', 'ngCordova', 'starter.controllers', 'starter
       StatusBar.styleDefault();
     }
 
-
-
     //keep track of whether the user is online
     $window.isOnline = $cordovaNetwork.isOnline();
 
     //ask at least once per session to run Orbot before downloading
-    $window.checkedOrbotInstalled = false;
-    $window.checkedOrbotActive = false;
-
+    $window.skipOrbotCheck = false;
+    $ionicPlatform.on('resume', function(){
+      $window.skipOrbotCheck = false;
+    });
 
     // listen for Online event
     $rootScope.$on('$cordovaNetwork:online', function(event, networkState){

diff --git a/platforms/android/assets/www/js/controllers.js b/platforms/android/assets/www/js/controllers.js
@@ -119,21 +119,26 @@ angular.module('starter.controllers', ['starter.services'])
 
   function _activateOrbotOrOverride() {
     var dfd = $q.defer();
-    navigator.startApp.check("org.torproject.android", function(message) { /* success */
-        console.log("app exists: ");
-        console.log(message.versionName);
-        console.log(message.packageName);
-        console.log(message.versionCode);
-        console.log(message.applicationInfo);
-        window.checkedOrbotInstalled = true;
-
-        dfd.resolve();
-    },
-    function(error) { /* error */
-        console.log(error);
-        window.checkedOrbotInstalled = true;
-        dfd.reject();
-    });
+    if(window.skipOrbotCheck) {
+      //don't check for orbot if the user has bypassed it intentionally
+      dfd.resolve();
+    } else {
+      navigator.startApp.check("org.torproject.android", function(message) { /* success */
+          console.log("app exists: ");
+          console.log(message.versionName);
+          console.log(message.packageName);
+          console.log(message.versionCode);
+          console.log(message.applicationInfo);
+          window.isOrbotInstalled = true;
+
+          dfd.resolve();
+      },
+      function(error) { /* error */
+          console.log(error);
+          window.isOrbotInstalled = false;
+          dfd.reject();
+      });
+    }
     return dfd.promise;
   }
 
@@ -289,6 +294,7 @@ angular.module('starter.controllers', ['starter.services'])
             $scope.$broadcast('scroll.refreshComplete');
           } else if(res==="unprotected") {
             //the user cancelled... just get the topic list anyways
+            window.skipOrbotCheck = true;
             _downloadTopicList();
           } else if(res==="offline") {
             _loadLocalTopicList();
@@ -400,6 +406,7 @@ angular.module('starter.controllers', ['starter.services'])
             window.open('market://details?id=org.torproject.android', '_system');
           } else if(res==="unprotected") {
             //the user cancelled... just get the topic anyways
+            window.skipOrbotCheck = true;
             _performTopicDownload(topic);
           } else if(res==="offline") {
             //do nothing... staying offline

diff --git a/www/js/app.js b/www/js/app.js
@@ -20,15 +20,14 @@ angular.module('starter', ['ionic', 'ngCordova', 'starter.controllers', 'starter
       StatusBar.styleDefault();
     }
 
-
-
     //keep track of whether the user is online
     $window.isOnline = $cordovaNetwork.isOnline();
 
     //ask at least once per session to run Orbot before downloading
-    $window.checkedOrbotInstalled = false;
-    $window.checkedOrbotActive = false;
-
+    $window.skipOrbotCheck = false;
+    $ionicPlatform.on('resume', function(){
+      $window.skipOrbotCheck = false;
+    });
 
     // listen for Online event
     $rootScope.$on('$cordovaNetwork:online', function(event, networkState){

diff --git a/www/js/controllers.js b/www/js/controllers.js
@@ -119,21 +119,26 @@ angular.module('starter.controllers', ['starter.services'])
 
   function _activateOrbotOrOverride() {
     var dfd = $q.defer();
-    navigator.startApp.check("org.torproject.android", function(message) { /* success */
-        console.log("app exists: ");
-        console.log(message.versionName);
-        console.log(message.packageName);
-        console.log(message.versionCode);
-        console.log(message.applicationInfo);
-        window.checkedOrbotInstalled = true;
-
-        dfd.resolve();
-    },
-    function(error) { /* error */
-        console.log(error);
-        window.checkedOrbotInstalled = true;
-        dfd.reject();
-    });
+    if(window.skipOrbotCheck) {
+      //don't check for orbot if the user has bypassed it intentionally
+      dfd.resolve();
+    } else {
+      navigator.startApp.check("org.torproject.android", function(message) { /* success */
+          console.log("app exists: ");
+          console.log(message.versionName);
+          console.log(message.packageName);
+          console.log(message.versionCode);
+          console.log(message.applicationInfo);
+          window.isOrbotInstalled = true;
+
+          dfd.resolve();
+      },
+      function(error) { /* error */
+          console.log(error);
+          window.isOrbotInstalled = false;
+          dfd.reject();
+      });
+    }
     return dfd.promise;
   }
 
@@ -289,6 +294,7 @@ angular.module('starter.controllers', ['starter.services'])
             $scope.$broadcast('scroll.refreshComplete');
           } else if(res==="unprotected") {
             //the user cancelled... just get the topic list anyways
+            window.skipOrbotCheck = true;
             _downloadTopicList();
           } else if(res==="offline") {
             _loadLocalTopicList();
@@ -400,6 +406,7 @@ angular.module('starter.controllers', ['starter.services'])
             window.open('market://details?id=org.torproject.android', '_system');
           } else if(res==="unprotected") {
             //the user cancelled... just get the topic anyways
+            window.skipOrbotCheck = true;
             _performTopicDownload(topic);
           } else if(res==="offline") {
             //do nothing... staying offline