Merge pull request #333 from bitstadium/release/4.1.1

Release/4.1.1
bitstadium · Sep 13, 2016 · 273495d · 273495d
2 parents c081375 + 793f0e5
commit 273495d
Show file tree

Hide file tree

Showing 49 changed files with 2,912 additions and 831 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,6 +25,7 @@ before_install:
   - brew install carthage
 
 script:
+  - open -b com.apple.iphonesimulator
   - set -o pipefail
   - COMMAND="env NSUnbufferedIO=YES xcodebuild -project '$PROJECT' -scheme '$SCHEME' -sdk '$SDK' -configuration '$CONFIGURATION'"
 
@@ -51,4 +52,4 @@ after_failure:
   - cat xcodebuild.log
   - cat -n $TMPDIR/com.apple.dt.XCTest-status/Session*.log
   - cat -n ~/Library/Logs/DiagnosticReports/xctest*.crash
-  - sleep 5
+  - sleep 5
diff --git a/Classes/BITAttributedLabel.h b/Classes/BITAttributedLabel.h
diff --git a/Classes/BITAttributedLabel.m b/Classes/BITAttributedLabel.m
diff --git a/Classes/BITAuthenticator.m b/Classes/BITAuthenticator.m
@@ -466,6 +466,11 @@ - (void)authenticationViewController:(UIViewController *)viewController
   NSParameterAssert(email && email.length);
   NSParameterAssert(self.identificationType == BITAuthenticatorIdentificationTypeHockeyAppEmail || (password && password.length));
 
+  // Trim whitespace from email in case the user has added a whitespace at the end of the email address. This shouldn't
+  // happen if devs use our UI but we've had 1-2 support tickets where the email contained whitespace at the end and
+  // verification failed because of that.
+  email = [email stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+
   NSURLRequest *request = [self requestForAuthenticationEmail:email password:password];
 
   [self authenticationViewController:viewController handleAuthenticationWithEmail:email request:request completion:completion];
@@ -787,7 +792,7 @@ - (void)alertOnFailureStoringTokenInKeychain {
     return;
   }
 
-  NSLog(@"[HockeySDK] ERROR: The authentication token could not be stored due to a keychain error. This is most likely a signing or keychain entitlement issue!");
+  BITHockeyLogError(@"[HockeySDK] ERROR: The authentication token could not be stored due to a keychain error. This is most likely a signing or keychain entitlement issue!");
 }
 
 - (void)cleanupInternalStorage {
@@ -933,10 +938,8 @@ - (void)storeInstallationIdentifier:(NSString *)installationIdentifier withType:
   } else {
     BOOL success1 = [self addStringValueToKeychainForThisDeviceOnly:installationIdentifier
                                                              forKey:kBITAuthenticatorIdentifierKey];
-    NSParameterAssert(success1);
     BOOL success2 = [self addStringValueToKeychainForThisDeviceOnly:[self.class stringForIdentificationType:type]
                                                              forKey:kBITAuthenticatorIdentifierTypeKey];
-    NSParameterAssert(success2);
     if (!success1 || !success2) {
       [self alertOnFailureStoringTokenInKeychain];
     }
@@ -955,7 +958,9 @@ - (void)setLastAuthenticatedVersion:(NSString *)lastAuthenticatedVersion {
   } else {
     [defaults setObject:lastAuthenticatedVersion
                  forKey:kBITAuthenticatorLastAuthenticatedVersionKey];
-    [defaults synchronize];
+    if(bit_isPreiOS8Environment()) {
+      [defaults synchronize];
+    }
   }
 }
 

diff --git a/Classes/BITCrashManager.m b/Classes/BITCrashManager.m
@@ -377,10 +377,10 @@ - (BOOL)persistAttachment:(BITHockeyAttachment *)attachment withFilename:(NSStri
 
 - (void)persistUserProvidedMetaData:(BITCrashMetaData *)userProvidedMetaData {
   if (!userProvidedMetaData) return;
-  
-  if (userProvidedMetaData.userDescription && [userProvidedMetaData.userDescription length] > 0) {
+
+  if (userProvidedMetaData.userProvidedDescription && [userProvidedMetaData.userProvidedDescription length] > 0) {
     NSError *error;
-    [userProvidedMetaData.userDescription writeToFile:[NSString stringWithFormat:@"%@.desc", [_crashesDir stringByAppendingPathComponent: _lastCrashFilename]] atomically:YES encoding:NSUTF8StringEncoding error:&error];
+    [userProvidedMetaData.userProvidedDescription writeToFile:[NSString stringWithFormat:@"%@.desc", [_crashesDir stringByAppendingPathComponent: _lastCrashFilename]] atomically:YES encoding:NSUTF8StringEncoding error:&error];
   }
 
   if (userProvidedMetaData.userName && [userProvidedMetaData.userName length] > 0) {
@@ -521,8 +521,11 @@ - (void) registerObservers {
                                                                                              // we only need to log this once
                                                                                              if (!_didLogLowMemoryWarning) {
                                                                                                [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kBITAppDidReceiveLowMemoryNotification];
-                                                                                               [[NSUserDefaults standardUserDefaults] synchronize];
                                                                                                _didLogLowMemoryWarning = YES;
+                                                                                               if(bit_isPreiOS8Environment()) {
+                                                                                                 // calling synchronize in pre-iOS 8 takes longer to sync than in iOS 8+, calling synchronize explicitly.
+                                                                                                 [[NSUserDefaults standardUserDefaults] synchronize];
+                                                                                               }
                                                                                              }
                                                                                            }];
   }
@@ -548,7 +551,10 @@ - (void) unregisterObserver:(id)observer {
 - (void)leavingAppSafely {
   if (self.isAppNotTerminatingCleanlyDetectionEnabled) {
     [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kBITAppWentIntoBackgroundSafely];
-    [[NSUserDefaults standardUserDefaults] synchronize];
+    if(bit_isPreiOS8Environment()) {
+      // calling synchronize in pre-iOS 8 takes longer to sync than in iOS 8+, calling synchronize explicitly.
+      [[NSUserDefaults standardUserDefaults] synchronize];
+    }
   }
 }
 
@@ -579,6 +585,10 @@ - (void)appEnteredForeground {
                              ];
 
       [[NSUserDefaults standardUserDefaults] setObject:uuidString forKey:kBITAppUUIDs];
+      if(bit_isPreiOS8Environment()) {
+        // calling synchronize in pre-iOS 8 takes longer to sync than in iOS 8+, calling synchronize explicitly.
+        [[NSUserDefaults standardUserDefaults] synchronize];
+      }
     });
   }
 }
