Cleanup.

Author: Mike Amaral

Source/App Delegate/AppDelegate.m

@@ -17,9 +17,7 @@
 
 static NSString * const kAnalyticsTrackingID = @"UA-63011163-1";
 
-@interface AppDelegate () {
-    DataManager *_dataManager;
-}
+@interface AppDelegate ()
 
 @end
 
@@ -32,15 +30,14 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     self.window.backgroundColor = [UIColor whiteColor];
 
-    _dataManager = [DataManager sharedInstance];
+    [UIApplication sharedApplication].applicationIconBadgeNumber = 0;
 
     [ThemeManager setupTheme];
 
     [Fabric with:@[CrashlyticsKit]];
 
     [self initializeAnalytics];
     [self setupPushNotifications];
-    [self clearAppBadge];
 
     self.window.rootViewController = [[UINavigationController alloc] initWithRootViewController:[ComicListViewController new]];
 
@@ -73,21 +70,19 @@ - (void)application:(UIApplication *)application didRegisterUserNotificationSett
 }
 
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-    NSString *token = [_dataManager tokenStringFromData:deviceToken];
+    NSString *token = [[DataManager sharedInstance] tokenStringFromData:deviceToken];
 
     [[RequestManager sharedInstance] sendDeviceToken:token completionHandler:^(NSError *error) {
         if (error) {
             NSLog(@"Sending token to server failed with error: %@", error);
+            
+            [[GTTracker sharedInstance] sendAnalyticsEventWithCategory:@"Token Request Failed" action:error.localizedDescription];
         }
     }];
 }
 
 - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
-    [_dataManager performBackgroundFetchWithCompletionHandler:completionHandler];
-}
-
-- (void)clearAppBadge {
-    [UIApplication sharedApplication].applicationIconBadgeNumber = 0;
+    [[DataManager sharedInstance] performBackgroundFetchWithCompletionHandler:completionHandler];
 }