Fixing logging and parameter for cold restart tracking after rebase

Author: emawby

iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSRequests.m

@@ -482,8 +482,8 @@ + (instancetype)trackUsageData:(NSString *)osUsageData appId:(NSString *)appId {
     let request = [OSRequestTrackV1 new];
     let params = [NSMutableDictionary new];
     let headers = [NSMutableDictionary new];
-    params[APP_ID] = appId;
-    headers[APP_ID] = appId;
+    params[@"app_id"] = appId;
+    headers[@"app_id"] = appId;
     headers[OS_USAGE_DATA] = osUsageData;
     request.method = POST;
     request.path = @"v1/track";

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -1615,17 +1615,17 @@ + (BOOL)shouldRegisterNow {
 }
 
 + (void)trackColdRestart {
-    [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"trackColdRestart"];
+    [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"trackColdRestart"];
     // Set to true even if it doesn't pass the sample check
     _trackedColdRestart = true;
     // Sample /track calls to avoid hitting our endpoint too hard
     int randomSample = arc4random_uniform(100);
     if (randomSample == 99) {
         NSString *osUsageData = [NSString stringWithFormat:@"kind=sdk, version=%@, source=iOS_SDK, name=cold_restart, lockScreenApp=false", ONESIGNAL_VERSION];
         [[OneSignalClient sharedClient] executeRequest:[OSRequestTrackV1 trackUsageData:osUsageData appId:appId] onSuccess:^(NSDictionary *result) {
-            [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"trackColdRestart: successfully tracked cold restart"];
+            [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"trackColdRestart: successfully tracked cold restart"];
         } onFailure:^(NSError *error) {
-            [OneSignal onesignal_Log:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"trackColdRestart: Failed to track cold restart: %@", error]];
+            [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"trackColdRestart: Failed to track cold restart: %@", error]];
         }];
     }
 }