Merge pull request #24 from mamaral/hotfix

Hotfix

Author: mamaral

Source/App Delegate/AppDelegate.m

@@ -17,9 +17,7 @@
 
 static NSString * const kAnalyticsTrackingID = @"UA-63011163-1";
 
-@interface AppDelegate () {
-    DataManager *_dataManager;
-}
+@interface AppDelegate ()
 
 @end
 
@@ -32,35 +30,24 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     self.window.backgroundColor = [UIColor whiteColor];
 
-    _dataManager = [DataManager sharedInstance];
-
-    [ThemeManager setupTheme];
-
-    [Fabric with:@[CrashlyticsKit]];
+    application.applicationIconBadgeNumber = 0;
 
-    [self initializeAnalytics];
+    [self setupThirdPartyLibraries];
     [self setupPushNotifications];
-    [self clearAppBadge];
 
     self.window.rootViewController = [[UINavigationController alloc] initWithRootViewController:[ComicListViewController new]];
-
     [self.window makeKeyAndVisible];
 
     return YES;
 }
 
-- (void)applicationWillEnterForeground:(UIApplication *)application {
-    [[GTTracker sharedInstance] startAnalyticsSession];
 
-    [self clearAppBadge];
-}
-
-- (void)applicationDidEnterBackground:(UIApplication *)application {
-    [[GTTracker sharedInstance] endAnalyticsSession];
-}
+#pragma mark - Third-party library setup
 
-- (void)applicationWillTerminate:(UIApplication *)application {
-    [[GTTracker sharedInstance] endAnalyticsSession];
+- (void)setupThirdPartyLibraries {
+    [ThemeManager setupTheme];
+    [Fabric with:@[CrashlyticsKit]];
+    [[GTTracker sharedInstance] initializeAnalyticsWithTrackingID:kAnalyticsTrackingID logLevel:kGAILogLevelError];
 }
 
 
@@ -75,42 +62,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];
+    [[DataManager sharedInstance] performBackgroundFetchWithCompletionHandler:completionHandler];
 }
 
-- (void)clearAppBadge {
-    [UIApplication sharedApplication].applicationIconBadgeNumber = 0;
-}
-
-
-#pragma mark - Analytics
-
-- (void)initializeAnalytics {
-    // Start up the GTTracker.
-    GTTracker *tracker = [GTTracker sharedInstance];
-    tracker.loggingEnabled = NO;
-    [tracker initializeAnalyticsWithTrackingID:kAnalyticsTrackingID logLevel:kGAILogLevelError];
-}
-
-
-// TODO: Implement / test background fetch
-//
-//#pragma mark - Background fetch
-//
-//- (void)application:(UIApplication *)application performFetchWithCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
-//    // Let the data manger handle the fetch.
-//    [[DataManager sharedInstance] performBackgroundFetchWithCompletionHandler:completionHandler];
-//}
-
-
 @end

Source/Managers/Data Manager/DataManager.m

@@ -165,7 +165,7 @@ - (void)performBackgroundFetchWithCompletionHandler:(void (^)(UIBackgroundFetchR
         else if (newData) {
             completionHandler(UIBackgroundFetchResultNewData);
 
-            [[NSNotificationCenter defaultCenter] postNotificationName:@"NEW_COMICS_AVAILABLE" object:nil];
+            [[NSNotificationCenter defaultCenter] postNotificationName:NewComicsAvailableNotification object:nil];
         }
 
         else {

Source/Misc/Supporting Files/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>7</string>
+	<string>8</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

Source/View Controllers/Comic List/ComicListViewController.m

@@ -81,6 +81,11 @@ - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
 
     [[GTTracker sharedInstance] sendScreenEventWithTitle:@"Comic List"];
+
+    // Clear the app badge here, as we can be reasonably sure at this point anything new
+    // will have been seen, and we won't run into annoying issues related to the app
+    // life-cycle that we've experienced before.
+    [UIApplication sharedApplication].applicationIconBadgeNumber = 0;
 }
 
 - (void)viewWillLayoutSubviews {