Merge pull request #2523 from RocketChat/bug/fixed_bug_mapping_subscription

[FIX] View models deallocation & Subscription object mapping fixing on updates

Author: rafaelks

Rocket.Chat/Controllers/Chat/MessagesSubscriptionViewModel.swift

@@ -56,6 +56,10 @@ final class MessagesSubscriptionViewModel {
     // MARK: Life Cycle
 
     deinit {
+        destroy()
+    }
+
+    internal func destroy() {
         subscriptionQueryToken?.invalidate()
 
         if let subscription = subscription {

Rocket.Chat/Controllers/Chat/MessagesViewController.swift

@@ -114,6 +114,9 @@ final class MessagesViewController: RocketChatViewController {
     deinit {
         NotificationCenter.default.removeObserver(self)
         SocketManager.removeConnectionHandler(token: socketHandlerToken)
+
+        viewModel.destroy()
+        viewSubscriptionModel.destroy()
     }
 
     var allowResignFirstResponder = true

Rocket.Chat/Controllers/Chat/MessagesViewModel.swift

@@ -174,11 +174,15 @@ final class MessagesViewModel {
         self.controllerContext = controllerContext
     }
 
-    deinit {
+    internal func destroy() {
         messagesQueryToken?.invalidate()
         unsubscribe()
     }
 
+    deinit {
+        destroy()
+    }
+
     // MARK: Subscriptions Control
 
     /**

Rocket.Chat/Managers/Model/SubscriptionManager/SubscriptionManager.swift

@@ -77,6 +77,7 @@ struct SubscriptionManager {
 
                 let subscription = Subscription.find(rid: rid, realm: realm) ??
                     Subscription.getOrCreate(realm: realm, values: object, updates: nil)
+                subscription.map(object, realm: realm)
 
                 if msg == "removed" {
                     realm.delete(subscription)