Skip to content

Commit afca614

Browse files
fadi-georgefadi-george
committed
clean up
1 parent 0f80df5 commit afca614

File tree

3 files changed

+67
-53
lines changed

3 files changed

+67
-53
lines changed

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

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
1717
import io.flutter.plugin.common.MethodChannel.Result;
1818

19-
public class OneSignalUser extends FlutterMessengerResponder implements MethodCallHandler, IUserStateObserver {
19+
public class OneSignalUser extends FlutterMessengerResponder
20+
implements MethodCallHandler, IUserStateObserver {
2021

2122
static void registerWith(BinaryMessenger messenger) {
2223
OneSignalUser controller = new OneSignalUser();
@@ -76,7 +77,7 @@ private void getOnesignalId(MethodCall call, Result result) {
7677
onesignalId = null;
7778
}
7879
replySuccess(result, onesignalId);
79-
}
80+
}
8081

8182
private void getExternalId(MethodCall call, Result result) {
8283
String externalId = OneSignal.getUser().getExternalId();
@@ -85,68 +86,76 @@ private void getExternalId(MethodCall call, Result result) {
8586
}
8687
replySuccess(result, externalId);
8788
}
88-
89+
8990
private void addAliases(MethodCall call, Result result) {
9091
// call.arguments is being casted to a Map<String, Object> so a try-catch with
91-
// a ClassCastException will be thrown
92+
// a ClassCastException will be thrown
9293
try {
9394
OneSignal.getUser().addAliases((Map<String, String>) call.arguments);
9495
replySuccess(result, null);
95-
} catch(ClassCastException e) {
96-
replyError(result, "OneSignal", "addAliases failed with error: " + e.getMessage() + "\n" + e.getStackTrace(), null);
96+
} catch (ClassCastException e) {
97+
replyError(result, "OneSignal",
98+
"addAliases failed with error: " + e.getMessage() + "\n" + e.getStackTrace(),
99+
null);
97100
}
98101
}
99102

100103
private void removeAliases(MethodCall call, Result result) {
101104
// call.arguments is being casted to a List<String> so a try-catch with
102-
// a ClassCastException will be thrown
105+
// a ClassCastException will be thrown
103106
try {
104107
OneSignal.getUser().removeAliases((List<String>) call.arguments);
105108
replySuccess(result, null);
106-
} catch(ClassCastException e) {
107-
replyError(result, "OneSignal", "removeAliases failed with error: " + e.getMessage() + "\n" + e.getStackTrace(), null);
109+
} catch (ClassCastException e) {
110+
replyError(result, "OneSignal",
111+
"removeAliases failed with error: " + e.getMessage() + "\n" + e.getStackTrace(),
112+
null);
108113
}
109114
}
110115

111116
private void addEmail(MethodCall call, Result result) {
112117
OneSignal.getUser().addEmail((String) call.arguments);
113118
replySuccess(result, null);
114119
}
115-
120+
116121
private void removeEmail(MethodCall call, Result result) {
117122
OneSignal.getUser().removeEmail((String) call.arguments);
118123
replySuccess(result, null);
119124
}
120-
125+
121126
private void addSms(MethodCall call, Result result) {
122127
OneSignal.getUser().addSms((String) call.arguments);
123128
replySuccess(result, null);
124129
}
125-
130+
126131
private void removeSms(MethodCall call, Result result) {
127132
OneSignal.getUser().removeSms((String) call.arguments);
128133
replySuccess(result, null);
129134
}
130135

131136
private void addTags(MethodCall call, Result result) {
132137
// call.arguments is being casted to a Map<String, Object> so a try-catch with
133-
// a ClassCastException will be thrown
138+
// a ClassCastException will be thrown
134139
try {
135140
OneSignal.getUser().addTags((Map<String, String>) call.arguments);
136141
replySuccess(result, null);
137-
} catch(ClassCastException e) {
138-
replyError(result, "OneSignal", "addTags failed with error: " + e.getMessage() + "\n" + e.getStackTrace(), null);
142+
} catch (ClassCastException e) {
143+
replyError(result, "OneSignal",
144+
"addTags failed with error: " + e.getMessage() + "\n" + e.getStackTrace(),
145+
null);
139146
}
140147
}
141148

142149
private void removeTags(MethodCall call, Result result) {
143150
// call.arguments is being casted to a List<String> so a try-catch with
144-
// a ClassCastException will be thrown
151+
// a ClassCastException will be thrown
145152
try {
146153
OneSignal.getUser().removeTags((List<String>) call.arguments);
147154
replySuccess(result, null);
148-
} catch(ClassCastException e) {
149-
replyError(result, "OneSignal", "deleteTags failed with error: " + e.getMessage() + "\n" + e.getStackTrace(), null);
155+
} catch (ClassCastException e) {
156+
replyError(result, "OneSignal",
157+
"deleteTags failed with error: " + e.getMessage() + "\n" + e.getStackTrace(),
158+
null);
150159
}
151160
}
152161

@@ -157,10 +166,14 @@ private void getTags(MethodCall call, Result result) {
157166
@Override
158167
public void onUserStateChange(UserChangedState userChangedState) {
159168
try {
160-
invokeMethodOnUiThread("OneSignal#onUserStateChange", OneSignalSerializer.convertOnUserStateChange(userChangedState));
169+
invokeMethodOnUiThread("OneSignal#onUserStateChange",
170+
OneSignalSerializer.convertOnUserStateChange(userChangedState));
161171
} catch (JSONException e) {
162172
e.getStackTrace();
163-
Logging.error("Encountered an error attempting to convert UserChangedState object to hash map:" + e.toString(), null);
173+
Logging.error(
174+
"Encountered an error attempting to convert UserChangedState object to hash map:"
175+
+ e.toString(),
176+
null);
164177
}
165178
}
166179
}

‎example/lib/main.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'dart:async';
22

33
import 'package:flutter/material.dart';
4-
//import OneSignal
54
import 'package:onesignal_flutter/onesignal_flutter.dart';
65

76
void main() => runApp(new MyApp());

‎ios/Classes/OSFlutterUser.m‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -42,35 +42,36 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
4242
[OSFlutterPushSubscription registerWithRegistrar:registrar];
4343
}
4444

