Ticket #1880: autorejoin.diff

Frameworks/Adium

@@ -181 +181 @@
-- (BOOL)sendMessageObject:(AIContentMessage *)inMessageObject;
-- (NSString *)encodedAttributedString:(NSAttributedString *)inAttributedString forListObject:(AIListObject *)inListObject;
-- (NSString *)encodedAttributedStringForSendingContentMessage:(AIContentMessage *)inContentMessage;
+-(BOOL)rejoinChat:(AIChat*)chat;
-
-//Presence Tracking
-- (BOOL)contactListEditable;

Frameworks/Adium

@@ -122 +122 @@
-}
-
-/*!
+ * @brief rejoinChat
+ * 
+ * Rejoin the open group chats after disconnect
+ */
+-(BOOL)rejoinChat:(AIChat*)chat
+{
+        return NO;
+}       
+
+/*!
- * @brief Disconnect
- *
- * Disconnect the account, transitioning it into an offline state.

Frameworks/Adium

@@ -141 +141 @@
-        }
-}
-
+/*@brief: holds information passed upon the creation of the chat:
+ * handle, server, etc.
+ */
-- (NSDictionary *)chatCreationDictionary
-{
-        return [self statusObjectForKey:@"ChatCreationInfo"];

Plugins/Purple

@@ -707 +707 @@
-        return ([self online] && [self secureConnection]);
-}
-
+//the account just connected
-- (void)didConnect {
-        gateways = [[NSMutableArray alloc] init];
-

Plugins/Purple

@@ -177 +177 @@
-                   andAliases:(NSArray *)aliasesArray 
-                  newArrivals:(NSNumber *)newArrivals
-                           toChat:(AIChat *)chat;
-
+
-#pragma mark Privacy
-- (void)privacyPermitListAdded:(NSString *)sourceUID;
-- (void)privacyDenyListAdded:(NSString *)sourceUID;

Plugins/Purple

@@ -582 +582 @@
-    return YES;
-}
-
+/* 
+ * @brief rejoinChat
+ * overrides the method in the superclass AIAccount
+ * this method is called when the account is reconnected.
+ * It will reconnect any open group chats, returning YES on success.
+ */
+-(BOOL)rejoinChat:(AIChat*)chat
+{
+        id identifier = [[chat identifier] retain];
+
+        //we clear the identifier to create a new purple conversation
+        //for this chat
+        [chat setIdentifier:nil];
+        [purpleThread openChat:chat onAccount:self];
+        [chat setIdentifier:identifier];
+        [[chat identifier] release];
+        
+        //created chat succesfully
+        return YES;
+}
+
-- (AIChat *)chatWithContact:(AIListContact *)contact identifier:(id)identifier
-{
-        AIChat *chat = [[adium chatController] chatWithContact:contact];

Plugins/Purple

@@ -520 +520 @@
-                                        }
-                                        */
-
-sa
+as
-                                        //now contains all the information the prpl will need to process our request.
-                                        AILog(@"In the event of an emergency, your GHashTable may be used as a flotation device...");
-                                        serv_join_chat(gc, components);
@@ -642 +642 @@
-// We handle the notify messages within SLPurpleCocoaAdapter so we can use our localized string macro
-- (void *)handleNotifyMessageOfType:(PurpleNotifyType)type withTitle:(const char *)title primary:(const char *)primary secondary:(const char *)secondary;
-{
+
-    NSString *primaryString = [NSString stringWithUTF8String:primary];
-        NSString *secondaryString = secondary ? [NSString stringWithUTF8String:secondary] : nil;
-        

Source/AIListBookmark.m

@@ -212 +212 @@
-        return [NSString stringWithFormat:@"<%@:%x %@ - %@>",NSStringFromClass([self class]), self, [self formattedUID], [self chatCreationDictionary]];
-}
-
+
+
+
-@end

Source/AIChatController.m

@@ -6 +6 @@
-//
-
-#import "AIChatController.h"
-
+
-#import <Adium/AIContentControllerProtocol.h>
-#import <Adium/AIContactControllerProtocol.h>
-#import <Adium/AIInterfaceControllerProtocol.h>
@@ -78 +78 @@
-                                                                           name:AIAppWillTerminateNotification
-                                                                         object:nil];
-
+        //observe connection notices, so we can re-connect group chats after disconnect
+        [[adium notificationCenter] addObserver:self
+                                                                   selector:@selector(accountDidConnect:)
+                                                                       name:ACCOUNT_CONNECTED
+                                                                          object:nil];
+        
-        //Ignore menu item for contacts in group chats
-        menuItem_ignore = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@""
-                                                                                                                                                   target:self
@@ -740 +746 @@
-                }
-        }
-}
+/* @brief Called when an account connected
+ * we want to check for chats to re-create 
+*/
+-(void)accountDidConnect:(NSNotification*)notification{ 
-
+        NSEnumerator *chatEnumerator = [[self openChats] objectEnumerator];
+        AIChat *currentChat;
+        
+        while((currentChat = [chatEnumerator nextObject])) {
+                if([currentChat isGroupChat] && ([[currentChat account] isEqualTo:[notification object]]) && [currentChat isOpen]) {
+        
+                        //since there is no callback from libpurple if the chat failed, the result of rejoining will always be true
+                        AILog(@"rejoined chat <<%@>> on acccount: %@: %@", currentChat, [notification object],[[notification object] rejoinChat:currentChat] ? @"TRUE" : @"FALSE");
+                                        
+                }
+        }
+}
+
+
+
-#pragma mark Ignore
-/*!
- * @brief Toggle ignoring of a contact
@@ -840 +865 @@
-        return [NSString stringWithFormat:AILocalizedString(@"%@ invites you to join the chat \"%@\"", nil), [inAccount formattedUID], room];
-}
-
+
+
-@end

Source/AIAddBookmarkPlugin.m

@@ -55 +55 @@
-                                                                                                          onWindow:[[[adium interfaceController] activeChat] window]
-                                                                                                notifyingTarget:self];
-}
-
+
-- (void)createBookmarkForChat:(AIChat *)chat withName:(NSString *)name inGroup:(AIListGroup *)group
-{
-        AIListBookmark *bookmark = [[adium contactController] bookmarkForChat:chat];