fixed policy update retry count

Author: bsolonenko

app/controller/SettingsController.js

@@ -347,27 +347,41 @@ SDL.SettingsController = Em.Object.create(
     policyUpdateRetry: function(abort) {
       clearTimeout(SDL.SDLModel.data.policyUpdateRetry.timer);
       SDL.SDLModel.data.policyUpdateRetry.timer = null;
-      if (abort !== 'ABORT' && (
-        SDL.SDLModel.data.policyUpdateRetry.try <
-        SDL.SDLModel.data.policyUpdateRetry.retry.length)) {
-        SDL.SDLModel.data.policyUpdateRetry.oldTimer =
-          SDL.SDLModel.data.policyUpdateRetry.oldTimer +
-          SDL.SDLModel.data.policyUpdateRetry.timeout * 1000 +
-          SDL.SDLModel.data.policyUpdateRetry.retry[SDL.SDLModel.data.policyUpdateRetry.try] *
-          1000;
+
+      var sendOnSystemRequest = function() {
+        FFW.BasicCommunication.OnSystemRequest(
+          'PROPRIETARY',
+          SDL.SettingsController.policyUpdateFile,
+          SDL.SDLModel.data.policyURLs[0].url,
+          SDL.SDLModel.data.policyURLs[0].appID
+        );
+      }
+      if(!SDL.SDLModel.data.policyUpdateRetry.isRetry) {
+        SDL.SDLModel.data.policyUpdateRetry.isRetry = true;
         SDL.SDLModel.data.policyUpdateRetry.timer = setTimeout(
           function() {
-            FFW.BasicCommunication.OnSystemRequest(
-              'PROPRIETARY',
-              SDL.SettingsController.policyUpdateFile,
-              SDL.SDLModel.data.policyURLs[0].url,
-              SDL.SDLModel.data.policyURLs[0].appID
-            );
-            SDL.SettingsController.policyUpdateRetry();
+            sendOnSystemRequest();
+          }, 1000
+        );
+        return;
+      }
+      var length = SDL.SDLModel.data.policyUpdateRetry.retry.length;
+      if(length == SDL.SDLModel.data.policyUpdateRetry.try) {
+        SDL.SDLModel.data.policyUpdateRetry.isRetry = false;
+      }
+      if (abort !== 'ABORT' && SDL.SDLModel.data.policyUpdateRetry.isRetry) {           
+        
+        SDL.SDLModel.data.policyUpdateRetry.oldTimer = 
+          SDL.SDLModel.data.policyUpdateRetry.retry[SDL.SDLModel.data.policyUpdateRetry.try] * 1000;
+     
+        SDL.SDLModel.data.policyUpdateRetry.timer = setTimeout(
+          function() {
+            sendOnSystemRequest();
           }, SDL.SDLModel.data.policyUpdateRetry.oldTimer
         );
         SDL.SDLModel.data.policyUpdateRetry.try++;
       } else {
+        SDL.SDLModel.data.policyUpdateRetry.isRetry = false;
         clearTimeout(SDL.SDLModel.data.policyUpdateRetry.timer);
         SDL.SDLModel.data.policyUpdateRetry = {
           timeout: null,

app/model/sdl/Abstract/data.js

@@ -73,7 +73,8 @@ SDL.SDLModelData = Em.Object.create(
       retry: [],
       try: null,
       timer: null,
-      oldTimer: 0
+      oldTimer: 0,
+      isRetry: false
     },
     /**
      * Application's container for current processed requests on VR component

ffw/BasicCommunicationRPC.js

@@ -325,6 +325,10 @@ FFW.BasicCommunication = FFW.RPCObserver
             case 'UPDATE_NEEDED':
             {
               messageCode = 'StatusNeeded';
+              if (FLAGS.ExternalPolicies === true && 
+                  SDL.SDLModel.data.policyUpdateRetry.isRetry) {
+                SDL.SettingsController.policyUpdateRetry();
+              }
               break;
             }
           }