Bump to 1.7.15. Add firebase to fix event server. Bump minSdkVersion to fix firebase.

Author: connortechnology

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.zoneminder.zmNinja" version="1.7.014" 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 id="com.zoneminder.zmNinja" version="1.7.015" 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
@@ -27,9 +27,9 @@
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="FadeSplashScreen" value="false" />
     <preference name="BackgroundColor" value="#444444" />
-    <preference name="android-targetSdkVersion" value="35" />
-    <preference name="android-compileSdkVersion" value="35" />
-    <preference name="android-minSdkVersion" value="22" />
+    <preference name="android-targetSdkVersion" value="34" />
+    <preference name="android-compileSdkVersion" value="34" />
+    <preference name="android-minSdkVersion" value="23" />
     <preference name="SplashScreenBackgroundColor" value="#ababab" />
     <preference name="StatusBarOverlaysWebView" value="false" />
     <preference name="StatusBarBackgroundColor" value="#2980b9" />

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "zmninja",
   "description": "Home security mobile app for ZoneMinder",
-  "version": "1.7.014",
+  "version": "1.7.015",
   "displayName": "zmNinja",
   "author": "Zoneminder Inc, Pliable Pixels",
   "repository": {
@@ -51,7 +51,39 @@
         "PHOTO_LIBRARY_USAGE_DESCRIPTION": " "
       },
       "cordova-plugin-x-socialsharing": {},
-      "cordova-plugin-certificates-pp-fork": {}
+      "cordova-plugin-certificates-pp-fork": {},
+      "cordova-plugin-firebasex": {
+        "FIREBASE_ANALYTICS_COLLECTION_ENABLED": "true",
+        "FIREBASE_PERFORMANCE_COLLECTION_ENABLED": "true",
+        "FIREBASE_CRASHLYTICS_COLLECTION_ENABLED": "true",
+        "FIREBASE_FCM_AUTOINIT_ENABLED": "true",
+        "FIREBASE_ANALYTICS_WITHOUT_ADS": "false",
+        "FIREBASE_MESSAGING_IMMEDIATE_PAYLOAD_DELIVERY": "false",
+        "GOOGLE_ANALYTICS_ADID_COLLECTION_ENABLED": "true",
+        "GOOGLE_ANALYTICS_DEFAULT_ALLOW_ANALYTICS_STORAGE": "true",
+        "GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_STORAGE": "true",
+        "GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_USER_DATA": "true",
+        "GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_PERSONALIZATION_SIGNALS": "true",
+        "ANDROID_ICON_ACCENT": "#FF00FFFF",
+        "ANDROID_FIREBASE_PERFORMANCE_MONITORING": "false",
+        "ANDROID_PLAY_SERVICES_TAGMANAGER_VERSION": "18.1.1",
+        "ANDROID_PLAY_SERVICES_AUTH_VERSION": "21.3.0",
+        "ANDROID_FIREBASE_ANALYTICS_VERSION": "22.2.0",
+        "ANDROID_FIREBASE_MESSAGING_VERSION": "24.1.0",
+        "ANDROID_FIREBASE_CONFIG_VERSION": "22.1.0",
+        "ANDROID_FIREBASE_PERF_VERSION": "21.0.4",
+        "ANDROID_FIREBASE_AUTH_VERSION": "23.2.0",
+        "ANDROID_FIREBASE_INAPPMESSAGING_VERSION": "21.0.1",
+        "ANDROID_FIREBASE_FIRESTORE_VERSION": "25.1.2",
+        "ANDROID_FIREBASE_FUNCTIONS_VERSION": "21.1.0",
+        "ANDROID_FIREBASE_IID_VERSION": "21.1.0",
+        "ANDROID_FIREBASE_INSTALLATIONS_VERSION": "18.0.0",
+        "ANDROID_FIREBASE_CRASHLYTICS_VERSION": "19.4.0",
+        "ANDROID_FIREBASE_CRASHLYTICS_NDK_VERSION": "19.4.0",
+        "ANDROID_GSON_VERSION": "2.11.0",
+        "ANDROID_FIREBASE_PERF_GRADLE_PLUGIN_VERSION": "1.4.2",
+        "ANDROID_GRPC_OKHTTP": "1.68.0"
+      }
     }
   },
   "dependencies": {
@@ -97,6 +129,7 @@
     "cordova-plugin-device": "^3.0.0",
     "cordova-plugin-file": "^8.1.3",
     "cordova-plugin-file-transfer": "github:apache/cordova-plugin-file-transfer",
+    "cordova-plugin-firebase": "^2.0.6",
     "cordova-plugin-firebasex": "^18.0.5",
     "cordova-plugin-globalization": "^1.11.0",
     "cordova-plugin-ignore-lint-translation": "^0.0.1",

package.json

@@ -484,10 +484,14 @@ angular.module('zmApp.controllers')
       var plat = $rootScope.platformOS;
 
       if ($rootScope.platformOS == 'desktop') {
-       NVR.log ('push: Not setting up push as this is desktop.');
+        NVR.log('push: Not setting up push as this is desktop.');
         return;
       }
 
+      if (!window.FirebasePlugin) {
+        NVR.log('ERROR: Firebase is not included.');
+        return;
+      }
       // get permission if we need it
       window.FirebasePlugin.hasPermission(function(hasPermission){
         if (!hasPermission) {
@@ -549,12 +553,11 @@ angular.module('zmApp.controllers')
         };
 
         // Create the channel
-        window.FirebasePlugin.createChannel(channel,
-        function(){
+        window.FirebasePlugin.createChannel(channel, function(){
           NVR.debug('push: Channel created: ' + channel.id);
         },
         function(error){
-        NVR.debug('push: Create channel error: ' + error);
+          NVR.debug('push: Create channel error: ' + error);
         });
       }
 

www/js/EventServer.js

@@ -22,7 +22,7 @@ angular.module('zmApp.controllers')
         DO NOT TOUCH zmAppVersion
         It is changed by sync_version.sh
       */
-      var zmAppVersion = "1.7.014";
+      var zmAppVersion = "1.7.015";
 
       var isBackground = false;
       var justResumed = false;