@@ -821,6 +831,7 @@ - (BOOL)handleUserInput:(BITCrashManagerUserInput)userInput withUserProvidedMeta
     case BITCrashManagerUserInputAlwaysSend:
       _crashManagerStatus = BITCrashManagerStatusAutoSend;
       [[NSUserDefaults standardUserDefaults] setInteger:_crashManagerStatus forKey:kBITCrashManagerStatus];
+
       if ([self.delegate respondsToSelector:@selector(crashManagerWillSendCrashReportsAlways:)]) {
         [self.delegate crashManagerWillSendCrashReportsAlways:self];
       }
@@ -1274,7 +1285,11 @@ - (void)startManager {
 #endif
 
   [[NSUserDefaults standardUserDefaults] setBool:NO forKey:kBITAppDidReceiveLowMemoryNotification];
-  [[NSUserDefaults standardUserDefaults] synchronize];
+
+  if(bit_isPreiOS8Environment()) {
+    // calling synchronize in pre-iOS 8 takes longer to sync than in iOS 8+, calling synchronize explicitly.
+    [[NSUserDefaults standardUserDefaults] synchronize];
+  }
 
   [self triggerDelayedProcessing];
   BITHockeyLogVerbose(@"VERBOSE: CrashManager startManager has finished.");

diff --git a/Classes/BITCrashMetaData.h b/Classes/BITCrashMetaData.h
@@ -37,7 +37,7 @@
 /**
  *  User provided description that should be attached to the crash report as plain text
  */
-@property (nonatomic, copy) NSString *userDescription;
+@property (nonatomic, copy) NSString *userProvidedDescription;
 
 /**
  *  User name that should be attached to the crash report

diff --git a/Classes/BITCrashReportTextFormatter.m b/Classes/BITCrashReportTextFormatter.m
@@ -873,7 +873,7 @@ + (NSString *)bit_formatStackFrame: (BITPLCrashReportStackFrameInfo *) frameInfo
           break;
 
         default:
-          NSLog(@"Symbol prefix rules are unknown for this OS!");
+          BITHockeyLogDebug(@"Symbol prefix rules are unknown for this OS!");
           break;
       }
     }

diff --git a/Classes/BITData.m b/Classes/BITData.m
@@ -1,4 +1,5 @@
 #import "BITData.h"
+#import "BITHockeyLogger.h"
 
 /// Data contract class for type Data.
 @implementation BITData
@@ -13,7 +14,7 @@ - (NSDictionary *)serializeToDictionary {
     if ([NSJSONSerialization isValidJSONObject:baseDataDict]) {
         [dict setObject:baseDataDict forKey:@"baseData"];
     } else {
-        NSLog(@"[HockeyApp] Some of the telemetry data was not NSJSONSerialization compatible and could not be serialized!");
+        BITHockeyLogError(@"[HockeySDK] Some of the telemetry data was not NSJSONSerialization compatible and could not be serialized!");
     }
     return dict;
 }

diff --git a/Classes/BITEnvelope.m b/Classes/BITEnvelope.m
@@ -1,5 +1,6 @@
 #import "BITEnvelope.h"
 #import "BITData.h"
+#import "BITHockeyLogger.h"
 
 /// Data contract class for type Envelope.
 @implementation BITEnvelope
@@ -67,7 +68,7 @@ - (NSDictionary *)serializeToDictionary {
   if ([NSJSONSerialization isValidJSONObject:dataDict]) {
     [dict setObject:dataDict forKey:@"data"];
   } else {
-    NSLog(@"[HockeyApp] Some of the telemetry data was not NSJSONSerialization compatible and could not be serialized!");
+    BITHockeyLogError(@"[HockeySDK] Some of the telemetry data was not NSJSONSerialization compatible and could not be serialized!");
   }
   return dict;
 }