From 98343a065c09447fee053598a30367f5af80b4cb Mon Sep 17 00:00:00 2001 From: Minhaz A V Date: Tue, 22 Mar 2016 03:49:46 +0530 Subject: [PATCH 1/9] notification issue fixed Signed-off-by: Minhaz A V --- src/Notifier.js | 74 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 54 insertions(+), 20 deletions(-) diff --git a/src/Notifier.js b/src/Notifier.js index 65a222c730..c4dd99f96f 100644 --- a/src/Notifier.js +++ b/src/Notifier.js @@ -123,6 +123,26 @@ var Notifier = { return global.Notification.permission == 'granted'; }, + isPermissionDefault: function() { + if (!this.supportsDesktopNotifications()) return false; + return global.Notification.permission == 'default'; + }, + + showToolbar: function() { + // Check localStorage for any such meta data + if (global.localStorage) { + if (global.localStorage.getItem('notifications_hidden') === 'true') + return false; + } + + // Check if permission is granted by any chance. + if (this.havePermission()) return false; + + // means the permission is blocked + if (!this.isPermissionDefault()) return false; + return true; + }, + setEnabled: function(enable, callback) { // make sure that we persist the current setting audio_enabled setting // before changing anything @@ -133,29 +153,35 @@ var Notifier = { } if(enable) { - if (!this.havePermission()) { - global.Notification.requestPermission(function() { - if (callback) { - callback(); + // Case when we do not have the permission as 'granted' + if (this.isPermissionDefault()) { + // Attempt to get permission from user + var _this = this; + global.Notification.requestPermission().then(function(result) { + if (result === 'denied') { dis.dispatch({ action: "notifier_enabled", - value: true + value: false }); + _this.setToolbarHidden(true); + return; } + if (result === 'default') { + // The permission request was dismissed + return; + } + + if (callback) callback(); + dis.dispatch({ + action: "notifier_enabled", + value: true + }); + + if (!global.localStorage) return; + global.localStorage.setItem('notifications_enabled', 'true'); }); } - - if (!global.localStorage) return; - global.localStorage.setItem('notifications_enabled', 'true'); - - if (this.havePermission) { - dis.dispatch({ - action: "notifier_enabled", - value: true - }); - } - } - else { + } else { if (!global.localStorage) return; global.localStorage.setItem('notifications_enabled', 'false'); dis.dispatch({ @@ -163,8 +189,6 @@ var Notifier = { value: false }); } - - this.setToolbarHidden(false); }, isEnabled: function() { @@ -192,12 +216,22 @@ var Notifier = { return enabled === 'true'; }, - setToolbarHidden: function(hidden) { + setToolbarHidden: function(hidden, persistent) { this.toolbarHidden = hidden; dis.dispatch({ action: "notifier_enabled", value: this.isEnabled() }); + + if (persistent === true) + this.setToolbarPersistantHidden(); + }, + + setToolbarPersistantHidden: function() { + // update the info to localStorage + if (global.localStorage) { + global.localStorage.setItem('notifications_hidden', 'true'); + } }, isToolbarHidden: function() { From 1875377684bce036c911df5a10d18d1bff1aab16 Mon Sep 17 00:00:00 2001 From: Minhaz A V Date: Tue, 22 Mar 2016 17:51:17 +0530 Subject: [PATCH 2/9] Some style fixes Signed-off-by: Minhaz A V --- src/Notifier.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Notifier.js b/src/Notifier.js index c4dd99f96f..7157dd9c44 100644 --- a/src/Notifier.js +++ b/src/Notifier.js @@ -156,14 +156,14 @@ var Notifier = { // Case when we do not have the permission as 'granted' if (this.isPermissionDefault()) { // Attempt to get permission from user - var _this = this; + var self = this; global.Notification.requestPermission().then(function(result) { if (result === 'denied') { dis.dispatch({ action: "notifier_enabled", value: false }); - _this.setToolbarHidden(true); + self.setToolbarHidden(true); return; } if (result === 'default') { @@ -223,8 +223,9 @@ var Notifier = { value: this.isEnabled() }); - if (persistent === true) + if (persistent) { this.setToolbarPersistantHidden(); + } }, setToolbarPersistantHidden: function() { From 818299da11f0d99c381937bb5dc92dae9adae28f Mon Sep 17 00:00:00 2001 From: Minhaz A V Date: Wed, 23 Mar 2016 13:50:24 +0530 Subject: [PATCH 3/9] persistent = true, as default param in setToolbarHidden() method Signed-off-by: Minhaz A V --- src/Notifier.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Notifier.js b/src/Notifier.js index 7157dd9c44..e750ee33bf 100644 --- a/src/Notifier.js +++ b/src/Notifier.js @@ -163,7 +163,7 @@ var Notifier = { action: "notifier_enabled", value: false }); - self.setToolbarHidden(true); + self.setToolbarHidden(true, false); return; } if (result === 'default') { @@ -216,7 +216,7 @@ var Notifier = { return enabled === 'true'; }, - setToolbarHidden: function(hidden, persistent) { + setToolbarHidden: function(hidden, persistent = true) { this.toolbarHidden = hidden; dis.dispatch({ action: "notifier_enabled", From cbcf23f30a7328563d40936ff5b93c76d3bad96f Mon Sep 17 00:00:00 2001 From: Minhaz A V Date: Wed, 23 Mar 2016 15:11:09 +0530 Subject: [PATCH 4/9] funciton name changed to Signed-off-by: Minhaz A V --- src/Notifier.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Notifier.js b/src/Notifier.js index e750ee33bf..9c78c1e3c0 100644 --- a/src/Notifier.js +++ b/src/Notifier.js @@ -128,7 +128,9 @@ var Notifier = { return global.Notification.permission == 'default'; }, - showToolbar: function() { + // Function to be used by clients to check weather or not to + // show the toolbar. + shouldShowToolbar: function() { // Check localStorage for any such meta data if (global.localStorage) { if (global.localStorage.getItem('notifications_hidden') === 'true') From 349b472056d55cc8df66da1cff5bef89616468dc Mon Sep 17 00:00:00 2001 From: Minhaz A V Date: Wed, 23 Mar 2016 15:17:07 +0530 Subject: [PATCH 5/9] logic to show/hide toolbar shifted to MatrixChat::render Signed-off-by: Minhaz A V --- src/components/structures/MatrixChat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index c16b80ec62..eb75df88ba 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1046,7 +1046,7 @@ module.exports = React.createClass({ if (MatrixClientPeg.get().isGuest()) { topBar = ; } - else if (Notifier.supportsDesktopNotifications() && !Notifier.isEnabled() && !Notifier.isToolbarHidden()) { + else if (Notifier.supportsDesktopNotifications() && Notifier.shouldShowToolbar()) { topBar = ; } else if (this.state.hasNewVersion) { From 9b5519e8666c2cda432633f897c76897a4d0c2ee Mon Sep 17 00:00:00 2001 From: Minhaz A V Date: Wed, 23 Mar 2016 15:45:54 +0530 Subject: [PATCH 6/9] promise -> callback & setToolbarPersistantHidden moved inline Signed-off-by: Minhaz A V --- src/Notifier.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/Notifier.js b/src/Notifier.js index 9c78c1e3c0..53d8be6cd6 100644 --- a/src/Notifier.js +++ b/src/Notifier.js @@ -159,7 +159,7 @@ var Notifier = { if (this.isPermissionDefault()) { // Attempt to get permission from user var self = this; - global.Notification.requestPermission().then(function(result) { + global.Notification.requestPermission(function(result) { if (result === 'denied') { dis.dispatch({ action: "notifier_enabled", @@ -225,14 +225,8 @@ var Notifier = { value: this.isEnabled() }); - if (persistent) { - this.setToolbarPersistantHidden(); - } - }, - - setToolbarPersistantHidden: function() { - // update the info to localStorage - if (global.localStorage) { + // update the info to localStorage for persistent settings + if (persistent && global.localStorage) { global.localStorage.setItem('notifications_hidden', 'true'); } }, From 8191eaa40b0e3121ef78f3a4da3a1dcacd159b5d Mon Sep 17 00:00:00 2001 From: Minhaz A V Date: Wed, 23 Mar 2016 17:26:41 +0530 Subject: [PATCH 7/9] unwanted functions removed, prev functions modified --- src/Notifier.js | 68 ++++++++----------------- src/components/structures/MatrixChat.js | 2 +- 2 files changed, 22 insertions(+), 48 deletions(-) diff --git a/src/Notifier.js b/src/Notifier.js index 53d8be6cd6..c99b0dde5e 100644 --- a/src/Notifier.js +++ b/src/Notifier.js @@ -123,28 +123,6 @@ var Notifier = { return global.Notification.permission == 'granted'; }, - isPermissionDefault: function() { - if (!this.supportsDesktopNotifications()) return false; - return global.Notification.permission == 'default'; - }, - - // Function to be used by clients to check weather or not to - // show the toolbar. - shouldShowToolbar: function() { - // Check localStorage for any such meta data - if (global.localStorage) { - if (global.localStorage.getItem('notifications_hidden') === 'true') - return false; - } - - // Check if permission is granted by any chance. - if (this.havePermission()) return false; - - // means the permission is blocked - if (!this.isPermissionDefault()) return false; - return true; - }, - setEnabled: function(enable, callback) { // make sure that we persist the current setting audio_enabled setting // before changing anything @@ -156,33 +134,22 @@ var Notifier = { if(enable) { // Case when we do not have the permission as 'granted' - if (this.isPermissionDefault()) { - // Attempt to get permission from user - var self = this; - global.Notification.requestPermission(function(result) { - if (result === 'denied') { - dis.dispatch({ - action: "notifier_enabled", - value: false - }); - self.setToolbarHidden(true, false); - return; - } - if (result === 'default') { - // The permission request was dismissed - return; - } + // Attempt to get permission from user + global.Notification.requestPermission(function(result) { + if (result !== 'granted') { + // The permission request was dismissed or denied + return; + } - if (callback) callback(); - dis.dispatch({ - action: "notifier_enabled", - value: true - }); - - if (!global.localStorage) return; - global.localStorage.setItem('notifications_enabled', 'true'); + if (callback) callback(); + dis.dispatch({ + action: "notifier_enabled", + value: true }); - } + + if (!global.localStorage) return; + global.localStorage.setItem('notifications_enabled', 'true'); + }); } else { if (!global.localStorage) return; global.localStorage.setItem('notifications_enabled', 'false'); @@ -232,6 +199,13 @@ var Notifier = { }, isToolbarHidden: function() { + // Check localStorage for any such meta data + if (global.localStorage) { + if (global.localStorage.getItem('notifications_hidden') === 'true') { + return true; + } + } + return this.toolbarHidden; }, diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index eb75df88ba..c16b80ec62 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1046,7 +1046,7 @@ module.exports = React.createClass({ if (MatrixClientPeg.get().isGuest()) { topBar = ; } - else if (Notifier.supportsDesktopNotifications() && Notifier.shouldShowToolbar()) { + else if (Notifier.supportsDesktopNotifications() && !Notifier.isEnabled() && !Notifier.isToolbarHidden()) { topBar = ; } else if (this.state.hasNewVersion) { From 8605ca134e60581e18daf4773e0a2aa90944874b Mon Sep 17 00:00:00 2001 From: Minhaz A V Date: Wed, 23 Mar 2016 22:10:33 +0530 Subject: [PATCH 8/9] comment removed and localStorage update moved up Signed-off-by: Minhaz A V --- src/Notifier.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Notifier.js b/src/Notifier.js index c99b0dde5e..f539fc8bd5 100644 --- a/src/Notifier.js +++ b/src/Notifier.js @@ -132,8 +132,7 @@ var Notifier = { } } - if(enable) { - // Case when we do not have the permission as 'granted' + if (enable) { // Attempt to get permission from user global.Notification.requestPermission(function(result) { if (result !== 'granted') { @@ -141,14 +140,15 @@ var Notifier = { return; } + if (global.localStorage) { + global.localStorage.setItem('notifications_enabled', 'true'); + } + if (callback) callback(); dis.dispatch({ action: "notifier_enabled", value: true }); - - if (!global.localStorage) return; - global.localStorage.setItem('notifications_enabled', 'true'); }); } else { if (!global.localStorage) return; From 6fc0aaef60724748c318bdc6c6bc60a383c2bc14 Mon Sep 17 00:00:00 2001 From: Minhaz A V Date: Thu, 24 Mar 2016 05:46:52 +0530 Subject: [PATCH 9/9] setToolbarHidden(false) if setEnabled has enable = true Signed-off-by: Minhaz A V --- src/Notifier.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Notifier.js b/src/Notifier.js index f539fc8bd5..827d173915 100644 --- a/src/Notifier.js +++ b/src/Notifier.js @@ -150,6 +150,7 @@ var Notifier = { value: true }); }); + this.setToolbarHidden(false); } else { if (!global.localStorage) return; global.localStorage.setItem('notifications_enabled', 'false'); @@ -194,7 +195,7 @@ var Notifier = { // update the info to localStorage for persistent settings if (persistent && global.localStorage) { - global.localStorage.setItem('notifications_hidden', 'true'); + global.localStorage.setItem('notifications_hidden', hidden); } },