Merge 'origin/trunk' into ensure-network-monitor-update-handler-is-ca…

…lled-on-start

Sources/Model/ObjC/Common/Core Data/TracksContextManager.m

@@ -47,21 +47,17 @@ - (NSPersistentStoreCoordinator *)persistentStoreCoordinator {
     NSURL *storeURL = [self storeURL];
     NSError *error = nil;
     if (![_persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeURL options:nil error:&error]) {
-
+        
         // Delete the store and try again
         [[NSFileManager defaultManager] removeItemAtPath:storeURL.path error:nil];
         if (![_persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeURL options:nil error:&error]) {
             // Replace this with code to handle the error appropriately.
             // abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
             TracksLogError(@"Unresolved error %@, %@", error, [error userInfo]);
-
-            if (self.shouldThrowUponFatalCondition) {
-                @throw [NSException exceptionWithName:TracksPersistentStoreException
-                                               reason:[NSString stringWithFormat:@"Error initializing Tracks: %@", error]
-                                             userInfo:error.userInfo];
-            } else {
-                abort();
-            }
+
+            @throw [NSException exceptionWithName:TracksPersistentStoreException
+                                           reason:[NSString stringWithFormat:@"Error initializing Tracks: %@", error]
+                                         userInfo:error.userInfo];
         }
     }
 
@@ -88,30 +84,21 @@ - (NSURL *)applicationSupportURLForAppWithBundleIdentifier:(NSString *)bundleIde
                              withIntermediateDirectories:true
                                               attributes:nil
                                                    error:&error];
-
+    
     // It seems safe not to handle this error because Application Support should always be
     // available and one should always be able to create a folder in it
     if (error != nil) {
         TracksLogError(@"Failed to create folder for %@ in Application Support: %@, %@", bundleIdentifier, error, [error userInfo]);
-
-        if (self.shouldThrowUponFatalCondition) {
-            @throw [NSException exceptionWithName:TracksApplicationSupportException
-                                           reason:[NSString stringWithFormat:@"Error creating the ApplicationSupport Folder: %@", error]
-                                         userInfo:error.userInfo];
-        } else {
-            abort();
-        }
+
+        @throw [NSException exceptionWithName:TracksApplicationSupportException
+                                       reason:[NSString stringWithFormat:@"Error creating the ApplicationSupport Folder: %@", error]
+                                     userInfo:error.userInfo];
+
     }
-
+    
     return folder;
 }
 
-- (BOOL)shouldThrowUponFatalCondition {
-    // We consider it safe to Throw (whenever a Fatal Condition arises) whenever there is no global
-    // NSException handler set
-    return NSGetUncaughtExceptionHandler() == nil;
-}
-
 // Application Support contains "the files that your app creates and manages on behalf of the user
 // and can include files that contain user data".
 //