Skip to content

Commit e5bb068

Browse files
fhboswellfhboswell
committed
Cleanup an fixes sms, email, invokeMethodOnUiThread
1 parent ad62d90 commit e5bb068

File tree

7 files changed

+45
-49
lines changed

7 files changed

+45
-49
lines changed

‎android/src/main/java/com/onesignal/flutter/OneSignalInAppMessages.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,30 +104,30 @@ public void inAppMessageClicked(IInAppMessageClickResult action) {
104104
return;
105105
}
106106

107-
channel.invokeMethod("OneSignal#handleClickedInAppMessage", OneSignalSerializer.convertInAppMessageClickedActionToMap(action));
107+
invokeMethodOnUiThread("OneSignal#handleClickedInAppMessage", OneSignalSerializer.convertInAppMessageClickedActionToMap(action));
108108
}
109109

110110
/* in app message lifecycle */
111111
public void setInAppMessageLifecycleHandler() {
112112
OneSignal.getInAppMessages().setInAppMessageLifecycleHandler(new IInAppMessageLifecycleHandler() {
113113
@Override
114114
public void onWillDisplayInAppMessage(IInAppMessage message) {
115-
channel.invokeMethod("OneSignal#onWillDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
115+
invokeMethodOnUiThread("OneSignal#onWillDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
116116
}
117117

118118
@Override
119119
public void onDidDisplayInAppMessage(IInAppMessage message) {
120-
channel.invokeMethod("OneSignal#onDidDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
120+
invokeMethodOnUiThread("OneSignal#onDidDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
121121
}
122122

123123
@Override
124124
public void onWillDismissInAppMessage(IInAppMessage message) {
125-
channel.invokeMethod("OneSignal#onWillDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
125+
invokeMethodOnUiThread("OneSignal#onWillDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
126126
}
127127

128128
@Override
129129
public void onDidDismissInAppMessage(IInAppMessage message) {
130-
channel.invokeMethod("OneSignal#onDidDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
130+
invokeMethodOnUiThread("OneSignal#onDidDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
131131
}
132132
});
133133
}

‎android/src/main/java/com/onesignal/flutter/OneSignalNotifications.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ else if (call.method.contentEquals("OneSignal#lifecycleInit"))
7575
}
7676

7777
private void requestPermission(MethodCall call, Result result) {
78-
boolean fallback = call.argument("fallback");
78+
boolean fallback = (boolean) call.argument("fallbackToSettings");
7979
OneSignal.getNotifications().requestPermission(fallback, Continue.none());
8080
}
8181

@@ -128,7 +128,7 @@ private void completeNotification(MethodCall call, final Result reply) {
128128
@Override
129129
public void notificationClicked(INotificationClickResult result) {
130130
try {
131-
channel.invokeMethod("OneSignal#handleOpenedNotification", OneSignalSerializer.convertNotificationClickedResultToMap(result));
131+
invokeMethodOnUiThread("OneSignal#handleOpenedNotification", OneSignalSerializer.convertNotificationClickedResultToMap(result));
132132
} catch (JSONException e) {
133133
e.getStackTrace();
134134
// OneSignal.onesignalLog(OneSignal.LOG_LEVEL.ERROR,
@@ -148,7 +148,8 @@ public void notificationWillShowInForeground(INotificationReceivedEvent notifica
148148

149149
try {
150150
HashMap<String, Object> receivedMap = OneSignalSerializer.convertNotificationToMap(notification);
151-
channel.invokeMethod("OneSignal#handleNotificationWillShowInForeground", receivedMap);
151+
152+
invokeMethodOnUiThread("OneSignal#handleNotificationWillShowInForeground", receivedMap);
152153
} catch (JSONException e) {
153154
e.getStackTrace();
154155
// OneSignal.onesignalLog(OneSignal.LOG_LEVEL.ERROR,
@@ -159,7 +160,7 @@ public void notificationWillShowInForeground(INotificationReceivedEvent notifica
159160
@Override
160161
public void onPermissionChanged(boolean permission) {
161162

162-
channel.invokeMethod("OneSignal#OSPermissionChanged", OneSignalSerializer.convertPermissionChanged(permission));
163+
invokeMethodOnUiThread("OneSignal#OSPermissionChanged", OneSignalSerializer.convertPermissionChanged(permission));
163164
}
164165

165166
public void lifecycleInit() {

‎android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ else if (call.method.contentEquals("OneSignal#login"))
128128
this.login(call, result);
129129
else if (call.method.contentEquals("OneSignal#logout"))
130130
this.logout(call, result);
131+
else
131132
replyNotImplemented(result);
132133
}
133134

‎android/src/main/java/com/onesignal/flutter/OneSignalPushSubscription.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ public void onSubscriptionChanged(ISubscription subscription) {
6666
return;
6767
}
6868
IPushSubscription pushSubscription = (IPushSubscription) subscription;
69-
70-
channel.invokeMethod("OneSignal#onSubscriptionChanged", OneSignalSerializer.convertOnSubscriptionChanged(pushSubscription));
69+
invokeMethodOnUiThread("OneSignal#onSubscriptionChanged", OneSignalSerializer.convertOnSubscriptionChanged(pushSubscription));
7170
}
7271

7372
});

‎android/src/main/java/com/onesignal/flutter/OneSignalUser.java

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,26 +80,24 @@ private void removeAliases(MethodCall call, Result result) {
8080
}
8181
}
8282

83-
private void addEmail(MethodCall call, final Result reply) {
84-
String email = call.argument("email");
85-
86-
OneSignal.getUser().addEmail(email);
83+
private void addEmail(MethodCall call, Result result) {
84+
OneSignal.getUser().addEmail((String) call.arguments);
85+
replySuccess(result, null);
8786
}
8887

89-
private void removeEmail(MethodCall call, final Result reply) {
90-
String email = call.argument("email");
91-
OneSignal.getUser().removeEmail(email);
88+
private void removeEmail(MethodCall call, Result result) {
89+
OneSignal.getUser().removeEmail((String) call.arguments);
90+
replySuccess(result, null);
9291
}
9392

94-
private void addSms(MethodCall call, final Result reply) {
95-
String smsNumber = call.argument("smsNumber");
96-
97-
OneSignal.getUser().addSms(smsNumber);
93+
private void addSms(MethodCall call, Result result) {
94+
OneSignal.getUser().addSms((String) call.arguments);
95+
replySuccess(result, null);
9896
}
9997

100-
private void removeSms(MethodCall call, final Result reply) {
101-
String smsNumber = call.argument("smsNumber");
102-
OneSignal.getUser().removeSms(smsNumber);
98+
private void removeSms(MethodCall call, Result result) {
99+
OneSignal.getUser().removeSms((String) call.arguments);
100+
replySuccess(result, null);
103101
}
104102
private void addTags(MethodCall call, Result result) {
105103
// call.arguments is being casted to a Map<String, Object> so a try-catch with

‎example/lib/main.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ class _MyAppState extends State<MyApp> with OneSignalPushSubscriptionObserver {
4242
OneSignal.User.pushSubscription.addObserver(this);
4343

4444
// Outcome Examples
45-
oneSignalOutcomeExamples();
46-
47-
// OneSignal.shared.login("Testtesttest");
45+
//oneSignalOutcomeExamples();
46+
//OneSignal.shared.logout();
47+
OneSignal.shared.login("Henry987656778");
4848

4949
// OneSignal.shared.setRequiresUserPrivacyConsent(_requireConsent);
5050

@@ -296,7 +296,7 @@ class _MyAppState extends State<MyApp> with OneSignalPushSubscriptionObserver {
296296
// OneSignal.InAppMessages.clearTriggers();
297297

298298
// Toggle pausing (displaying or not) of IAMs
299-
OneSignal.InAppMessages.paused(false);
299+
OneSignal.InAppMessages.paused(true);
300300
var arePaused = await OneSignal.InAppMessages.arePaused();
301301
print('Notifications paused ${arePaused}');
302302
}

‎lib/src/user.dart

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import 'package:onesignal_flutter/src/defines.dart';
66
import 'package:onesignal_flutter/src/pushsubscription.dart';
77

88
class OneSignalUser {
9-
10-
static OneSignalPushSubscription _pushSubscription = new OneSignalPushSubscription();
9+
static OneSignalPushSubscription _pushSubscription =
10+
new OneSignalPushSubscription();
1111

1212
OneSignalPushSubscription get pushSubscription => _pushSubscription;
1313

@@ -18,19 +18,19 @@ class OneSignalUser {
1818
///
1919
/// Sets the user's language to [language] this also applies to
2020
/// the email and/or SMS player if those are logged in on the device.
21-
void setLanguage(String language) {
22-
_channel.invokeMethod("OneSignal#setLanguage", {'language' : language});
21+
void setLanguage(String language) {
22+
_channel.invokeMethod("OneSignal#setLanguage", {'language': language});
2323
}
2424

2525
/// Set an [alias] for the current user.
26-
///
27-
/// If this [alias] label already exists on this user,
26+
///
27+
/// If this [alias] label already exists on this user,
2828
/// it will be overwritten with the new alias [id].
2929
void addAlias(String alias, dynamic id) {
3030
this.addAliases({alias: id});
3131
}
3232

33-
/// Set [aliases] for the current user.
33+
/// Set [aliases] for the current user.
3434
///
3535
/// If any alias already exists, it will be overwritten to the new values.
3636
void addAliases(Map<String, dynamic> aliases) {
@@ -47,19 +47,19 @@ class OneSignalUser {
4747
_channel.invokeMethod("OneSignal#removeAliases", aliases);
4848
}
4949

50-
/// Add a tag for the current user.
50+
/// Add a tag for the current user.
5151
///
52-
/// Tags are [key] : [value] pairs used as building blocks for targeting
53-
/// specific users and/or personalizing messages. If the tag [key] already
52+
/// Tags are [key] : [value] pairs used as building blocks for targeting
53+
/// specific users and/or personalizing messages. If the tag [key] already
5454
/// exists, it will be replaced with the [value] provided here.
5555
void addTagWithKey(String key, dynamic value) {
5656
this.addTags({key: value});
5757
}
5858

59-
/// Add multiple [tags] for the current user.
59+
/// Add multiple [tags] for the current user.
6060
///
61-
/// [Tags] are key:value pairs used as building blocks for targeting
62-
/// specific users and/or personalizing messages. If the tag key already
61+
/// [Tags] are key:value pairs used as building blocks for targeting
62+
/// specific users and/or personalizing messages. If the tag key already
6363
/// exists, it will be replaced with the value provided here.
6464
void addTags(Map<String, dynamic> tags) {
6565
_channel.invokeMethod("OneSignal#addTags", tags);
@@ -80,9 +80,9 @@ class OneSignalUser {
8080
_channel.invokeMethod("OneSignal#addEmail", email);
8181
}
8282

83-
/// Remove an [email] subscription from the current user.
83+
/// Remove an [email] subscription from the current user.
8484
///
85-
/// Returns false if the specified [email] does not exist
85+
/// Returns false if the specified [email] does not exist
8686
/// on the user within the SDK, and no request will be made.
8787
Future<void> removeEmail(String email) async {
8888
return await _channel.invokeMethod("OneSignal#removeEmail");
@@ -95,14 +95,11 @@ class OneSignalUser {
9595
_channel.invokeMethod("OneSignal#addSms", smsNumber);
9696
}
9797

98-
/// Remove an SMS subscription from the current user.
98+
/// Remove an SMS subscription from the current user.
9999
///
100100
/// Returns false if the specified [smsNumber] does not
101101
/// exist on the user within the SDK, and no request will be made.
102102
Future<void> removeSms(String smsNumber) async {
103-
return await _channel.invokeMethod("OneSignal#removeSms");
103+
return await _channel.invokeMethod("OneSignal#removeSms", smsNumber);
104104
}
105-
106-
107-
108105
}

0 commit comments

Comments
 (0)