From 483d18008e470e194cc3e0d71374146a948111a8 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 26 Oct 2015 14:35:17 +0800
Subject: [PATCH 1/7] better syncUnreadMessages logic

---
 Yep/AppDelegate.swift             | 29 ++++-------------------------
 Yep/Services/YepService.swift     |  8 +++++---
 Yep/Services/YepServiceSync.swift | 24 +++++++++++++++---------
 3 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/Yep/AppDelegate.swift b/Yep/AppDelegate.swift
index a40082bb..e1788e36 100644
--- a/Yep/AppDelegate.swift
+++ b/Yep/AppDelegate.swift
@@ -223,11 +223,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 switch remoteNotificationType {
 
                 case .Message:
-                    if UIApplication.sharedApplication().applicationState == UIApplicationState.Active {
-                        return
-                    }
-                    
-                    syncUnreadMessage()
+                    syncUnreadMessages() {}
 
                 case .OfficialMessage:
                     officialMessages { messagesCount in
@@ -243,11 +239,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                     }
                 }
 
-                completionHandler(UIBackgroundFetchResult.NewData)
                 // 非前台才记录启动通知类型
                 if application.applicationState != .Active {
                     self.remoteNotificationType = remoteNotificationType
                 }
+
+                completionHandler(UIBackgroundFetchResult.NewData)
                 
             } else {
                 completionHandler(UIBackgroundFetchResult.NoData)
@@ -303,7 +300,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         syncFriendshipsAndDoFurtherAction {
             syncGroupsAndDoFurtherAction { [weak self] in
-                self?.syncUnreadMessage()
+                self?.syncUnreadMessages() {}
             }
         }
 
@@ -311,24 +308,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             println("new officialMessages count: \(messagesCount)")
         }
     }
