1 files changed, 26 insertions, 14 deletions

diff --git a/app/src/main/assets/js/notif_msg.js b/app/src/main/assets/js/notif_msg.js
index 83405f39..134ad4f0 100644
--- a/app/src/main/assets/js/notif_msg.js
+++ b/app/src/main/assets/js/notif_msg.js
@@ -1,25 +1,37 @@
-//binds callbacks to an invisible webview to take in the search events
-if (!window.hasOwnProperty('frost_notif_msg')) {
-  console.log('Registering frost_notif_msg');
-  window.frost_notif_msg = true;
-  var finished = false;
-  var x = new MutationObserver(function(mutations) {
-    var _f_thread = document.querySelector('#threadlist_rows');
-    if (!_f_thread) return;
-    console.log('Found message threads', _f_thread.outerHTML);
-    if (typeof Frost !== 'undefined') Frost.handleHtml(_f_thread.outerHTML);
+"use strict";
+
+(function () {
+  // binds callbacks to an invisible webview to take in the search events
+  var finished, x;
+
+  finished = false;
+
+  x = new MutationObserver(function (mutations) {
+    var _f_thread;
+    _f_thread = document.querySelector("#threadlist_rows");
+    if (!_f_thread) {
+      return;
+    }
+    console.log("Found message threads " + _f_thread.outerHTML);
+    if (typeof Frost !== "undefined" && Frost !== null) {
+      Frost.handleHtml(_f_thread.outerHTML);
+    }
     finished = true;
     x.disconnect();
   });
+
   x.observe(document, {
     childList: true,
     subtree: true
   });
-  setTimeout(function() {
+
+  setTimeout(function () {
     if (!finished) {
       finished = true;
-      console.log('Message thread timeout cancellation')
-      if (typeof Frost !== 'undefined') Frost.handleHtml("");
+      console.log("Message thread timeout cancellation");
+      if (typeof Frost !== "undefined" && Frost !== null) {
+        Frost.handleHtml("");
+      }
     }
   }, 20000);
-}
+}).call(undefined);
\ No newline at end of file