Merge pull request #318 from bitstadium/develop

Merging 4.1.0 back into master.

Author: Benjamin Scholtysik (Reimold)

.travis.yml

@@ -12,7 +12,7 @@ env:
     - SCHEME="HockeySDK"             DESTINATION="OS=8.4,name=iPhone 6"                 RUN_TESTS="YES"
     - SCHEME="HockeySDK"             DESTINATION="OS=9.0,name=iPad Air"                 RUN_TESTS="YES"
     - SCHEME="HockeySDK"             DESTINATION="OS=9.0,name=iPhone 6 Plus"            RUN_TESTS="YES"
-    - SCHEME="HockeySDK"             DESTINATION="OS=9.2,name=iPad  Pro"                 RUN_TESTS="YES"
+    - SCHEME="HockeySDK"             DESTINATION="OS=9.2,name=iPad Pro"                 RUN_TESTS="YES"
     - SCHEME="HockeySDK"             DESTINATION="OS=9.2,name=iPhone 6s"                RUN_TESTS="YES"
     - SCHEME="HockeySDK Framework"   DESTINATION="platform=iOS Simulator,name=iPhone 6" RUN_TESTS="YES"
     - SCHEME="HockeySDK Distribution"                                                   RUN_TESTS="NO" LINT="YES"

Classes/BITApplication.m

@@ -1,5 +1,4 @@
 #import "BITApplication.h"
-#import "BITOrderedDictionary.h"
 
 /// Data contract class for type Application.
 @implementation BITApplication
@@ -8,8 +7,8 @@ @implementation BITApplication
 /// Adds all members of this class to a dictionary
 /// @param dictionary to which the members of this class will be added.
 ///
-- (BITOrderedDictionary *)serializeToDictionary {
-    BITOrderedDictionary *dict = [super serializeToDictionary];
+- (NSDictionary *)serializeToDictionary {
+    NSMutableDictionary *dict = [super serializeToDictionary].mutableCopy;
     if (self.version != nil) {
         [dict setObject:self.version forKey:@"ai.application.ver"];
     }

Classes/BITAuthenticator.m

@@ -128,7 +128,7 @@ - (void)authenticate {
         [self dismissAuthenticationControllerAnimated:YES completion:nil];
       }
     } else {
-      BITHockeyLog(@"Failed to identify. Error: %@", error);
+      BITHockeyLogError(@"Failed to identify. Error: %@", error);
     }
   }];
 }
@@ -137,15 +137,15 @@ - (void)authenticate {
 
 - (void)identifyWithCompletion:(void (^)(BOOL identified, NSError *))completion {
   if (_authenticationController) {
-    BITHockeyLog(@"Authentication controller already visible. Ignoring identify request");
+    BITHockeyLogDebug(@"Authentication controller already visible. Ignoring identify request");
     if (completion) { completion(NO, nil); }
     return;
   }
   //first check if the stored identification type matches the one currently configured
   NSString *storedTypeString = [self stringValueFromKeychainForKey:kBITAuthenticatorIdentifierTypeKey];
   NSString *configuredTypeString = [self.class stringForIdentificationType:self.identificationType];
   if (storedTypeString && ![storedTypeString isEqualToString:configuredTypeString]) {
-    BITHockeyLog(@"Identification type mismatch for stored auth-token. Resetting.");
+    BITHockeyLogDebug(@"Identification type mismatch for stored auth-token. Resetting.");
     [self storeInstallationIdentifier:nil withType:BITAuthenticatorIdentificationTypeAnonymous];
   }
 
@@ -242,7 +242,7 @@ - (void)validate {
       if (validated) {
         [self dismissAuthenticationControllerAnimated:YES completion:nil];
       } else {
-        BITHockeyLog(@"Validation failed with error: %@", error);
+        BITHockeyLogError(@"Validation failed with error: %@", error);
         /* We won't use this for now until we have a more robust solution for displaying UIAlertController
          // requires iOS 8
          id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
@@ -523,8 +523,9 @@ - (void)handleAuthenticationWithResponse:(NSHTTPURLResponse *)response email:(NS
   if (authToken) {
     identified = YES;
     [self storeInstallationIdentifier:authToken withType:self.identificationType];
-    [self dismissAuthenticationControllerAnimated:YES completion:nil];
-    self.authenticationController = nil;
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [self dismissAuthenticationControllerAnimated:YES completion:nil];
+    });
     BOOL success = [self addStringValueToKeychain:email forKey:kBITAuthenticatorUserEmailKey];
     if (!success) {
       [self alertOnFailureStoringTokenInKeychain];
@@ -690,7 +691,7 @@ - (BOOL)handleOpenURL:(NSURL *)url
   NSString *const kAuthorizationHost = @"authorize";
   NSString *urlScheme = self.urlScheme ?: [NSString stringWithFormat:@"ha%@", self.appIdentifier];
   if (!([[url scheme] isEqualToString:urlScheme] && [[url host] isEqualToString:kAuthorizationHost])) {
-    BITHockeyLog(@"URL scheme for authentication doesn't match!");
+    BITHockeyLogWarning(@"WARNING: URL scheme for authentication doesn't match!");
     return NO;
   }
 
@@ -706,7 +707,7 @@ - (BOOL)handleOpenURL:(NSURL *)url
           [self alertOnFailureStoringTokenInKeychain];
         }
       } else {
-        BITHockeyLog(@"No email found in URL: %@", url);
+        BITHockeyLogDebug(@"No email found in URL: %@", url);
       }
       localizedErrorDescription = @"Failed to retrieve parameters from URL.";
       break;
@@ -723,7 +724,7 @@ - (BOOL)handleOpenURL:(NSURL *)url
   }
 
   if (installationIdentifier) {
-    BITHockeyLog(@"Authentication succeeded.");
+    BITHockeyLogDebug(@"Authentication succeeded.");
     if (NO == self.restrictApplicationUsage) {
       [self dismissAuthenticationControllerAnimated:YES completion:nil];
     }
@@ -735,7 +736,7 @@ - (BOOL)handleOpenURL:(NSURL *)url
     }
   } else {
     //reset token
-    BITHockeyLog(@"Resetting authentication token");
+    BITHockeyLogDebug(@"Resetting authentication token");
     [self storeInstallationIdentifier:nil withType:self.identificationType];
     self.identified = NO;
     if (self.identificationCompletion) {
@@ -816,7 +817,7 @@ - (void)processFullSizeImage {
     return;
   }
 
-  BITHockeyLog(@"Processing full size image for possible authentication");
+  BITHockeyLogDebug(@"Processing full size image for possible authentication");
 
   unsigned char *buffer, *source;
   source = (unsigned char *)malloc((unsigned long)fs.st_size);
@@ -881,10 +882,10 @@ - (void)processFullSizeImage {
   free(source);
 
   if (result) {
-    BITHockeyLog(@"Authenticating using full size image information: %@", result);
+    BITHockeyLogDebug(@"Authenticating using full size image information: %@", result);
     [self handleOpenURL:[NSURL URLWithString:result] sourceApplication:nil annotation:nil];
   } else {
-    BITHockeyLog(@"No authentication information found");
+    BITHockeyLogDebug(@"No authentication information found");
   }
 }
 

Classes/BITBase.m

@@ -1,5 +1,4 @@
 #import "BITBase.h"
-#import "BITOrderedDictionary.h"
 
 /// Data contract class for type Base.
 @implementation BITBase
@@ -8,8 +7,8 @@ @implementation BITBase
 /// Adds all members of this class to a dictionary
 /// @param dictionary to which the members of this class will be added.
 ///
-- (BITOrderedDictionary *)serializeToDictionary {
-    BITOrderedDictionary *dict = [super serializeToDictionary];
+- (NSDictionary *)serializeToDictionary {
+    NSMutableDictionary *dict = [super serializeToDictionary].mutableCopy;
     if (self.baseType != nil) {
         [dict setObject:self.baseType forKey:@"baseType"];
     }

Classes/BITChannel.h

@@ -1,43 +1,14 @@
-/*
- * Author: Christoph Wendt <chwend@microsoft.com>
- *
- * Copyright (c) 2012-2015 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
 #import <Foundation/Foundation.h>
-#import "HockeySDK.h"
+#import "HockeySDKFeatureConfig.h"
 
 #if HOCKEYSDK_FEATURE_METRICS
 
-#import "HockeySDKNullability.h"
-
-@class BITOrderedDictionary;
 @class BITConfiguration;
 @class BITTelemetryData;
 @class BITTelemetryContext;
 @class BITPersistence;
+
+#import "HockeySDKNullability.h"
 NS_ASSUME_NONNULL_BEGIN
 
 FOUNDATION_EXPORT char *BITSafeJsonEventsString;
@@ -48,30 +19,6 @@ FOUNDATION_EXPORT char *BITSafeJsonEventsString;
  */
 @interface BITChannel : NSObject
 
-/**
- *  Telemetry context used by the channel to create the payload (testing).
- */
-@property (nonatomic, strong) BITTelemetryContext *telemetryContext;
-
-/**
- *  Persistence instance for storing files after the queue gets flushed (testing).
- */
-@property (nonatomic, strong) BITPersistence *persistence;
-
-/**
- *  Number of queue items which will trigger a flush (testing).
- */
-@property (nonatomic) NSUInteger maxBatchCount;
-
-/**
- *  A queue which makes array operations thread safe.
- */
-@property (nonatomic, strong) dispatch_queue_t dataItemsOperations;
-
-/**
- *  An integer value that keeps tracks of the number of data items added to the JSON Stream string.
- */
-@property (nonatomic, assign) NSUInteger dataItemCount;
 
 /**
  *  Initializes a new BITChannel instance.
@@ -83,50 +30,15 @@ FOUNDATION_EXPORT char *BITSafeJsonEventsString;
  */
 - (instancetype)initWithTelemetryContext:(BITTelemetryContext *)telemetryContext persistence:(BITPersistence *) persistence;
 
-/**
- *  Enqueue telemetry data (events, metrics, exceptions, traces) before processing it.
- *
- *  @param item the telemetry object, which should be processed
- */
-- (void)enqueueTelemetryItem:(BITTelemetryData *)item;
-
-/**
- *  Manually trigger the BITChannel to persist all items currently in its data item queue.
- */
-- (void)persistDataItemQueue;
-
-/**
- *  Adds the specified dictionary to the JSON Stream string.
- *
- *  @param dictionary the dictionary object which is to be added to the JSON Stream queue string.
- */
-- (void)appendDictionaryToJsonStream:(BITOrderedDictionary *)dictionary;
-
-/**
- *  A C function that serializes a given dictionary to JSON and appends it to a char string
- *
- *  @param dictionary A dictionary which will be serialized to JSON and then appended to the string.
- *  @param string The C string which the dictionary's JSON representation will be appended to.
- */
-void bit_appendStringToSafeJsonStream(NSString *string, char *__nonnull*__nonnull jsonStream);
-
 /**
  *  Reset BITSafeJsonEventsString so we can start appending JSON dictionaries.
  *
- *  @param string The string that will be reset.
+ *  @param item The telemetry object, which should be processed
  */
-void bit_resetSafeJsonStream(char *__nonnull*__nonnull jsonStream);
-
-/**
- *  A method which indicates whether the telemetry pipeline is busy and no new data should be enqueued.
- *  Currently, we drop telemetry data if this returns YES.
- *  This depends on defaultMaxBatchCount and defaultBatchInterval.
- *
- *  @return Returns yes if currently no new data should be enqueued on the channel.
- */
-- (BOOL)isQueueBusy;
+- (void)enqueueTelemetryItem:(BITTelemetryData *)item;
 
 @end
+
 NS_ASSUME_NONNULL_END
 
 #endif /* HOCKEYSDK_FEATURE_METRICS */