45-
- (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
46-
if ([@"OneSignal#setLanguage" isEqualToString:call.method])
47-
[self setLanguage:call withResult:result];
48-
else if ([@"OneSignal#getOnesignalId" isEqualToString:call.method])
49-
[self getOnesignalId:call withResult:result];
50-
else if ([@"OneSignal#getExternalId" isEqualToString:call.method])
51-
[self getExternalId:call withResult:result];
52-
else if ([@"OneSignal#addAliases" isEqualToString:call.method])
53-
[self addAliases:call withResult:result];
54-
else if ([@"OneSignal#removeAliases" isEqualToString:call.method])
55-
[self removeAliases:call withResult:result];
56-
else if ([@"OneSignal#addTags" isEqualToString:call.method])
57-
[self addTags:call withResult:result];
58-
else if ([@"OneSignal#removeTags" isEqualToString:call.method])
59-
[self removeTags:call withResult:result];
60-
else if ([@"OneSignal#getTags" isEqualToString:call.method])
61-
[self getTags:call withResult:result];
62-
else if ([@"OneSignal#addEmail" isEqualToString:call.method])
63-
[self addEmail:call withResult:result];
64-
else if ([@"OneSignal#removeEmail" isEqualToString:call.method])
65-
[self removeEmail:call withResult:result];
66-
else if ([@"OneSignal#addSms" isEqualToString:call.method])
67-
[self addSms:call withResult:result];
68-
else if ([@"OneSignal#removeSms" isEqualToString:call.method])
69-
[self removeSms:call withResult:result];
70-
else if ([@"OneSignal#lifecycleInit" isEqualToString:call.method])
71-
[self lifecycleInit:call withResult:result];
72-
else
73-
result(FlutterMethodNotImplemented);
45+
- (void)handleMethodCall:(FlutterMethodCall *)call
46+
result:(FlutterResult)result {
47+
if ([@"OneSignal#setLanguage" isEqualToString:call.method])
48+
[self setLanguage:call withResult:result];
49+
else if ([@"OneSignal#getOnesignalId" isEqualToString:call.method])
50+
[self getOnesignalId:call withResult:result];
51+
else if ([@"OneSignal#getExternalId" isEqualToString:call.method])
52+
[self getExternalId:call withResult:result];
53+
else if ([@"OneSignal#addAliases" isEqualToString:call.method])
54+
[self addAliases:call withResult:result];
55+
else if ([@"OneSignal#removeAliases" isEqualToString:call.method])
56+
[self removeAliases:call withResult:result];
57+
else if ([@"OneSignal#addTags" isEqualToString:call.method])
58+
[self addTags:call withResult:result];
59+
else if ([@"OneSignal#removeTags" isEqualToString:call.method])
60+
[self removeTags:call withResult:result];
61+
else if ([@"OneSignal#getTags" isEqualToString:call.method])
62+
[self getTags:call withResult:result];
63+
else if ([@"OneSignal#addEmail" isEqualToString:call.method])
64+
[self addEmail:call withResult:result];
65+
else if ([@"OneSignal#removeEmail" isEqualToString:call.method])
66+
[self removeEmail:call withResult:result];
67+
else if ([@"OneSignal#addSms" isEqualToString:call.method])
68+
[self addSms:call withResult:result];
69+
else if ([@"OneSignal#removeSms" isEqualToString:call.method])
70+
[self removeSms:call withResult:result];
71+
else if ([@"OneSignal#lifecycleInit" isEqualToString:call.method])
72+
[self lifecycleInit:call withResult:result];
73+
else
74+
result(FlutterMethodNotImplemented);
7475
}
7576

7677
- (void)setLanguage:(FlutterMethodCall *)call withResult:(FlutterResult)result {
@@ -136,9 +137,10 @@ - (void)removeSms:(FlutterMethodCall *)call withResult:(FlutterResult)result {
136137
result(nil);
137138
}
138139

139-
- (void)lifecycleInit:(FlutterMethodCall *)call withResult:(FlutterResult)result {
140-
[OneSignal.User addObserver:self];
141-
result(nil);
140+
- (void)lifecycleInit:(FlutterMethodCall *)call
141+
withResult:(FlutterResult)result {
142+
[OneSignal.User addObserver:self];
143+
result(nil);
142144
}
143145

144146
- (void)onUserStateDidChangeWithState:(OSUserChangedState *)state {

0 commit comments

Comments
 (0)