Double and persistent notifications

 * Move the notification cleaning to a check inside the response parse to avoid any race conditions
 * Remove the extraneous notification of new mail in the state change handler to avoid double notifications
 * Persist the number of unread mails to avoid double notifications between sessions
 * enable the address sanitizer, as it seems like the right thing to do.
 * Update the version to 2.1

Author: Alan Westbrook

Orangered-Swift/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

Orangered-Swift/StatusItemController.swift

@@ -96,7 +96,14 @@ class StatusItemController: NSObject, NSUserNotificationCenterDelegate {
     fileprivate var prefWindowController:NSWindowController?
     fileprivate var mailboxItem:NSMenuItem?
     fileprivate var loginItem:NSMenuItem?
-    fileprivate var mailCount = 0
+    fileprivate var mailCount:Int {
+        get {
+            return prefs.mailCount
+        }
+        set {
+            prefs.mailCount = newValue
+        }
+    }
 
     override init() {
         super.init()
@@ -279,6 +286,10 @@ class StatusItemController: NSObject, NSUserNotificationCenterDelegate {
                 if mailCount > 0 {
                     notifyMail()
                 }
+                else {
+                    // We had mail, and now we don't. Safe to assume it's all been read.
+                    NSUserNotificationCenter.default.removeAllDeliveredNotifications()
+                }
             }
         }
 
@@ -306,10 +317,7 @@ class StatusItemController: NSObject, NSUserNotificationCenterDelegate {
         mailboxItem?.isEnabled = true
         loginItem?.title = prefs.loggedIn ? kLogoutMenuTitle : kLoginMenuTitle
 
-        switch state {
-            case .orangered, .modmail:
-                notifyMail()
-                
+        switch state {                
             case .disconnected:
                 DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 10, execute: { 
                     self.login()
@@ -319,7 +327,7 @@ class StatusItemController: NSObject, NSUserNotificationCenterDelegate {
                 mailboxItem?.isEnabled = false
 
 
-            case .mailfree, .update:
+            case .orangered, .modmail, .mailfree, .update:
                 break
         }
     }
@@ -341,6 +349,7 @@ class StatusItemController: NSObject, NSUserNotificationCenterDelegate {
                                           mailCount) 
         }
 
+        print("notifying")
         NSUserNotificationCenter.default.deliver(note)
     }
 
@@ -349,11 +358,10 @@ class StatusItemController: NSObject, NSUserNotificationCenterDelegate {
             NSWorkspace.shared().open(url)
         }
 
+        // There's no reasonable way to know when reddit has cleared the unread flag, so we just wait a bit and check again.
         DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + kOpenMailboxRecheckDelay) { 
             self.checkReddit()
         }
-        
-        NSUserNotificationCenter.default.removeAllDeliveredNotifications()
     }
 
     private func logout() {

Orangered-Swift/UserDefaults+Orangered.swift

@@ -12,6 +12,7 @@ import Cocoa
 private let kUserNameKey = "username"
 private let kLoggedInKey = "logged in"
 private let kUseAltImagesKey = "use alt images"
+private let kMailCountKey = "unread inbox count"
 private let kServiceName = "Orangered!"
 
 extension UserDefaults {
@@ -53,6 +54,15 @@ extension UserDefaults {
         }
     }
 
+    var mailCount:Int {
+        get {
+            return integer(forKey: kMailCountKey)
+        }
+        set {
+            set(newValue, forKey: kMailCountKey)
+        }
+    }
+    
     // C APIs are *the worst*
     static fileprivate var keychainItem:SecKeychainItem? = nil
 

Orangered.xcodeproj/xcshareddata/xcschemes/Orangered.xcscheme

@@ -49,6 +49,7 @@
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      enableAddressSanitizer = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
@@ -62,16 +63,6 @@
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
-         <AdditionalOption
-            key = "MallocStackLogging"
-            value = ""
-            isEnabled = "YES">
-         </AdditionalOption>
-         <AdditionalOption
-            key = "MallocScribble"
-            value = ""
-            isEnabled = "YES">
-         </AdditionalOption>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction