Merge pull request #13 from CrashOps/v0.0.822

v0.0.822

Author: CrashOps

CrashOps.podspec

@@ -16,15 +16,15 @@ Pod::Spec.new do |s|
  #
 
  s.name = "CrashOps"
- s.version = "0.0.821"
+ s.version = "0.0.822"
  s.summary = "CrashOps helps you monitor your app's stability."
 
  # This description is used to generate tags and improve search results.
  # * Think: What does it do? Why did you write it? What is the focus?
  # * Try to keep it short, snappy and to the point.
  # * Write the description between the DESC delimiters below.
  # * Finally, don't worry about the indent, CocoaPods strips it!
- s.description = "CrashOps lets you monitor your app's errors and crashes."
+ s.description = "CrashOps lets you monitor your app's stability and vulnerability, by giving you error and crash reports, with a supporting platform by CrashOps servers."
 
  s.homepage = "https://github.com/CrashOps/iOS-SDK"
  # s.screenshots = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif"

CrashOps/CrashOps.m

@@ -138,7 +138,7 @@ +(void)initialize {
 @end
 
 //! Project version number for CrashOps.
-//double CrashOpsVersionNumber = 0.00821;
+//double CrashOpsVersionNumber = 0.00822;
 
 //! Project version string for CrashOps.
-//const unsigned char CrashOpsVersionString[] = "0.0.821";
+//const unsigned char CrashOpsVersionString[] = "0.0.822";

CrashOps/CrashOpsController.m

@@ -70,12 +70,7 @@ @implementation CrashOpsController
 @synthesize clientId;
 @synthesize userDefaults;
 
-+ (void) initialize {
- g_dateFormatter = [[NSDateFormatter alloc] init];
- [g_dateFormatter setLocale:[NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"]];
-}
-
-NSUncaughtExceptionHandler *oldHandler;
+NSUncaughtExceptionHandler *co_oldHandler;
 
 // Singleton implementation in Objective-C
 __strong static CrashOpsController *_shared;
@@ -187,7 +182,7 @@ - (void) setIsEnabled:(BOOL)isOn {
  if (crashMonitorAPI == nil) {
  crashMonitorAPI = kscm_nsexception_getAPI();
  if (NSGetUncaughtExceptionHandler() != exceptionHandlerPtr) {
- oldHandler = NSGetUncaughtExceptionHandler();
+ co_oldHandler = NSGetUncaughtExceptionHandler();
  NSSetUncaughtExceptionHandler(exceptionHandlerPtr);
  }
 
@@ -198,15 +193,13 @@ - (void) setIsEnabled:(BOOL)isOn {
  [installation install];
  }
 
- /* Perry's additions to help with tests */
  crashMonitorAPI->setEnabled(YES);
- /* Perry's additions to help with tests */
  }
 
  [self uploadLogs];
  } else {
- if (oldHandler != nil) {
- NSSetUncaughtExceptionHandler(oldHandler);
+ if (co_oldHandler != nil) {
+ NSSetUncaughtExceptionHandler(co_oldHandler);
  }
 
  if (crashMonitorAPI != nil) {
@@ -224,13 +217,26 @@ - (void)reportInternalError:(NSString *) sdkError {
  DebugLogArgs(@"%@", sdkError);
 }
 
--(void) onAppLoaded {
+-(void) onAppIsLoading {
  // Wait for app to finish launch and then...
  appFinishedLaunchObserver = [[NSNotificationCenter defaultCenter] addObserverForName: UIApplicationDidFinishLaunchingNotification object: nil queue: nil usingBlock:^(NSNotification * _Nonnull note) {
  [CrashOpsController shared].didAppFinishLaunching = YES;
  [[CrashOpsController shared] onAppLaunched];
  }];
+}
+
+- (void) onAppLaunched {
+ [[NSNotificationCenter defaultCenter] removeObserver: [[CrashOpsController shared] appFinishedLaunchObserver]];
+
+ [self setupFromInfoPlist];
+ //DebugLogArgs(@"App loaded, isJailbroken = %d", CrashOpsController.isJailbroken);
+
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+ [[CrashOpsController shared] uploadLogs];
+ });
+}
 
+-(void) setupFromInfoPlist {
  NSString *infoPlistPath = [[NSBundle mainBundle] pathForResource:@"CrashOpsConfig-info" ofType:@"plist"];
  NSDictionary* infoPlist = [NSDictionary dictionaryWithContentsOfFile: infoPlistPath];
 
@@ -271,16 +277,6 @@ -(void) onAppLoaded {
  [CrashOps shared].clientId = clientId;
 }
 
-- (void) onAppLaunched {
- [[NSNotificationCenter defaultCenter] removeObserver: [[CrashOpsController shared] appFinishedLaunchObserver]];
-
- //DebugLogArgs(@"App loaded, isJailbroken = %d", CrashOpsController.isJailbroken);
-
- dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
- [[CrashOpsController shared] uploadLogs];
- });
-}
-
 - (NSArray *) errorLogFilesList {
  NSString *clientId = CrashOps.shared.clientId;
  if (!(clientId && [clientId length] > 0 && [clientId length] < 100)) {
@@ -645,6 +641,8 @@ - (void) uploadLogs {
  // Retry and see if there are leftovers...
  [[CrashOpsController shared] uploadLogs];
  }
+ } else {
+ [CrashOpsController shared].isUploading = false;
  }
  };
 
@@ -747,8 +745,8 @@ - (void) configureAdvancedSettings {
 }
 
 -(void) handleException:(NSException *) exception {
- if (oldHandler) {
- oldHandler(exception);
+ if (co_oldHandler) {
+ co_oldHandler(exception);
  }
 
  if ([CrashOps shared].isEnabled) {
@@ -918,8 +916,15 @@ +(NSDictionary *) toJsonDictionary:(NSString *) jsonString {
 
 NSUncaughtExceptionHandler *exceptionHandlerPtr = &ourExceptionHandler;
 
++(void) initialize {
+ DebugLog(@"App is loading...");
+ g_dateFormatter = [[NSDateFormatter alloc] init];
+ [g_dateFormatter setLocale:[NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"]];
+}
+
 + (void)load {
- [[CrashOpsController shared] onAppLoaded];
+ [[CrashOpsController shared] onAppIsLoading];
+ DebugLog(@"CrashOps library is being loaded");
 }
 
 + (NSDictionary *) getDeviceInfo {