From 0d38eaabdd65654fbec32fb95247fc985fa50d47 Mon Sep 17 00:00:00 2001
From: Alexandru Rosianu <me@aluxian.com>
Date: Wed, 8 Mar 2017 12:38:03 +0000
Subject: [PATCH 1/3] Stop reporting crashes to piwik

---
 src/scripts/common/utils/logger.js | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/scripts/common/utils/logger.js b/src/scripts/common/utils/logger.js
index 72ab7cfb..bb9baab5 100644
--- a/src/scripts/common/utils/logger.js
+++ b/src/scripts/common/utils/logger.js
@@ -1,10 +1,6 @@
 import util from 'util';
 import path from 'path';
 
-import eventCategories from 'common/analytics/categories';
-import eventActions from 'common/analytics/actions';
-import eventNames from 'common/analytics/names';
-
 function namespaceOfFile (filename) {
   const app = require('common/electron/app').default;
   const appPath = path.join(app.getAppPath(), 'scripts') + path.sep;
@@ -24,18 +20,6 @@ function namespaceOfFile (filename) {
   return global.manifest.name + ':' + name;
 }
 
-function reportToPiwik (namespace, isFatal, err) {
-  const piwik = require('common/services/piwik').default.getTracker();
-  if (piwik) {
-    piwik.trackEvent(
-      eventCategories['Logs'],
-      eventActions['Exception'],
-      isFatal ? eventNames['Fatal Error'] : eventNames['Error'],
-      `${namespace}: ${err.name}: ${err.message}`
-    );
-  }
-}
-
 function reportToSentry (namespace, isFatal, err) {
   const sentry = require('common/services/sentry').default;
   if (sentry) {
@@ -93,7 +77,6 @@ export function errorLogger (filename, isFatal) {
     browserLogger.printError(namespace, isFatal, err.stack);
 
     if (!skipReporting && !global.options.debug) {
-      reportToPiwik(namespace, isFatal, err);
       reportToSentry(namespace, isFatal, err);
     }
   };

From ec55723c85d47b3433a14c7c7dedf3804bb2e0a2 Mon Sep 17 00:00:00 2001
From: Alexandru Rosianu <me@aluxian.com>
Date: Sat, 11 Mar 2017 17:17:18 +0000
Subject: [PATCH 2/3] Fix TypeError: Cannot set property 'unreadCount' of
 undefined

---
 src/scripts/browser/managers/main-window-manager.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/scripts/browser/managers/main-window-manager.js b/src/scripts/browser/managers/main-window-manager.js
index 7c4d758f..926bdd7c 100755
--- a/src/scripts/browser/managers/main-window-manager.js
+++ b/src/scripts/browser/managers/main-window-manager.js
@@ -311,7 +311,9 @@ class MainWindowManager extends EventEmitter {
    * Update the notifications count everywhere.
    */
   notifCountChanged (count, badgeDataUrl) {
-    this.notifManager.unreadCount = count;
+    if (this.notifManager) {
+      this.notifManager.unreadCount = count;
+    }
 
     // Set icon badge
     if (prefs.get('show-notifications-badge')) {
@@ -328,7 +330,9 @@ class MainWindowManager extends EventEmitter {
     }
 
     // Update tray
-    this.trayManager.unreadCountUpdated(count);
+    if (this.trayManager) {
+      this.trayManager.unreadCountUpdated(count);
+    }
 
     // Update window title
     this.prefixWindowTitle(count ? '(' + count + ') ' : '');

From 5df6240599d619631fcdd6c8b0ab157eb9d90c9e Mon Sep 17 00:00:00 2001
From: Alexandru Rosianu <me@aluxian.com>
Date: Sun, 12 Mar 2017 13:41:19 +0000
Subject: [PATCH 3/3] Update changelog & bump to v2.0.6

---
 CHANGELOG.json   | 10 ++++++++++
 CHANGELOG.md     |  8 ++++++++
 src/package.json |  4 ++--
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.json b/CHANGELOG.json
index ad0f12bf..1e9cfe82 100644
--- a/CHANGELOG.json
+++ b/CHANGELOG.json
@@ -1,4 +1,14 @@
 [{
+  "version": "2.0.6",
+  "channel": "stable",
+  "releasedAt": 1489325983503,
+  "urgency": "low",
+  "changes": {
+    "General": [
+      "Fixed an internal error related to notifications count."
+    ]
+  }
+}, {
   "version": "2.0.5",
   "channel": "beta",
   "releasedAt": 1487851951578,
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb02178e..40bfa307 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [2.0.6](https://github.com/Aluxian/Messenger-for-Desktop/tree/v2.0.6) (2017-12-03)
+
+[Full Changelog](https://github.com/Aluxian/Messenger-for-Desktop/compare/v2.0.5...v2.0.6) &bull; [Download](https://github.com/Aluxian/Messenger-for-Desktop/releases/tag/v2.0.6)
+
+**General**
+
+- Fixed an internal error related to notifications count.
+
 ## [2.0.5-beta](https://github.com/Aluxian/Messenger-for-Desktop/tree/v2.0.5) (2017-23-02)
 
 [Full Changelog](https://github.com/Aluxian/Messenger-for-Desktop/compare/v2.0.4...v2.0.5) &bull; [Download](https://github.com/Aluxian/Messenger-for-Desktop/releases/tag/v2.0.5)
diff --git a/src/package.json b/src/package.json
index 1a383ee9..1a38dcc7 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,8 +1,8 @@
 {
   "name": "messengerfordesktop",
   "productName": "Messenger for Desktop",
-  "version": "2.0.5",
-  "versionChannel": "beta",
+  "version": "2.0.6",
+  "versionChannel": "stable",
   "description": "A simple & beautiful desktop client for Facebook Messenger.",
   "wvUrl": "https://www.messenger.com/login",
   "wvUrlWork": "https://work.facebook.com/chat",