Update StropheCappuccino and use new TNStropheClient

* Also fix a couple'a minor bugs
benlangfeld · Jan 16, 2011 · aef488f · aef488f
1 parent d9dc3b6
commit aef488f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 63 deletions.
diff --git a/Controllers/AccountsController.j b/Controllers/AccountsController.j
@@ -156,6 +156,11 @@ RosterViewDragType = @"RosterViewDragType";
            selector:@selector(reload)
                name:TNStropheRosterRemovedGroupNotification
              object:nil];
+    [[CPNotificationCenter defaultCenter]
+        addObserver:self
+           selector:@selector(reload)
+               name:TNStropheRosterPushNotification
+             object:nil];
 }
 
 - (void)setupStoredAccounts

diff --git a/Controllers/ManageAccountsController.j b/Controllers/ManageAccountsController.j
@@ -69,7 +69,7 @@ var SharedController = nil;
         [[CPNotificationCenter defaultCenter]
             addObserver:self
                selector:@selector(accountsWereUpdated:)
-                   name:AccountConnectionStatusDidChangeNotification
+                   name:TNStropheConnectionStatusDidChangeNotification
                  object:nil];
     }
     return self;

diff --git a/Libraries/StropheCappuccino b/Libraries/StropheCappuccino
diff --git a/Models/Account.j b/Models/Account.j
@@ -29,15 +29,13 @@ ConnectionStatusConnected       = @"Connected";
 ConnectionStatusConnecting      = @"Connecting";
 ConnectionStatusDisconnected    = @"Disconnected";
 
-AccountWasCreatedNotification                   = @"AccountWasCreatedNotification";
-AccountWasAddedNotification                     = @"AccountWasAddedNotification";
-AccountWasEditedNotification                    = @"AccountWasEditedNotification";
-AccountWasDeletedNotification                   = @"AccountWasDeletedNotification";
-AccountConnectionStatusDidChangeNotification    = @"AccountConnectionStatusDidChangeNotification";
+AccountWasCreatedNotification   = @"AccountWasCreatedNotification";
+AccountWasAddedNotification     = @"AccountWasAddedNotification";
+AccountWasEditedNotification    = @"AccountWasEditedNotification";
+AccountWasDeletedNotification   = @"AccountWasDeletedNotification";
 
-@implementation Account : TNStropheConnection
+@implementation Account : TNStropheClient
 {
-    TNStropheRoster         roster                  @accessors;
     BOOL                    enabled                 @accessors(property=isEnabled);
 
     CPWindowController      setStatusController;
@@ -55,10 +53,12 @@ AccountConnectionStatusDidChangeNotification    = @"AccountConnectionStatusDidCh
     if (self = [super initWithService:BOSHService JID:aJID password:aPassword])
     {
         enabled = isEnabled;
-        roster  = [TNStropheRoster rosterWithConnection:self];
-        [self setDelegate:self];
-        [roster setDelegate:self];
         [[CPNotificationCenter defaultCenter] postNotificationName:AccountWasCreatedNotification object:self];
+        [[CPNotificationCenter defaultCenter]
+            addObserver:self
+               selector:@selector(whenStropheConnected:)
+                   name:TNStropheConnectionStatusConnected
+                 object:[self connection]];
     }
     return self;
 }
@@ -68,65 +68,17 @@ AccountConnectionStatusDidChangeNotification    = @"AccountConnectionStatusDidCh
     return [[self JID] full];
 }
 
-- (BOOL)onStropheConnecting:(id)aConnection
+- (void)whenStropheConnected:(id)aConnection
 {
-    CPLog.debug("XMPP: Connecting");
-    [[CPNotificationCenter defaultCenter] postNotificationName:AccountConnectionStatusDidChangeNotification object:self];
-}
-
-- (BOOL)onStropheAuthenticating:(id)aConnection
-{
-    CPLog.debug("XMPP: Authenticating");
-    [[CPNotificationCenter defaultCenter] postNotificationName:AccountConnectionStatusDidChangeNotification object:self];
-}
-
-- (BOOL)onStropheAuthFail:(id)aConnection
-{
-    CPLog.warn("XMPP: Authentication Failed");
-    [[CPNotificationCenter defaultCenter] postNotificationName:AccountConnectionStatusDidChangeNotification object:self];
-}
-
-- (BOOL)onStropheConnected:(id)aConnection
-{
-    CPLog.info("XMPP: Connected");
     [[CPNotificationCenter defaultCenter]
         removeObserver:self
                   name:TNStropheConnectionStatusDisconnected
                 object:nil];
-    [roster getRoster];
-    [[CPNotificationCenter defaultCenter] postNotificationName:AccountConnectionStatusDidChangeNotification object:self];
-}
-
-- (BOOL)onStropheConnectFail:(id)aConnection
-{
-    CPLog.warn("XMPP: Connection Failed");
-    [roster clear];
-    [[CPNotificationCenter defaultCenter] postNotificationName:AccountConnectionStatusDidChangeNotification object:self];
-}
-
-- (BOOL)onStropheDisconnecting:(id)aConnection
-{
-    CPLog.debug("XMPP: Disconnecting");
-    [[CPNotificationCenter defaultCenter] postNotificationName:AccountConnectionStatusDidChangeNotification object:self];
-}
-
-- (BOOL)onStropheDisconnected:(id)aConnection
-{
-    CPLog.debug("XMPP: Disconnected");
-    [roster clear];
-    [[CPNotificationCenter defaultCenter] postNotificationName:AccountConnectionStatusDidChangeNotification object:self];
-}
-
-- (BOOL)onStropheError:(id)aConnection
-{
-    CPLog.error("XMPP: Error");
-    [roster clear];
-    [[CPNotificationCenter defaultCenter] postNotificationName:AccountConnectionStatusDidChangeNotification object:self];
 }
 
 - (CPString)connectionStatus
 {
-    if ([self isConnected])
+    if ([[self connection] isConnected])
         return ConnectionStatusConnected;
 
     return ConnectionStatusDisconnected;