From d36f0a793cef63c5ce239729fd31f83956407193 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 7 Dec 2018 10:56:45 -0500
Subject: tid bits

---
 config.xml                   | 8 ++++----
 package.json                 | 6 +++---
 www/js/DataModel.js          | 5 ++++-
 www/js/FirstUseCtrl.js       | 2 +-
 www/js/MontageHistoryCtrl.js | 1 +
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/config.xml b/config.xml
index bafee0f9..d48de564 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.033" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.035" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client
@@ -163,10 +163,10 @@
     <plugin name="cordova-plugin-advanced-websocket" spec="^1.1.3" />
     <plugin name="cordova-plugin-network-information" spec="^2.0.1" />
     <plugin name="cordova-plugin-x-socialsharing" spec="^5.4.1" />
-    <plugin name="cordova-plugin-ionic-webview" spec="https://github.com/pliablepixels/cordova-plugin-ionic-webview.git">
-        <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" />
-    </plugin>
     <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
     <engine name="android" spec="^6.4.0" />
     <engine name="ios" spec="~4.5.5" />
+    <plugin name="cordova-plugin-ionic-webview" spec="https://github.com/pliablepixels/cordova-plugin-ionic-webview.git">
+        <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" />
+    </plugin>
 </widget>
diff --git a/package.json b/package.json
index 7d392d54..0e110fff 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "zmninjapro",
   "description": "Home security mobile app for ZoneMinder",
-  "version": "1.3.033",
+  "version": "1.3.035",
   "displayName": "zmNinja",
   "author": "Pliable Pixels",
   "license": "custom see LICENSE.md",
@@ -50,10 +50,10 @@
       },
       "cordova-plugin-advanced-websocket": {},
       "cordova-plugin-x-socialsharing": {},
+      "cordova-plugin-media-pp-fork": {},
       "cordova-plugin-ionic-webview": {
         "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
-      },
-      "cordova-plugin-media-pp-fork": {}
+      }
     }
   },
   "dependencies": {
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 704a4f05..86efb329 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -20,7 +20,7 @@ angular.module('zmApp.controllers')
         DO NOT TOUCH zmAppVersion
         It is changed by sync_version.sh
       */
-      var zmAppVersion = "1.3.033";
+      var zmAppVersion = "1.3.035";
       var isBackground = false;
       var justResumed = false;
       var timeSinceResumed = -1;
@@ -211,6 +211,9 @@ angular.module('zmApp.controllers')
        */
       function setCordovaHttpOptions() {
 
+        debug ("Cordova HTTP: disabling redirect till bug in library is fixed");
+        cordova.plugin.http.disableRedirect(true,
+          function(s) {debug ("redirect disabled");}, function (e) {debug ("redirect disable FAILED");});
         if (loginData.isUseBasicAuth) {
           debug("Cordova HTTP: configuring basic auth");
           cordova.plugin.http.useBasicAuth(loginData.basicAuthUser, loginData.basicAuthPassword);
diff --git a/www/js/FirstUseCtrl.js b/www/js/FirstUseCtrl.js
index 551a2bb3..14cd09a0 100644
--- a/www/js/FirstUseCtrl.js
+++ b/www/js/FirstUseCtrl.js
@@ -25,7 +25,7 @@ angular.module('zmApp.controllers').controller('zmApp.FirstUseCtrl', ['$scope',
       });
 
       if ($rootScope.platformOS == 'android') {
-        log (">>> Android: enabling inline image view for self signed certs");
+        NVRDataModel.log (">>> Android: enabling inline image view for self signed certs");
         cordova.plugins.certificates.trustUnsecureCerts(true);
       }
 
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index c52022f6..8a1927b3 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -298,6 +298,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
                 //console.log ("ldurl is " + ld.streamingurl);
                 var bw = NVRDataModel.getBandwidth() == "lowbw" ? zm.eventMontageQualityLowBW : ld.montageHistoryQuality;
 
+                
                 $scope.MontageMonitors[j].Monitor.eventUrl = $scope.MontageMonitors[j].Monitor.streamingURL + "/nph-zms?source=event&mode=jpeg&event=" + eid + "&replay=gapless&rate=" + $scope.sliderVal.realRate + "&connkey=" + $scope.MontageMonitors[j].Monitor.connKey + "&scale=" + bw + $rootScope.authSession;
                 //console.log ("Setting event URL to " +$scope.MontageMonitors[j].Monitor.eventUrl);
                 //   console.log ("SWITCHING TO " + $scope.MontageMonitors[j].eventUrl);
-- 
cgit v1.2.3