Merge pull request #2179 from mattermost/fix-droid

Fixing JS bug with droid

1 files changed, 16 insertions, 12 deletions

diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index bdf68fc03..2b946d81f 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -160,18 +160,22 @@ export function notifyMe(title, body, channel) {
             }
 
             if (permission === 'granted') {
-                var notification = new Notification(title, {body, tag: body, icon: '/static/images/icon50x50.png'});
-                notification.onclick = () => {
-                    window.focus();
-                    if (channel) {
-                        switchChannel(channel);
-                    } else {
-                        window.location.href = TeamStore.getCurrentTeamUrl() + '/channels/town-square';
-                    }
-                };
-                setTimeout(() => {
-                    notification.close();
-                }, 5000);
+                try {
+                    var notification = new Notification(title, {body, tag: body, icon: '/static/images/icon50x50.png'});
+                    notification.onclick = () => {
+                        window.focus();
+                        if (channel) {
+                            switchChannel(channel);
+                        } else {
+                            window.location.href = TeamStore.getCurrentTeamUrl() + '/channels/town-square';
+                        }
+                    };
+                    setTimeout(() => {
+                        notification.close();
+                    }, 5000);
+                } catch (e) {
+                    console.error(e); //eslint-disable-line no-console
+                }
             }
         });
     }