Merge pull request #773 from shankari/wrap_native_calls_in_ready

wrap native calls in intro.js in a ready() statement
e-mission · Aug 7, 2021 · 4f7e043 · 4f7e043
2 parents 066dc51 + cc16088
commit 4f7e043
Showing 1 changed file with 36 additions and 29 deletions.
diff --git a/www/js/intro.js b/www/js/intro.js
@@ -20,41 +20,44 @@ angular.module('emission.intro', ['emission.splash.startprefs',
   });
 })
 
-.controller('IntroCtrl', function($scope, $state, $window, $ionicSlideBoxDelegate,
+.controller('IntroCtrl', function($scope, $state, $window,
+    $ionicPlatform, $ionicSlideBoxDelegate,
     $ionicPopup, $ionicHistory, ionicToast, $timeout, CommHelper, StartPrefs, UpdateCheck, $translate, i18nUtils) {
 
-  $scope.platform = $window.device.platform;
-  $scope.osver = $window.device.version.split(".")[0];
-  if($scope.platform.toLowerCase() == "android") {
-    if($scope.osver < 6) {
-        $scope.locationPermExplanation = $translate.instant('intro.permissions.locationPermExplanation-android-lt-6');
-    } else if ($scope.osver < 10) {
-        $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-android-6-9");
-    } else if ($scope.osver < 11) {
-        $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-android-10");
-    } else {
-        $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-android-gte-11");
-    }
-  }
+  $scope.setupPermissionText = function() {
+      $scope.platform = $window.device.platform;
+      $scope.osver = $window.device.version.split(".")[0];
+      if($scope.platform.toLowerCase() == "android") {
+        if($scope.osver < 6) {
+            $scope.locationPermExplanation = $translate.instant('intro.permissions.locationPermExplanation-android-lt-6');
+        } else if ($scope.osver < 10) {
+            $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-android-6-9");
+        } else if ($scope.osver < 11) {
+            $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-android-10");
+        } else {
+            $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-android-gte-11");
+        }
+      }
 
-  if($scope.platform.toLowerCase() == "ios") {
-    if($scope.osver < 13) {
-        $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-ios-lt-13");
-    } else {
-        $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-ios-gte-13");
-    }
-  }
+      if($scope.platform.toLowerCase() == "ios") {
+        if($scope.osver < 13) {
+            $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-ios-lt-13");
+        } else {
+            $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-ios-gte-13");
+        }
+      }
 
-  $scope.backgroundRestricted = false;
-  if($window.device.manufacturer.toLowerCase() == "samsung") {
-    $scope.backgroundRestricted = true;
-    $scope.allowBackgroundInstructions = $translate.instant("intro.allow_background.samsung");
-  }
+      $scope.backgroundRestricted = false;
+      if($window.device.manufacturer.toLowerCase() == "samsung") {
+        $scope.backgroundRestricted = true;
+        $scope.allowBackgroundInstructions = $translate.instant("intro.allow_background.samsung");
+      }
 
-  $scope.fitnessPermNeeded = ($scope.platform.toLowerCase() == "ios" ||
-    (($scope.platform.toLowerCase() == "android") && ($scope.osver >= 10)));
+      $scope.fitnessPermNeeded = ($scope.platform.toLowerCase() == "ios" ||
+        (($scope.platform.toLowerCase() == "android") && ($scope.osver >= 10)));
 
-  console.log("Explanation = "+$scope.locationPermExplanation);
+      console.log("Explanation = "+$scope.locationPermExplanation);
+  }
 
   var allIntroFiles = Promise.all([
     i18nUtils.geti18nFileName("templates/", "intro/summary", ".html"),
@@ -178,5 +181,9 @@ angular.module('emission.intro', ['emission.splash.startprefs',
     $scope.getIntroBox().slide(0);
     StartPrefs.loadPreferredScreen();
   }
+
+  $ionicPlatform.ready().then(function() {
+    $scope.setupPermissionText();
+  });
 });