From 892f4120ac9f650d81d439125930fe6be6a884be Mon Sep 17 00:00:00 2001
From: Dele Olajide <dele@4ng.net>
Date: Mon, 17 Jun 2019 22:15:31 +0100
Subject: [PATCH] version 0.9.5 Release 4

---
 changelog.html          |  6 +++++
 plugin.xml              |  4 ++--
 src/apps/credentials.js | 38 ++++++++++++++++++++++++++++++
 src/apps/index.html     |  2 ++
 src/apps/index.js       | 51 ++++++++++++++---------------------------
 src/apps/options.html   | 23 +++++++++++++++++++
 6 files changed, 88 insertions(+), 36 deletions(-)
 create mode 100644 src/apps/credentials.js
 create mode 100644 src/apps/options.html

diff --git a/changelog.html b/changelog.html
index e9f665e..9630e0d 100644
--- a/changelog.html
+++ b/changelog.html
@@ -44,6 +44,12 @@ <h1>
 Chat API Plugin Changelog
 </h1>
 
+<p><b>0.9.5 Release 4</b> -- June 17, 2019</p>
+<ul>
+    <li><a href="https://github.com/igniterealtime/Pade/issues/181">Fixed #181: Branding parameters are not applied to main web page in PWA mode</a></li>
+    <li><a href="https://github.com/igniterealtime/Pade/issues/182">Fixed #182: PWA mode / geolocalisation is not working PC and Mobile phone</a></li>
+</ul>
+
 <p><b>0.9.5 Release 3</b> -- May 24, 2019</p>
 <ul>
     <li><a href="https://github.com/igniterealtime/Openfire-Chat/issues/10">Fixed #10: Package Pàdé as a progressive web app</a></li>
diff --git a/plugin.xml b/plugin.xml
index 91fc295..24cb309 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -21,8 +21,8 @@
     <name>Chat API</name>
     <description>RESTful API with Server Sent Events (SSE) for Openfire Meetings</description>
     <author>Ignite Realtime</author>
-    <version>0.9.5 Release 3</version>
-    <date>05/24/2019</date>
+    <version>0.9.5 Release 4</version>
+    <date>05/31/2019</date>
     <minServerVersion>4.1.5</minServerVersion>
     <minJavaVersion>1.8</minJavaVersion>    
     <adminconsole>
diff --git a/src/apps/credentials.js b/src/apps/credentials.js
new file mode 100644
index 0000000..e9ef8fd
--- /dev/null
+++ b/src/apps/credentials.js
@@ -0,0 +1,38 @@
+function getCredentials(callback)
+{
+    if (navigator.credentials)
+    {
+        navigator.credentials.get({password: true, federated: {providers: [ 'https://accounts.google.com' ]}, mediation: "silent"}).then(function(credential)
+        {
+            console.log("credential management api get", credential);
+            if (callback) callback(credential);
+
+        }).catch(function(err){
+            console.error ("credential management api get error", err);
+            if (callback) callback();
+        });
+    }
+    else {
+        if (callback) callback();
+    }
+}
+
+function setCredentials(creds)
+{
+    if (navigator.credentials)
+    {
+        navigator.credentials.create({password: creds}).then(function(credential)
+        {
+            navigator.credentials.store(credential).then(function()
+            {
+                console.log("credential management api put", credential);
+
+            }).catch(function (err) {
+                console.error("credential management api put error", err);
+            });
+
+        }).catch(function (err) {
+            console.error("credential management api put error", err);
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/apps/index.html b/src/apps/index.html
index 086d055..01ac6df 100644
--- a/src/apps/index.html
+++ b/src/apps/index.html
@@ -44,6 +44,8 @@
     <script src="js/sip.js"></script>
     <script src="js/etherlynk.js"></script>
     <script src="js/background.js"></script>
+    <script src="options/branding.js"></script>
+    <script src="credentials.js"></script>
     <script src="index.js"></script>
 
 </head>
diff --git a/src/apps/index.js b/src/apps/index.js
index f6e55fe..c838f2b 100644
--- a/src/apps/index.js
+++ b/src/apps/index.js
@@ -5,48 +5,31 @@ window.addEventListener("load", function()
       console.log("Notification.requestPermission", result);
     });
 
-    document.getElementById("inverse").src="inverse/index.html" + location.hash;
-    document.title = chrome.i18n.getMessage('manifest_shortExtensionName') + " - " + chrome.runtime.getManifest().version;
-});
+    // branding overrides
 
-function getCredentials(callback)
-{
-    if (navigator.credentials)
-    {
-        navigator.credentials.get({password: true, federated: {providers: [ 'https://accounts.google.com' ]}, mediation: "silent"}).then(function(credential)
-        {
-            console.log("credential management api get", credential);
-            if (callback) callback(credential);
+    var overrides = Object.getOwnPropertyNames(branding);
 
-        }).catch(function(err){
-            console.error ("credential management api get error", err);
-            if (callback) callback();
-        });
-    }
-    else {
-        if (callback) callback();
-    }
-}
+    console.debug("branding - start", overrides, branding);
 
-function setCredentials(creds)
-{
-    if (navigator.credentials)
+    for (var i=0; i<overrides.length; i++)
     {
-        navigator.credentials.create({password: creds}).then(function(credential)
+        var setting = overrides[i];
+        var override = branding[setting];
+
+        if (override.value != null && override.value != undefined)
         {
-            navigator.credentials.store(credential).then(function()
+            if (!window.localStorage["store.settings." + setting])  // override default value
             {
-                console.log("credential management api put", credential);
-
-            }).catch(function (err) {
-                console.error("credential management api put error", err);
-            });
+                window.localStorage["store.settings." + setting] = JSON.stringify(override.value);
+            }
+        }
 
-        }).catch(function (err) {
-            console.error("credential management api put error", err);
-        });
+        console.debug("branding - found", i, setting, override.value, override.disable, window.localStorage["store.settings." + setting]);
     }
-}
+
+    document.getElementById("inverse").src="inverse/index.html" + location.hash;
+    document.title = chrome.i18n.getMessage('manifest_shortExtensionName') + " - " + chrome.runtime.getManifest().version;
+});
 
 var webpush = (function(push)
 {
diff --git a/src/apps/options.html b/src/apps/options.html
new file mode 100644
index 0000000..f8b4f33
--- /dev/null
+++ b/src/apps/options.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<html class="no-js" lang="en">
+<head>
+    <meta charset="utf-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <title>Settings</title>
+    <link rel="shortcut icon" href="icon.png" type="image/gif" />
+
+    <script src="inverse/chrome.js"></script>
+    <script src="js/jquery.min.js"></script>
+    <script src="js/libs.bundle.js"></script>
+    <script src="js/strophe.vcard.js"></script>
+    <script src="js/moment.js"></script>
+    <script src="js/sip.js"></script>
+    <script src="js/etherlynk.js"></script>
+    <script src="js/background.js"></script>
+    <script src="credentials.js"></script>
+
+</head>
+<body>
+    <iframe src="options/index.html" style="position:fixed; top:0px; left:0px; bottom:0px; right:0px; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden;"></iframe>
+</body>
+</html>
\ No newline at end of file