-    
-    func syncUnreadMessage() {
-        let task = delay(0, work: {
-            syncUnreadMessagesAndDoFurtherAction { messageIDs in
-                tryPostNewMessagesReceivedNotificationWithMessageIDs(messageIDs, messageAge: .New)
-            }
-        })
-        
-        delay(5) { [weak self] in
-            if let task = task {
-                if isFetchingUnreadMessages.value {
-                    isFetchingUnreadMessages.value  = false
-                    task(cancel: true)
-                    self?.syncUnreadMessage()
-                }
-            }
-        }
-    }
 
     func startFaye() {
 
diff --git a/Yep/Services/YepService.swift b/Yep/Services/YepService.swift
index 8eb5c202..3e70c27b 100644
--- a/Yep/Services/YepService.swift
+++ b/Yep/Services/YepService.swift
@@ -1535,7 +1535,7 @@ func officialMessages(completion completion: Int -> Void) {
     apiRequest({_ in}, baseURL: baseURL, resource: resource, failure: defaultFailureHandler, completion: completion)
 }
 
-func headUnreadMessages(completion completion: JSONDictionary -> Void) {
+func headUnreadMessages(failureHandler failureHandler: ((Reason, String?) -> Void)?, completion: JSONDictionary -> Void) {
     let requestParameters = [
         "page": 1,
         "per_page": 100,
@@ -1586,9 +1586,9 @@ func sentButUnreadMessages(failureHandler failureHandler: ((Reason, String?) ->
 }
 */
 
-func unreadMessages(completion completion: [JSONDictionary] -> Void) {
+func unreadMessages(failureHandler failureHandler: ((Reason, String?) -> Void)?, completion: [JSONDictionary] -> Void) {
 
-    headUnreadMessages { result in
+    headUnreadMessages(failureHandler: failureHandler) { result in
 
         var messages = [JSONDictionary]()
 
@@ -1615,6 +1615,8 @@ func unreadMessages(completion completion: [JSONDictionary] -> Void) {
                         moreUnreadMessages(inPage: page, withPerPage: perPage, failureHandler: { (reason, errorMessage) in
                             dispatch_group_leave(downloadGroup)
 
+                            failureHandler?(reason, errorMessage)
+
                         }, completion: { result in
                             if let currentPageMessages = result["messages"] as? [JSONDictionary] {
                                 messages += currentPageMessages
diff --git a/Yep/Services/YepServiceSync.swift b/Yep/Services/YepServiceSync.swift
index 5c889067..1e4d6951 100644
--- a/Yep/Services/YepServiceSync.swift
+++ b/Yep/Services/YepServiceSync.swift
@@ -720,19 +720,25 @@ var isFetchingUnreadMessages = Listenable<Bool>(false) { _ in }
 
 func syncUnreadMessagesAndDoFurtherAction(furtherAction: (messageIDs: [String]) -> Void) {
 
-    println("Before fetching")
-    
+    if isFetchingUnreadMessages.value {
+        return
+    }
+
     dispatch_async(dispatch_get_main_queue()) {
         
-        if isFetchingUnreadMessages.value {
-            return
-        }
-        
         isFetchingUnreadMessages.value = true
         
         println("Begin fetching")
         
-        unreadMessages { allUnreadMessages in
+        unreadMessages(failureHandler: { (reason, errorMessage) in
+
+            defaultFailureHandler(reason, errorMessage: errorMessage)
+
+            dispatch_async(dispatch_get_main_queue()) {
+                isFetchingUnreadMessages.value = false
+            }
+
+        }, completion: { allUnreadMessages in
             
             //println("\n allUnreadMessages: \(allUnreadMessages)")
             println("Got unread message: \(allUnreadMessages.count)")
@@ -751,13 +757,13 @@ func syncUnreadMessagesAndDoFurtherAction(furtherAction: (messageIDs: [String])
                     }
                 }
                 
-                
                 dispatch_async(dispatch_get_main_queue()) {
                     isFetchingUnreadMessages.value = false
+
                     furtherAction(messageIDs: messageIDs)
                 }
             }
-        }
+        })
     }
 }
 

From d8538b40db7e33219e885191bd8cea458809934c Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 26 Oct 2015 16:47:20 +0800
Subject: [PATCH 2/7] fix showSkillHome from Feeds

---
 Yep/ViewControllers/Feeds/FeedsViewController.swift | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Yep/ViewControllers/Feeds/FeedsViewController.swift b/Yep/ViewControllers/Feeds/FeedsViewController.swift
index 1137dfc7..f1604cfb 100644
--- a/Yep/ViewControllers/Feeds/FeedsViewController.swift
+++ b/Yep/ViewControllers/Feeds/FeedsViewController.swift
@@ -260,10 +260,8 @@ class FeedsViewController: UIViewController {
 
             let vc = segue.destinationViewController as! SkillHomeViewController
 
-            if let indexPath = sender as? NSIndexPath {
-                if let skill = feeds[indexPath.row].skill {
-                    vc.skill = SkillCell.Skill(ID: skill.id, localName: skill.localName, coverURLString: skill.coverURLString, category: nil)
-                }
+            if let skill = skill {
+                vc.skill = SkillCell.Skill(ID: skill.id, localName: skill.localName, coverURLString: skill.coverURLString, category: nil)
             }
 
             vc.hidesBottomBarWhenPushed = true
@@ -504,7 +502,7 @@ extension FeedsViewController: UITableViewDataSource, UITableViewDelegate {
         switch indexPath.section {
 
         case Section.SkillUsers.rawValue:
-            performSegueWithIdentifier("showSkillHome", sender: indexPath)
+            performSegueWithIdentifier("showSkillHome", sender: nil)
 
         case Section.Feed.rawValue:
             performSegueWithIdentifier("showConversation", sender: indexPath)

From 16be53a8f2ba94055ce4ccddb9ddbbc0f538dfd3 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 26 Oct 2015 17:06:05 +0800
Subject: [PATCH 3/7] removeObserver

---
 Yep/Views/Cells/Conversation/ConversationCell.swift | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Yep/Views/Cells/Conversation/ConversationCell.swift b/Yep/Views/Cells/Conversation/ConversationCell.swift
index 42422599..392ca394 100644
--- a/Yep/Views/Cells/Conversation/ConversationCell.swift
+++ b/Yep/Views/Cells/Conversation/ConversationCell.swift
@@ -34,6 +34,11 @@ class ConversationCell: UITableViewCell {
     @IBOutlet weak var chatLabel: UILabel!
     @IBOutlet weak var timeAgoLabel: UILabel!
 
+    deinit {
+
+        NSNotificationCenter.defaultCenter().removeObserver(self)
+    }
+    
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code

From a9c4d67fc51664801180d10c96aa98a8466488f8 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 26 Oct 2015 17:07:32 +0800
Subject: [PATCH 4/7] default_avatar_60

---
 Yep/Views/Cells/Conversation/ConversationCell.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Yep/Views/Cells/Conversation/ConversationCell.swift b/Yep/Views/Cells/Conversation/ConversationCell.swift
index 392ca394..982b28f6 100644
--- a/Yep/Views/Cells/Conversation/ConversationCell.swift
+++ b/Yep/Views/Cells/Conversation/ConversationCell.swift
@@ -41,7 +41,6 @@ class ConversationCell: UITableViewCell {
     
     override func awakeFromNib() {
         super.awakeFromNib()
-        // Initialization code
 
         avatarImageView.contentMode = .ScaleAspectFill
         avatarImageViewWidthConstraint.constant = YepConfig.ConversationCell.avatarSize
@@ -56,6 +55,7 @@ class ConversationCell: UITableViewCell {
     }
 
     func updateUIButAvatar(sender: NSNotification) {
+
         updateCountOfUnreadMessages()
         updateInfoLabels()
     }
@@ -128,7 +128,7 @@ class ConversationCell: UITableViewCell {
                         avatarImageView.navi_setAvatar(userAvatar)
 
                     } else {
-                        avatarImageView.image = UIImage(named: "default_avatar")
+                        avatarImageView.image = UIImage(named: "default_avatar_60")
                     }
                 }
 

From 9ed7cef872706bed989a172aebf90b20280dca4c Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 26 Oct 2015 17:26:23 +0800
Subject: [PATCH 5/7] update pods (Navi & Kingfisher); update DribbbleShotCell
 & InstagramMediaCell

---
 Podfile.lock                                         | 12 ++++++------
 Yep/Views/Cells/DribbbleShot/DribbbleShotCell.swift  |  2 +-
 .../Cells/InstagramMedia/InstagramMediaCell.swift    |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Podfile.lock b/Podfile.lock
index 4f1ab3ae..8de01668 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - 1PasswordExtension (1.6.3)
-  - Alamofire (3.0.1)
+  - Alamofire (3.1.0)
   - APAddressBook/Core (0.2.1)
   - APAddressBook/Swift (0.2.1):
     - APAddressBook/Core
@@ -13,12 +13,12 @@ PODS:
   - FXBlurView (1.6.4)
   - JPush (1.8.5)
   - KeyboardMan (0.5)
-  - Kingfisher (1.6.1)
+  - Kingfisher (1.7.0)
   - MonkeyKing (0.0.2)
   - MZFayeClient (1.0.1):
     - Base64 (~> 1.0.1)
     - SocketRocket (~> 0.4)
-  - Navi (0.3.6)
+  - Navi (0.3.7)
   - pop (1.0.8)
   - Proposer (0.7)
   - Realm (0.96.1):
@@ -56,7 +56,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   1PasswordExtension: 676a216461ffa9189db66541b5a2465e10ae4743
-  Alamofire: 2457e1b2e6c46bb05c3a598c542b7bfd08893775
+  Alamofire: 415bd7f56197722978759078486689f7ef913dce
   APAddressBook: 90c0fb07579a47e10ef1a2344e23cfd35f388bec
   Base64: 4924bf3ca6fa559a5161ef717291bd450eb7bd1a
   Crashlytics: 41c082440d2e14da444186fff65e79c0b4b35d4c
@@ -65,10 +65,10 @@ SPEC CHECKSUMS:
   FXBlurView: db786c2561cb49a09ae98407f52460096ab8a44f
   JPush: ba06a6f866ce11f11c15149e7fa67488a23eec87
   KeyboardMan: ae716dfb1252ebcd1f68a2b659e91a970110e799
-  Kingfisher: a40cf8134ba1a78f395bdd3ee97d386ff3c3be0d
+  Kingfisher: 906bf9821bd32d06d4aaecc60431857e70ccabaa
   MonkeyKing: 9be24307843a80f4cd3eca66adc12c67aefb83bb
   MZFayeClient: 65e7ef67e61fbe7a7a8b196130541c9f06bcb5d8
-  Navi: 73dd4e6cbe8b5aa107d00d1e500ce421c4ad20bd
+  Navi: 891defbce3c48dcf31d05d3c2cbc8b7fe6c77c30
   pop: bb773ae2c791ca2629de13b347e7a8b450fa6a57
   Proposer: c244e0d031227b6cf140da7a24d30f2d954d2cb2
   Realm: d05e4621f67fb1c36acd4e573ac5b52a407fc2cc
diff --git a/Yep/Views/Cells/DribbbleShot/DribbbleShotCell.swift b/Yep/Views/Cells/DribbbleShot/DribbbleShotCell.swift
index b7597ac4..ab6a7701 100644
--- a/Yep/Views/Cells/DribbbleShot/DribbbleShotCell.swift
+++ b/Yep/Views/Cells/DribbbleShot/DribbbleShotCell.swift
@@ -23,7 +23,7 @@ class DribbbleShotCell: UICollectionViewCell {
     }
 
     func configureWithDribbbleShot(shot: DribbbleWork.Shot) {
-        imageView.kf_setImageWithURL(NSURL(string: shot.images.normal)!, placeholderImage: nil, optionsInfo: [.TargetCache: KingfisherOptions.CacheMemoryOnly], progressBlock: { receivedSize, totalSize in
+        imageView.kf_setImageWithURL(NSURL(string: shot.images.normal)!, placeholderImage: nil, optionsInfo: [], progressBlock: { receivedSize, totalSize in
             if receivedSize < totalSize {
                 self.activityIndicator.startAnimating()
             }
diff --git a/Yep/Views/Cells/InstagramMedia/InstagramMediaCell.swift b/Yep/Views/Cells/InstagramMedia/InstagramMediaCell.swift
index 0a52b607..6a8dec81 100644
--- a/Yep/Views/Cells/InstagramMedia/InstagramMediaCell.swift
+++ b/Yep/Views/Cells/InstagramMedia/InstagramMediaCell.swift
@@ -23,7 +23,8 @@ class InstagramMediaCell: UICollectionViewCell {
     }
 
     func configureWithInstagramMedia(media: InstagramWork.Media) {
-        imageView.kf_setImageWithURL(NSURL(string: media.images.lowResolution)!, placeholderImage: nil, optionsInfo: [.TargetCache: KingfisherOptions.CacheMemoryOnly], progressBlock: { receivedSize, totalSize in
+
+        imageView.kf_setImageWithURL(NSURL(string: media.images.lowResolution)!, placeholderImage: nil, optionsInfo: [], progressBlock: { receivedSize, totalSize in
             if receivedSize < totalSize {
                 self.activityIndicator.startAnimating()
             }

From b2484ac33fc6f605f5e86054b2d23f82cef65619 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 26 Oct 2015 17:42:34 +0800
Subject: [PATCH 6/7] FeedMedia's placeholderImage

---
 Yep/Configs/YepConfig.swift                      |   5 +++++
 .../Contents.json                                |  12 ++++++++++++
 .../feed_media_placeholder_160.pdf               | Bin 0 -> 3902 bytes
 .../Contents.json                                |  12 ++++++++++++
 .../feed_media_placeholder_80.pdf                | Bin 0 -> 3893 bytes
 Yep/Views/Cells/Feed/FeedCell.swift              |   4 ++--
 Yep/Views/Cells/FeedMedia/FeedMediaCell.swift    |   8 ++++++--
 Yep/Views/Feed/FeedView.swift                    |   2 +-
 8 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 Yep/Images.xcassets/feed_media_placeholder_160.imageset/Contents.json
 create mode 100644 Yep/Images.xcassets/feed_media_placeholder_160.imageset/feed_media_placeholder_160.pdf
 create mode 100644 Yep/Images.xcassets/feed_media_placeholder_80.imageset/Contents.json
 create mode 100644 Yep/Images.xcassets/feed_media_placeholder_80.imageset/feed_media_placeholder_80.pdf

diff --git a/Yep/Configs/YepConfig.swift b/Yep/Configs/YepConfig.swift
index a703f428..3cd4cc30 100644
--- a/Yep/Configs/YepConfig.swift
+++ b/Yep/Configs/YepConfig.swift
@@ -177,6 +177,11 @@ class YepConfig {
 //        ]
     }
 
+    struct FeedMedia {
+        static let placeholderImage = UIImage(named: "feed_media_placeholder_80")
+        static let biggerPlaceholderImage = UIImage(named: "feed_media_placeholder_160")
+    }
+
     struct FeedCell {
         static let textAttributes:[String: NSObject] = [
             NSFontAttributeName: UIFont.feedMessageFont(),
diff --git a/Yep/Images.xcassets/feed_media_placeholder_160.imageset/Contents.json b/Yep/Images.xcassets/feed_media_placeholder_160.imageset/Contents.json
new file mode 100644
index 00000000..499feb0e
--- /dev/null
+++ b/Yep/Images.xcassets/feed_media_placeholder_160.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "feed_media_placeholder_160.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Yep/Images.xcassets/feed_media_placeholder_160.imageset/feed_media_placeholder_160.pdf b/Yep/Images.xcassets/feed_media_placeholder_160.imageset/feed_media_placeholder_160.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..9ac73dc38659ee5381f9c1f7affcf03eddaf449c
GIT binary patch
literal 3902
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

literal 0
HcmV?d00001

diff --git a/Yep/Images.xcassets/feed_media_placeholder_80.imageset/Contents.json b/Yep/Images.xcassets/feed_media_placeholder_80.imageset/Contents.json
new file mode 100644
index 00000000..250a67ab
--- /dev/null
+++ b/Yep/Images.xcassets/feed_media_placeholder_80.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "feed_media_placeholder_80.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Yep/Images.xcassets/feed_media_placeholder_80.imageset/feed_media_placeholder_80.pdf b/Yep/Images.xcassets/feed_media_placeholder_80.imageset/feed_media_placeholder_80.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..850cb1048263652db743f7582059961feb2a858d
GIT binary patch
literal 3893
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

literal 0
HcmV?d00001

diff --git a/Yep/Views/Cells/Feed/FeedCell.swift b/Yep/Views/Cells/Feed/FeedCell.swift
index 6412da1c..3c3a91b1 100644
--- a/Yep/Views/Cells/Feed/FeedCell.swift
+++ b/Yep/Views/Cells/Feed/FeedCell.swift
@@ -224,7 +224,7 @@ extension FeedCell: UICollectionViewDataSource, UICollectionViewDelegate {
 
             //println("attachment imageURL: \(imageURL)")
 
-            cell.configureWithImageURL(imageURL)
+            cell.configureWithImageURL(imageURL, bigger: (attachmentURLs.count == 1))
         }
 
         return cell
@@ -234,10 +234,10 @@ extension FeedCell: UICollectionViewDataSource, UICollectionViewDelegate {
 
         if attachmentURLs.count > 1 {
             return CGSize(width: 80, height: 80)
+
         } else {
             return CGSize(width: 160, height: 160)
         }
-
     }
 
     func collectionView(collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAtIndex section: Int) -> UIEdgeInsets {
diff --git a/Yep/Views/Cells/FeedMedia/FeedMediaCell.swift b/Yep/Views/Cells/FeedMedia/FeedMediaCell.swift
index 81ec2f95..b571424d 100644
--- a/Yep/Views/Cells/FeedMedia/FeedMediaCell.swift
+++ b/Yep/Views/Cells/FeedMedia/FeedMediaCell.swift
@@ -27,9 +27,13 @@ class FeedMediaCell: UICollectionViewCell {
         deleteImageView.hidden = false
     }
 
-    func configureWithImageURL(imageURL: NSURL) {
+    func configureWithImageURL(imageURL: NSURL, bigger: Bool) {
 
-        imageView.kf_setImageWithURL(imageURL)
+        if bigger {
+            imageView.kf_setImageWithURL(imageURL, placeholderImage: YepConfig.FeedMedia.biggerPlaceholderImage)
+        } else {
+            imageView.kf_setImageWithURL(imageURL, placeholderImage: YepConfig.FeedMedia.placeholderImage)
+        }
 
         deleteImageView.hidden = true
     }
diff --git a/Yep/Views/Feed/FeedView.swift b/Yep/Views/Feed/FeedView.swift
index ab104a88..7ea12886 100644
--- a/Yep/Views/Feed/FeedView.swift
+++ b/Yep/Views/Feed/FeedView.swift
@@ -250,7 +250,7 @@ extension FeedView: UICollectionViewDataSource, UICollectionViewDelegate {
 
         //println("attachment imageURL: \(imageURL)")
 
-        cell.configureWithImageURL(imageURL)
+        cell.configureWithImageURL(imageURL, bigger: (attachmentURLs.count == 1))
 
         return cell
     }

From bba3479ee9bc0fd683eb429e127eca8f44cf4e5e Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 26 Oct 2015 17:57:57 +0800
Subject: [PATCH 7/7] thanks fixed bug in Navi, now
 reloadConversationsTableView will not flicker for avatars

---
 .../ConversationsViewController.swift              |  2 ++
 .../Cells/Conversation/ConversationCell.swift      | 14 +++++++-------
 .../FeedConversationDockCell.swift                 |  3 +--
 Yep/Views/Feed/FeedMediaView.swift                 |  1 +
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Yep/ViewControllers/Conversations/ConversationsViewController.swift b/Yep/ViewControllers/Conversations/ConversationsViewController.swift
index fd772778..6cab1a15 100644
--- a/Yep/ViewControllers/Conversations/ConversationsViewController.swift
+++ b/Yep/ViewControllers/Conversations/ConversationsViewController.swift
@@ -75,6 +75,8 @@ class ConversationsViewController: UIViewController {
 
         realm = try! Realm()
 
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: "reloadConversationsTableView", name: YepConfig.Notification.newMessages, object: nil)
+
         NSNotificationCenter.defaultCenter().addObserver(self, selector: "reloadConversationsTableView", name: YepConfig.Notification.changedConversation, object: nil)
 
         NSNotificationCenter.defaultCenter().addObserver(self, selector: "reloadConversationsTableView", name: YepConfig.Notification.markAsReaded, object: nil)
diff --git a/Yep/Views/Cells/Conversation/ConversationCell.swift b/Yep/Views/Cells/Conversation/ConversationCell.swift
index 982b28f6..5efc8407 100644
--- a/Yep/Views/Cells/Conversation/ConversationCell.swift
+++ b/Yep/Views/Cells/Conversation/ConversationCell.swift
@@ -36,7 +36,7 @@ class ConversationCell: UITableViewCell {
 
     deinit {
 
-        NSNotificationCenter.defaultCenter().removeObserver(self)
+        //NSNotificationCenter.defaultCenter().removeObserver(self)
     }
     
     override func awakeFromNib() {
@@ -45,7 +45,7 @@ class ConversationCell: UITableViewCell {
         avatarImageView.contentMode = .ScaleAspectFill
         avatarImageViewWidthConstraint.constant = YepConfig.ConversationCell.avatarSize
 
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "updateUIButAvatar:", name: YepConfig.Notification.newMessages, object: nil)
+        //NSNotificationCenter.defaultCenter().addObserver(self, selector: "updateUIButAvatar:", name: YepConfig.Notification.newMessages, object: nil)
     }
 
     override func setSelected(selected: Bool, animated: Bool) {
@@ -54,11 +54,11 @@ class ConversationCell: UITableViewCell {
         // Configure the view for the selected state
     }
 
-    func updateUIButAvatar(sender: NSNotification) {
-
-        updateCountOfUnreadMessages()
-        updateInfoLabels()
-    }
+//    func updateUIButAvatar(sender: NSNotification) {
+//
+//        updateCountOfUnreadMessages()
+//        updateInfoLabels()
+//    }
 
     private func updateCountOfUnreadMessages() {
 
diff --git a/Yep/Views/Cells/FeedConversationDock/FeedConversationDockCell.swift b/Yep/Views/Cells/FeedConversationDock/FeedConversationDockCell.swift
index f5567c0f..4a3a85ad 100644
--- a/Yep/Views/Cells/FeedConversationDock/FeedConversationDockCell.swift
+++ b/Yep/Views/Cells/FeedConversationDock/FeedConversationDockCell.swift
@@ -26,7 +26,6 @@ class FeedConversationDockCell: UITableViewCell {
         super.awakeFromNib()
 
         nameLabel.text = NSLocalizedString("Joined Feeds", comment: "")
-
         accessoryImageView.tintColor = UIColor.yepCellAccessoryImageViewTintColor()
     }
 
@@ -35,5 +34,5 @@ class FeedConversationDockCell: UITableViewCell {
 
         // Configure the view for the selected state
     }
-    
 }
+
diff --git a/Yep/Views/Feed/FeedMediaView.swift b/Yep/Views/Feed/FeedMediaView.swift
index c3680ad2..a063294e 100644
--- a/Yep/Views/Feed/FeedMediaView.swift
+++ b/Yep/Views/Feed/FeedMediaView.swift
@@ -110,6 +110,7 @@ class FeedMediaView: UIView {
             imageView2.image = nil
             imageView3.image = nil
             imageView4.image = nil
+
         default:
             break
         }