Merge pull request #268 from smartdevicelink/release/0.8.1

Hotfix Release 0.8.1
smartdevicelink · May 1, 2020 · 8bdd258 · 8bdd258
2 parents 73c7ff4 + 62301dd
commit 8bdd258
Show file tree

Hide file tree

Showing 7 changed files with 2,127 additions and 2,095 deletions.
diff --git a/build/bundle.js b/build/bundle.js
diff --git a/src/js/AppStore.js b/src/js/AppStore.js
@@ -112,7 +112,13 @@ class AppStore extends React.Component {
 
             return res.json();
         }).then((json) => {
-            store.dispatch(updateAvailableAppStoreApps(json.map((app) => {
+            var apps = [];
+            if (json.data && json.data.applications) {
+                apps = json.data.applications
+            } else {
+                apps = json
+            }
+            store.dispatch(updateAvailableAppStoreApps(apps.map((app) => {
                 if ('icon_url' in app) {
                     app.iconUrl = app.icon_url;
                     delete app.icon_url;

diff --git a/src/js/Controllers/BCController.js b/src/js/Controllers/BCController.js
@@ -63,7 +63,13 @@ class BCController {
                 return {"rpc": RpcFactory.MixingAudioResponse(rpc)}
             case "PolicyUpdate":
                 store.dispatch(policyUpdate(rpc.params.file, rpc.params.retry, rpc.params.timeout))
-                sdlController.getPolicyConfiguration("module_config", "endpoints");
+                var state = store.getState()
+                if(flags.ExternalPolicies || state.system.ptuWithModemEnabled) {
+                    sdlController.getPolicyConfiguration("module_config", "endpoints");
+                }
+                else {
+                    this.onSystemRequest(rpc.params.file);
+                }
                 return true;
             case "SystemRequest":
                 if(flags.ExternalPolicies) {
@@ -144,13 +150,8 @@ class BCController {
     onExitAllApplications(reason) {
         this.listener.send(RpcFactory.OnExitAllApplicationsNotification(reason))
     }
-    onSystemRequest(policyFile, urls) {
-        for (var i in urls) {
-            var appID = urls[i].appID
-            var url = urls[i].url
-            this.listener.send(RpcFactory.OnSystemRequestNotification(policyFile, url, appID))
-        }
-
+    onSystemRequest(policyFile, url, appID) {
+        this.listener.send(RpcFactory.OnSystemRequestNotification(policyFile, url, appID))
     }
     onAllowSDLFunctionality(allowed, source) {
         this.listener.send(RpcFactory.OnAllowSDLFunctionality(allowed, source))

diff --git a/src/js/Controllers/ExternalPoliciesController.js b/src/js/Controllers/ExternalPoliciesController.js
@@ -62,11 +62,10 @@ class ExternalPoliciesController {
         }
     }
     onPackMessage(evt) {
-        bcController.onSystemRequest(this.sysReqParams.fileName, this.sysReqParams.urls)
+        bcController.onSystemRequest(this.sysReqParams.fileName, this.sysReqParams.urls[0].url)
         this.retryCount = 0;
         this.retryTimeout = 0;
         this.policyUpdateRetry();
-
     }
     onUnpackMessage(evt) {
         sdlController.onReceivedPolicyUpdate(evt.data)
@@ -88,7 +87,8 @@ class ExternalPoliciesController {
 
             this.policyUpdateRetryTimer = setTimeout(
                 function() {
-                    bcController.onSystemRequest(this.sysReqParams.policyUpdateFile, this.sysReqParams.urls)
+                    var endpoint = this.sysReqParams.urls[this.retryCount % this.sysReqParams.urls.length];
+                    bcController.onSystemRequest(this.sysReqParams.fileName, endpoint.url)
                     this.policyUpdateRetry();
                 }.bind(this), this.retryTimeout
             );

diff --git a/src/js/Controllers/FileSystemController.js b/src/js/Controllers/FileSystemController.js
@@ -62,6 +62,7 @@ class FileSystemController extends SimpleRPCClient {
           reject();
         }
         xhr.open('POST', url)
+        xhr.setRequestHeader("Content-Type", "application/json");
         xhr.send(pts_data)
       });
     }

diff --git a/src/js/Controllers/RpcFactory.js b/src/js/Controllers/RpcFactory.js
@@ -413,16 +413,21 @@ class RpcFactory {
        })       
    }
     static OnSystemRequestNotification(policyFile, url, appID) {
-        return ({
+        var msg = {
             'jsonrpc': '2.0',
             'method': 'BasicCommunication.OnSystemRequest',
             'params': {
                 'requestType': 'PROPRIETARY',
-                'url': url,
-                'fileName': policyFile,
-                'appID': appID
+                'fileName': policyFile
             }
-        })        
+        }
+        if (url) {
+            msg.params.url = url
+        }
+        if (appID) {
+            msg.params.appID = appID
+        }
+        return (msg)       
     }
     static OnReceivedPolicyUpdate(policyFile) {
         return ({

diff --git a/src/js/Controllers/SDLController.js b/src/js/Controllers/SDLController.js
@@ -75,8 +75,9 @@ class SDLController {
                             retry: state.system.policyRetry,
                             timeout: state.system.policyTimeout
                         })
-                    } else {
-                        bcController.onSystemRequest(state.system.policyFile, state.system.urls)
+                    }
+                    else {
+                        bcController.onSystemRequest(state.system.policyFile)
                     }
                 };