Skip to content

Commit 3a516a0

Browse files
committed
Updates+fixes for the OneSignal static class
1 parent 31c6a4e commit 3a516a0

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

ios/Classes/OSFlutterUser.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#import <OneSignalUser/OneSignalUser.h>
3131
#import "OSFlutterCategories.h"
3232

33+
3334
@implementation OSFlutterUser
3435
+ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
3536
OSFlutterUser *instance = [OSFlutterUser new];

ios/Classes/OneSignalPlugin.m

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
7676
if ([@"OneSignal#initialize" isEqualToString:call.method])
7777
[self initialize:call];
7878
else if ([@"OneSignal#login" isEqualToString:call.method])
79-
result(@(OneSignal.login));
79+
[self login:call];
8080
else if ([@"OneSignal#getPrivacyConsent" isEqualToString:call.method])
8181
result(@(OneSignal.getPrivacyConsent));
8282
else if ([@"OneSignal#setPrivacyConsent" isEqualToString:call.method])
83-
[self getPrivacyConsent:call];
83+
[self setPrivacyConsent:call];
8484
else if ([@"OneSignal#requiresPrivacyConsent" isEqualToString:call.method])
8585
result(@(OneSignal.requiresPrivacyConsent));
8686
else if ([@"OneSignal#setRequiresPrivacyConsent" isEqualToString:call.method])
@@ -137,7 +137,7 @@ - (void)setRequiresPrivacyConsent:(FlutterMethodCall *)call {
137137

138138
- (void)setLaunchURLsInApp:(FlutterMethodCall *)call {
139139
BOOL launchUrlsInApp = [call.arguments[@"launchUrlsInApp"] boolValue];
140-
[OneSignal setLaunchURLsInApp:launchUrlsInApp]
140+
[OneSignal setLaunchURLsInApp:launchUrlsInApp];
141141
}
142142

143143
#pragma mark Live Activity
@@ -149,7 +149,6 @@ - (void)enterLiveActivity:(FlutterMethodCall *)call withResult:(FlutterResult)re
149149
[OneSignal enterLiveActivity:activityId withToken:token withSuccess:^(NSDictionary *results) {
150150
result(results);
151151
} withFailure:^(NSError *error) {
152-
[OneSignal onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"enterLiveActivity Failure with error: %@", error]];
153152
result(error.flutterError);
154153
}];
155154
}
@@ -160,7 +159,6 @@ - (void)exitLiveActivity:(FlutterMethodCall *)call withResult:(FlutterResult)res
160159
[OneSignal exitLiveActivity:activityId withSuccess:^(NSDictionary *results) {
161160
result(results);
162161
} withFailure:^(NSError *error) {
163-
[OneSignal onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"exitLiveActivity Failure with error: %@", error]];
164162
result(error.flutterError);
165163
}];
166164
}

lib/onesignal_flutter.dart

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,7 @@ class OneSignal {
108108
Future<void> enterLiveActivity(String activityId, String token) async {
109109
if (Platform.isIOS) {
110110
await _channel.invokeMethod("OneSignal#enterLiveActivity", {'activityId': activityId, 'token': token});
111-
} else {
112-
_onesignalLog(OSLogLevel.info,
113-
"enterLiveActivity: this function is not supported on Android");
114-
}
111+
}
115112
}
116113

117114
/// Only applies to iOS
@@ -120,9 +117,6 @@ class OneSignal {
120117
if (Platform.isIOS) {
121118
await _channel.invokeMethod("OneSignal#exitLiveActivity",
122119
{'activityId': activityId});
123-
} else {
124-
_onesignalLog(OSLogLevel.info,
125-
"exitLiveActivity: this function is not supported on Android");
126120
}
127121
}
128122

0 commit comments

Comments
 (0)