Merge pull request #49 from loki-project/bug-fix

Stop polling upon deleting group chat.

Signal/src/AppDelegate.m

@@ -321,6 +321,9 @@ static NSTimeInterval launchStartedAt;
     
     // Loki - Observe messages received notifications
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleNewMessagesReceived:) name:NSNotification.newMessagesReceived object:nil];
+    
+    // Loki - Observe thread deletion notifications
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleThreadDeleted:) name:NSNotification.threadDeleted object:nil];
 
     OWSLogInfo(@"application: didFinishLaunchingWithOptions completed.");
 
@@ -1579,26 +1582,57 @@ static NSTimeInterval launchStartedAt;
 
 - (void)createGroupChatPollersIfNeeded
 {
-    if (self.lokiPublicChatPoller == nil) { self.lokiPublicChatPoller = [[LKGroupChatPoller alloc] initForGroup:self.lokiPublicChat]; }
+    // Only create the group chat pollers if their threads aren't deleted
+    __block TSGroupThread *thread;
+    [OWSPrimaryStorage.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+        thread = [TSGroupThread threadWithGroupId:[self.lokiPublicChat.id dataUsingEncoding:NSUTF8StringEncoding] transaction:transaction];
+    }];
+    if (thread != nil && self.lokiPublicChatPoller == nil) {
+        self.lokiPublicChatPoller = [[LKGroupChatPoller alloc] initForGroup:self.lokiPublicChat];
+    }
 }
 
 - (void)createRSSFeedPollersIfNeeded
 {
-    if (self.lokiNewsFeedPoller == nil) { self.lokiNewsFeedPoller = [[LKRSSFeedPoller alloc] initForFeed:self.lokiNewsFeed]; }
-    if (self.lokiMessengerUpdatesFeedPoller == nil) { self.lokiMessengerUpdatesFeedPoller = [[LKRSSFeedPoller alloc] initForFeed:self.lokiMessengerUpdatesFeed]; }
+    // Only create the RSS feed pollers if their threads aren't deleted
+    __block TSGroupThread *lokiNewsFeedThread;
+    [OWSPrimaryStorage.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+        lokiNewsFeedThread = [TSGroupThread threadWithGroupId:[self.lokiNewsFeed.id dataUsingEncoding:NSUTF8StringEncoding] transaction:transaction];
+    }];
+    if (lokiNewsFeedThread != nil && self.lokiNewsFeedPoller == nil) {
+        self.lokiNewsFeedPoller = [[LKRSSFeedPoller alloc] initForFeed:self.lokiNewsFeed];
+    }
+    // The user can't delete the Loki Messenger Updates RSS feed
+    if (self.lokiMessengerUpdatesFeedPoller == nil) {
+        self.lokiMessengerUpdatesFeedPoller = [[LKRSSFeedPoller alloc] initForFeed:self.lokiMessengerUpdatesFeed];
+    }
 }
 
 - (void)startGroupChatPollersIfNeeded
 {
     [self createGroupChatPollersIfNeeded];
-    [self.lokiPublicChatPoller startIfNeeded];
+    if (self.lokiPublicChatPoller != nil) { [self.lokiPublicChatPoller startIfNeeded]; }
 }
 
 - (void)startRSSFeedPollersIfNeeded
 {
     [self createRSSFeedPollersIfNeeded];
-    [self.lokiNewsFeedPoller startIfNeeded];
-    [self.lokiMessengerUpdatesFeedPoller startIfNeeded];
+    if (self.lokiNewsFeedPoller != nil) { [self.lokiNewsFeedPoller startIfNeeded]; }
+    if (self.lokiMessengerUpdatesFeedPoller != nil) { [self.lokiMessengerUpdatesFeedPoller startIfNeeded]; }
+}
+
+- (void)handleThreadDeleted:(NSNotification *)notification {
+    NSDictionary *userInfo = notification.userInfo;
+    NSString *threadID = (NSString *)userInfo[@"threadId"];
+    if (threadID == nil) { return; }
+    if ([threadID isEqualToString:[TSGroupThread threadIdFromGroupId:[self.lokiPublicChat.id dataUsingEncoding:NSUTF8StringEncoding]]] && self.lokiPublicChatPoller != nil) {
+        [self.lokiPublicChatPoller stop];
+        self.lokiPublicChatPoller = nil;
+    }
+    if ([threadID isEqualToString:[TSGroupThread threadIdFromGroupId:[self.lokiNewsFeed.id dataUsingEncoding:NSUTF8StringEncoding]]] && self.lokiNewsFeedPoller != nil) {
+        [self.lokiNewsFeedPoller stop];
+        self.lokiNewsFeedPoller = nil;
+    }
 }
 
 @end

Signal/src/ViewControllers/HomeView/HomeViewController.m

@@ -1413,6 +1413,8 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) {
 - (void)deleteThread:(TSThread *)thread
 {
     [self.editingDbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+        /* Loki: Orignal Code
+         =====================
         if ([thread isKindOfClass:[TSGroupThread class]]) {
             TSGroupThread *groupThread = (TSGroupThread *)thread;
             if (groupThread.isLocalUserInGroup) {
@@ -1420,10 +1422,15 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) {
                 return;
             }
         }
+        */
 
+        // Loki: For now hard delete all groups
         [thread removeWithTransaction:transaction];
     }];
-
+    
+    // Loki - Post notification
+    [[NSNotificationCenter defaultCenter] postNotificationName:NSNotification.threadDeleted object:nil userInfo:@{ @"threadId": thread.uniqueId }];
+    
     [self updateViewState];
 }
 

SignalServiceKit/src/Loki/Utilities/Notification+Loki.swift

@@ -4,6 +4,7 @@ public extension Notification.Name {
     public static let newMessagesReceived = Notification.Name("newMessagesReceived")
     public static let threadFriendRequestStatusChanged = Notification.Name("threadFriendRequestStatusChanged")
     public static let messageFriendRequestStatusChanged = Notification.Name("messageFriendRequestStatusChanged")
+    public static let threadDeleted = Notification.Name("threadDeleted")
 }
 
 // MARK: - Obj-C
@@ -13,4 +14,5 @@ public extension Notification.Name {
     @objc public static let newMessagesReceived = Notification.Name.newMessagesReceived.rawValue as NSString
     @objc public static let threadFriendRequestStatusChanged = Notification.Name.threadFriendRequestStatusChanged.rawValue as NSString
     @objc public static let messageFriendRequestStatusChanged = Notification.Name.messageFriendRequestStatusChanged.rawValue as NSString
+    @objc public static let threadDeleted = Notification.Name.threadDeleted.rawValue as NSString
 }