@@ -358,7 +358,9 @@ bool FIRCLSContextMarkAndCheckIfCrashed(void) {
358
358
[[root stringByAppendingPathComponent: component] fileSystemRepresentation ]);
359
359
}
360
360
361
- static bool FIRCLSContextRecordIdentity (FIRCLSFile* file, const FIRCLSContextInitData* initData) {
361
+ static bool FIRCLSContextRecordIdentity (FIRCLSFile* file,
362
+ const char * sessionId,
363
+ const char * betaToken) {
362
364
FIRCLSFileWriteSectionStart (file, " identity" );
363
365
364
366
FIRCLSFileWriteHashStart (file);
@@ -368,11 +370,11 @@ static bool FIRCLSContextRecordIdentity(FIRCLSFile* file, const FIRCLSContextIni
368
370
FIRCLSFileWriteHashEntryString (file, " build_version" , FIRCLSSDKVersion ().UTF8String );
369
371
FIRCLSFileWriteHashEntryUint64 (file, " started_at" , time (NULL ));
370
372
371
- FIRCLSFileWriteHashEntryString (file, " session_id" , initData-> sessionId );
373
+ FIRCLSFileWriteHashEntryString (file, " session_id" , sessionId);
372
374
// install_id is written into the proto directly. This is only left here to
373
375
// support Apple Report Converter.
374
376
FIRCLSFileWriteHashEntryString (file, " install_id" , " " );
375
- FIRCLSFileWriteHashEntryString (file, " beta_token" , initData-> betaToken );
377
+ FIRCLSFileWriteHashEntryString (file, " beta_token" , betaToken);
376
378
FIRCLSFileWriteHashEntryBoolean (file, " absolute_log_timestamps" , true );
377
379
378
380
FIRCLSFileWriteHashEnd (file);
@@ -403,6 +405,10 @@ static bool FIRCLSContextRecordApplication(FIRCLSFile* file, const char* customB
403
405
}
404
406
405
407
static bool FIRCLSContextRecordMetadata (const char * path, const FIRCLSContextInitData* initData) {
408
+ const char * sessionId = initData->sessionId ;
409
+ const char * betaToken = initData->betaToken ;
410
+ const char * customBundleId = initData->customBundleId ;
411
+
406
412
if (!FIRCLSUnlinkIfExists (path)) {
407
413
FIRCLSSDKLog (" Unable to unlink existing metadata file %s \n " , strerror (errno));
408
414
}
@@ -414,15 +420,15 @@ static bool FIRCLSContextRecordMetadata(const char* path, const FIRCLSContextIni
414
420
return false ;
415
421
}
416
422
417
- if (!FIRCLSContextRecordIdentity (&file, initData )) {
423
+ if (!FIRCLSContextRecordIdentity (&file, sessionId, betaToken )) {
418
424
FIRCLSSDKLog (" Unable to write out identity metadata\n " );
419
425
}
420
426
421
427
if (!FIRCLSHostRecord (&file)) {
422
428
FIRCLSSDKLog (" Unable to write out host metadata\n " );
423
429
}
424
430
425
- if (!FIRCLSContextRecordApplication (&file, initData-> customBundleId )) {
431
+ if (!FIRCLSContextRecordApplication (&file, customBundleId)) {
426
432
FIRCLSSDKLog (" Unable to write out application metadata\n " );
427
433
}
428
434
0 commit comments