reorganize appdelegate

Author: tyhoff

SimonRemote/ApplicationDelegate.m

@@ -16,7 +16,7 @@ @implementation ApplicationDelegate {
 @synthesize messenger = _messenger;
 @synthesize numberActiveControllers = _numberActiveControllers;
 
-NSString *letters = @"ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+NSString *letters = @"ABCDEFGHIJKLMNPQRSTUVWXYZ";
 
 #pragma mark - Notifications
 
@@ -42,19 +42,6 @@ - (void) receiveWakeNote: (NSNotification*) note
     NSLog(@"receiveWakeNote: %@", [note name]);
 }
 
-- (void) fileNotifications
-{
-    //These notifications are filed on NSWorkspace's notification center, not the default
-    // notification center. You will not receive sleep/wake notifications if you file
-    //with the default notification center.
-    [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver: self
-                                                           selector: @selector(receiveSleepNote:)
-                                                               name: NSWorkspaceWillSleepNotification object: NULL];
-    
-    [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver: self
-                                                           selector: @selector(receiveWakeNote:)
-                                                               name: NSWorkspaceDidWakeNotification object: NULL];
-}
 
 -(void)reachabilityChanged:(NSNotification*)note
 {
@@ -150,51 +137,60 @@ - (void)applicationWillFinishLaunching:(NSNotification *)notification
     [updater checkForUpdatesInBackground];
 }
 
-
-- (void)applicationDidFinishLaunching:(NSNotification *)notification
+- (void)setupNotificationsAndTimers
 {
-    // Install icon into the menu bar
-    self.menubarController = [[MenubarController alloc] init];
-    channel = [self getChannel];
-    _messenger = [[SRMessenger alloc] initWithURL:WS_SERVER_URL andChannel:channel];
+    // Reachability
 
-    
-    // Allocate a reachability object
     reach = [Reachability reachabilityWithHostname:@"www.google.com"];
-    
-    // Tell the reachability that we DON'T want to be reachable on 3G/EDGE/CDMA
     reach.reachableOnWWAN = NO;
-    
-    // Here we set up a NSNotification observer. The Reachability that caused the notification
-    // is passed in the object parameter
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(reachabilityChanged:)
                                                  name:kReachabilityChangedNotification
                                                object:nil];
 
     [reach startNotifier];
-    [self fileNotifications];
+
+    [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver: self
+                                                           selector: @selector(receiveSleepNote:)
+                                                               name: NSWorkspaceWillSleepNotification object: NULL];
+    
+    [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver: self
+                                                           selector: @selector(receiveWakeNote:)
+                                                               name: NSWorkspaceDidWakeNotification object: NULL];
 
-    NSDistributedNotificationCenter *dnc = [NSDistributedNotificationCenter defaultCenter];
+    // Player state changes
 
-    [dnc addObserver:self
-            selector:@selector(pushNewInfo:)
-                name:@"com.apple.iTunes.playerInfo"
-              object:nil];
+    [[NSDistributedNotificationCenter defaultCenter] addObserver:self
+                                                        selector:@selector(pushNewInfo:)
+                                                            name:@"com.apple.iTunes.playerInfo"
+                                                          object:nil];
 
-    [dnc addObserver:self
-            selector:@selector(pushNewInfo:)
-                name:@"com.spotify.client.PlaybackStateChanged"
-              object:nil];
-
+    [[NSDistributedNotificationCenter defaultCenter] addObserver:self
+                                                        selector:@selector(pushNewInfo:)
+                                                            name:@"com.spotify.client.PlaybackStateChanged"
+                                                          object:nil];
 
     // set up reconnect timer
+    
     tickTimer = [NSTimer scheduledTimerWithTimeInterval: 30.0
                                                  target: self
                                                selector:@selector(timerTick:)
                                                userInfo: nil repeats:YES];
 }
 
+
+- (void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+    // Install icon into the menu bar
+    self.menubarController = [[MenubarController alloc] init];
+    channel = [self getChannel];
+    _messenger = [[SRMessenger alloc] initWithURL:WS_SERVER_URL andChannel:channel];
+    
+    
+    
+    [self setupNotificationsAndTimers];
+}
+
 - (void)timerTick:(NSTimer *)timer
 {
     //I'm removing reachable check for local testing