diff --git a/AWSCore/Logging/AWSDDFileLogger.m b/AWSCore/Logging/AWSDDFileLogger.m index 6a95011d03c..7d0b6c42c13 100644 --- a/AWSCore/Logging/AWSDDFileLogger.m +++ b/AWSCore/Logging/AWSDDFileLogger.m @@ -43,7 +43,7 @@ #if TARGET_OS_IPHONE -BOOL doesAppRunInBackground(void); +BOOL awsDoesAppRunInBackground(void); #endif unsigned long long const kAWSDDDefaultLogMaxFileSize = 1024 * 1024; // 1 MB @@ -174,7 +174,7 @@ - (void)setMaximumNumberOfLogFiles:(NSUInteger)maximumNumberOfLogFiles { - (NSFileProtectionType)logFileProtection { if (_defaultFileProtectionLevel.length > 0) { return _defaultFileProtectionLevel; - } else if (doesAppRunInBackground()) { + } else if (awsDoesAppRunInBackground()) { return NSFileProtectionCompleteUntilFirstUserAuthentication; } else { return NSFileProtectionCompleteUnlessOpen; @@ -1026,7 +1026,7 @@ - (BOOL)lt_shouldLogFileBeArchived:(AWSDDLogFileInfo *)mostRecentLogFileInfo { // a new one. // // If user has overwritten to NSFileProtectionNone there is no need to create a new one. - if (doesAppRunInBackground()) { + if (awsDoesAppRunInBackground()) { NSFileProtectionType key = mostRecentLogFileInfo.fileAttributes[NSFileProtectionKey]; __auto_type isUntilFirstAuth = [key isEqualToString:NSFileProtectionCompleteUntilFirstUserAuthentication]; __auto_type isNone = [key isEqualToString:NSFileProtectionNone]; @@ -1846,7 +1846,7 @@ - (NSComparisonResult)reverseCompareByModificationDate:(AWSDDLogFileInfo *)anoth * want (even if device is locked). Thats why that attribute have to be changed to * NSFileProtectionCompleteUntilFirstUserAuthentication. */ -BOOL doesAppRunInBackground(void) { +BOOL awsDoesAppRunInBackground(void) { if ([[[NSBundle mainBundle] executablePath] containsString:@".appex/"]) { return YES; } diff --git a/CHANGELOG.md b/CHANGELOG.md index 72e740cb7a4..edec54c37fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ ## Unreleased --Features for next release +- **AWSCore** + - Fixing a name collision with CocoaLumberjack (#5361) ## 2.36.2