Skip to content

Commit da05fb4

Browse files
committed
adding visual logging to OneSignalFramework only
1 parent 5ea8674 commit da05fb4

File tree

4 files changed

+45
-6
lines changed

4 files changed

+45
-6
lines changed

iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalLog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ typedef NS_ENUM(NSUInteger, ONE_S_LOG_LEVEL) {
2020
ONE_S_LL_VERBOSE
2121
};
2222

23-
+ (void)setLogLevel:(ONE_S_LOG_LEVEL)logLevel visualLevel:(ONE_S_LOG_LEVEL)visualLogLevel;
23+
+ (void)setLogLevel:(ONE_S_LOG_LEVEL)logLevel;
2424
+ (void)onesignalLog:(ONE_S_LOG_LEVEL)logLevel message:(NSString* _Nonnull)message;
2525

2626
@end

iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalLog.m

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
@implementation OneSignalLog
1313

1414
static ONE_S_LOG_LEVEL _nsLogLevel = ONE_S_LL_WARN;
15-
static ONE_S_LOG_LEVEL _visualLogLevel = ONE_S_LL_NONE;
1615

17-
+ (void)setLogLevel:(ONE_S_LOG_LEVEL)nsLogLevel visualLevel:(ONE_S_LOG_LEVEL)visualLogLevel {
18-
_nsLogLevel = nsLogLevel; _visualLogLevel = visualLogLevel;
16+
+ (void)setLogLevel:(ONE_S_LOG_LEVEL)nsLogLevel {
17+
_nsLogLevel = nsLogLevel;
1918
}
2019

2120
+ (void) onesignal_Log:(ONE_S_LOG_LEVEL)logLevel message:(NSString*) message {
@@ -54,8 +53,6 @@ void onesignal_Log(ONE_S_LOG_LEVEL logLevel, NSString* message) {
5453

5554
if (logLevel <= _nsLogLevel)
5655
NSLog(@"%@", [levelString stringByAppendingString:message]);
57-
58-
// ECM TODO: Do we want to support visual level?
5956
}
6057

6158
@end

iOS_SDK/OneSignalSDK/Source/OneSignal.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,10 @@ typedef void (^OSFailureBlock)(NSError* error);
443443
+ (void)setLaunchURLsInApp:(BOOL)launchInApp;
444444
+ (void)setProvidesNotificationSettingsView:(BOOL)providesView;
445445

446+
#pragma mark Logging
447+
+ (void)setLogLevel:(ONE_S_LOG_LEVEL)logLevel visualLevel:(ONE_S_LOG_LEVEL)visualLogLevel;
448+
+ (void)onesignalLog:(ONE_S_LOG_LEVEL)logLevel message:(NSString* _Nonnull)message;
449+
446450
#pragma mark Prompt For Push
447451
typedef void(^OSUserResponseBlock)(BOOL accepted);
448452

iOS_SDK/OneSignalSDK/Source/OneSignal.m

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2886,6 +2886,44 @@ + (BOOL)isValidOutcomeValue:(NSNumber *)value {
28862886
return true;
28872887
}
28882888

2889+
static ONE_S_LOG_LEVEL _visualLogLevel = ONE_S_LL_NONE;
2890+
2891+
#pragma mark Logging
2892+
+ (void)setLogLevel:(ONE_S_LOG_LEVEL)logLevel visualLevel:(ONE_S_LOG_LEVEL)visualLogLevel {
2893+
[OneSignalLog setLogLevel:logLevel];
2894+
_visualLogLevel = visualLogLevel;
2895+
}
2896+
+ (void)onesignalLog:(ONE_S_LOG_LEVEL)logLevel message:(NSString* _Nonnull)message {
2897+
[OneSignalLog onesignalLog:logLevel message:message];
2898+
NSString* levelString;
2899+
switch (logLevel) {
2900+
case ONE_S_LL_FATAL:
2901+
levelString = @"FATAL: ";
2902+
break;
2903+
case ONE_S_LL_ERROR:
2904+
levelString = @"ERROR: ";
2905+
break;
2906+
case ONE_S_LL_WARN:
2907+
levelString = @"WARNING: ";
2908+
break;
2909+
case ONE_S_LL_INFO:
2910+
levelString = @"INFO: ";
2911+
break;
2912+
case ONE_S_LL_DEBUG:
2913+
levelString = @"DEBUG: ";
2914+
break;
2915+
case ONE_S_LL_VERBOSE:
2916+
levelString = @"VERBOSE: ";
2917+
break;
2918+
2919+
default:
2920+
break;
2921+
}
2922+
if (logLevel <= _visualLogLevel) {
2923+
[[OneSignalDialogController sharedInstance] presentDialogWithTitle:levelString withMessage:message withActions:nil cancelTitle:NSLocalizedString(@"Close", @"Close button") withActionCompletion:nil];
2924+
}
2925+
}
2926+
28892927
@end
28902928

28912929
@implementation OneSignal (SessionStatusDelegate)

0 commit comments

Comments
 (0)