Crafts a new notification icon so that Lollipop++ does not show a white block. What a moronic design imposition by Google. Resolves https://github.com/pliablepixels/zmNinja/issues/50

11 files changed, 27 insertions, 1 deletions

diff --git a/www/external/android-notification-icons/drawable-hdpi-v11/ic_stat_notification.png b/www/external/android-notification-icons/drawable-hdpi-v11/ic_stat_notification.png
new file mode 100755
index 00000000..173932de
--- /dev/null
+++ b/www/external/android-notification-icons/drawable-hdpi-v11/ic_stat_notification.png
diff --git a/www/external/android-notification-icons/drawable-hdpi/ic_stat_notification.png b/www/external/android-notification-icons/drawable-hdpi/ic_stat_notification.png
new file mode 100755
index 00000000..7d832b01
--- /dev/null
+++ b/www/external/android-notification-icons/drawable-hdpi/ic_stat_notification.png
diff --git a/www/external/android-notification-icons/drawable-mdpi-v11/ic_stat_notification.png b/www/external/android-notification-icons/drawable-mdpi-v11/ic_stat_notification.png
new file mode 100755
index 00000000..69685c86
--- /dev/null
+++ b/www/external/android-notification-icons/drawable-mdpi-v11/ic_stat_notification.png
diff --git a/www/external/android-notification-icons/drawable-mdpi/ic_stat_notification.png b/www/external/android-notification-icons/drawable-mdpi/ic_stat_notification.png
new file mode 100755
index 00000000..54001bbb
--- /dev/null
+++ b/www/external/android-notification-icons/drawable-mdpi/ic_stat_notification.png
diff --git a/www/external/android-notification-icons/drawable-xhdpi-v11/ic_stat_notification.png b/www/external/android-notification-icons/drawable-xhdpi-v11/ic_stat_notification.png
new file mode 100755
index 00000000..780fc21f
--- /dev/null
+++ b/www/external/android-notification-icons/drawable-xhdpi-v11/ic_stat_notification.png
diff --git a/www/external/android-notification-icons/drawable-xhdpi/ic_stat_notification.png b/www/external/android-notification-icons/drawable-xhdpi/ic_stat_notification.png
new file mode 100755
index 00000000..96d1d6a2
--- /dev/null
+++ b/www/external/android-notification-icons/drawable-xhdpi/ic_stat_notification.png
diff --git a/www/external/android-notification-icons/drawable-xxhdpi-v11/ic_stat_notification.png b/www/external/android-notification-icons/drawable-xxhdpi-v11/ic_stat_notification.png
new file mode 100755
index 00000000..bb0a69c4
--- /dev/null
+++ b/www/external/android-notification-icons/drawable-xxhdpi-v11/ic_stat_notification.png
diff --git a/www/external/android-notification-icons/drawable-xxhdpi/ic_stat_notification.png b/www/external/android-notification-icons/drawable-xxhdpi/ic_stat_notification.png
new file mode 100755
index 00000000..4a08662a
--- /dev/null
+++ b/www/external/android-notification-icons/drawable-xxhdpi/ic_stat_notification.png
diff --git a/www/external/android-notification-icons/drawable-xxxhdpi-v11/ic_stat_notification.png b/www/external/android-notification-icons/drawable-xxxhdpi-v11/ic_stat_notification.png
new file mode 100755
index 00000000..d02d7189
--- /dev/null
+++ b/www/external/android-notification-icons/drawable-xxxhdpi-v11/ic_stat_notification.png
diff --git a/www/external/android-notification-icons/drawable-xxxhdpi/ic_stat_notification.png b/www/external/android-notification-icons/drawable-xxxhdpi/ic_stat_notification.png
new file mode 100755
index 00000000..1cf02372
--- /dev/null
+++ b/www/external/android-notification-icons/drawable-xxxhdpi/ic_stat_notification.png
diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js
index 7816d932..f6d9599a 100644
--- a/www/js/EventServerSettingsCtrl.js
+++ b/www/js/EventServerSettingsCtrl.js
@@ -113,7 +113,27 @@ angular.module('zmApp.controllers').controller('zmApp.EventServerSettingsCtrl',
         ZMDataModel.displayBanner('info', ['settings saved']);
     }
 
-   
+    //----------------------------------------------------------------
+    // returns domain name in string - 
+    // http://stackoverflow.com/questions/8498592/extract-root-domain-name-from-string
+    //----------------------------------------------------------------
+    function extractDomain(url) {
+    var domain;
+    //find & remove protocol (http, ftp, etc.) and get domain
+    if (url.indexOf("://") > -1) {
+        domain = url.split('/')[2];
+    }
+    else {
+        domain = url.split('/')[0];
+    }
+
+    //find & remove port number
+    domain = domain.split(':')[0];
+
+    return domain;
+}
+
+    
     //----------------------------------------------------------------
     // returns reporting interval for monitor ID
     //----------------------------------------------------------------
@@ -157,6 +177,12 @@ angular.module('zmApp.controllers').controller('zmApp.EventServerSettingsCtrl',
     $scope.monitors = message;
 
     $scope.loginData = ZMDataModel.getLogin();
+    
+    if ($scope.loginData.eventServer == "")
+    {
+        $scope.loginData.eventServer = "wss://"+extractDomain($scope.loginData.url)+":9000";
+    }
+    
 
     $scope.check = {
         isUseEventServer: ""