Skip to content

Commit 29b99f1

Browse files
fadi-georgefadi-george
committed
fix formatting
1 parent 71ac609 commit 29b99f1

File tree

8 files changed

+58
-46
lines changed

8 files changed

+58
-46
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ public static OneSignalDebug getSharedInstance() {
1818
return sharedInstance;
1919
}
2020

21-
private OneSignalDebug() { }
21+
private OneSignalDebug() {}
2222

23-
static void registerWith(BinaryMessenger messenger) {
23+
static void registerWith(BinaryMessenger messenger) {
2424
OneSignalDebug controller = getSharedInstance();
2525
controller.messenger = messenger;
2626
controller.channel = new MethodChannel(messenger, "OneSignal#debug");

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

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import java.util.Map;
1919
import org.json.JSONException;
2020

21-
public class OneSignalInAppMessages extends FlutterMessengerResponder implements MethodCallHandler,
22-
IInAppMessageClickListener, IInAppMessageLifecycleListener{
21+
public class OneSignalInAppMessages extends FlutterMessengerResponder
22+
implements MethodCallHandler, IInAppMessageClickListener, IInAppMessageLifecycleListener {
2323
private static OneSignalInAppMessages sharedInstance;
2424

2525
public static OneSignalInAppMessages getSharedInstance() {
@@ -29,7 +29,7 @@ public static OneSignalInAppMessages getSharedInstance() {
2929
return sharedInstance;
3030
}
3131

32-
private OneSignalInAppMessages() { }
32+
private OneSignalInAppMessages() {}
3333

3434
static void registerWith(BinaryMessenger messenger) {
3535
OneSignalInAppMessages controller = getSharedInstance();
@@ -113,27 +113,34 @@ public void onClick(IInAppMessageClickEvent event) {
113113
"OneSignal#onClickInAppMessage", OneSignalSerializer.convertInAppMessageClickEventToMap(event));
114114
} catch (JSONException e) {
115115
e.getStackTrace();
116-
Logging.error("Encountered an error attempting to convert IInAppMessageClickEvent object to hash map:" + e.toString(), null);
116+
Logging.error(
117+
"Encountered an error attempting to convert IInAppMessageClickEvent object to hash map:"
118+
+ e.toString(),
119+
null);
117120
}
118121
}
119122

120123
@Override
121124
public void onWillDisplay(IInAppMessageWillDisplayEvent event) {
122125
try {
123-
invokeMethodOnUiThread("OneSignal#onWillDisplayInAppMessage",
124-
OneSignalSerializer.convertInAppMessageWillDisplayEventToMap(event));
126+
invokeMethodOnUiThread(
127+
"OneSignal#onWillDisplayInAppMessage",
128+
OneSignalSerializer.convertInAppMessageWillDisplayEventToMap(event));
125129
} catch (JSONException e) {
126130
e.getStackTrace();
127-
Logging.error("Encountered an error attempting to convert IInAppMessageWillDisplayEvent object to hash map:" + e.toString(), null);
131+
Logging.error(
132+
"Encountered an error attempting to convert IInAppMessageWillDisplayEvent object to hash map:"
133+
+ e.toString(),
134+
null);
128135
}
129-
130136
}
131137

132138
@Override
133139
public void onDidDisplay(IInAppMessageDidDisplayEvent event) {
134140
try {
135-
invokeMethodOnUiThread("OneSignal#onDidDisplayInAppMessage",
136-
OneSignalSerializer.convertInAppMessageDidDisplayEventToMap(event));
141+
invokeMethodOnUiThread(
142+
"OneSignal#onDidDisplayInAppMessage",
143+
OneSignalSerializer.convertInAppMessageDidDisplayEventToMap(event));
137144
} catch (JSONException e) {
138145
e.getStackTrace();
139146
Logging.error(
@@ -146,8 +153,9 @@ public void onDidDisplay(IInAppMessageDidDisplayEvent event) {
146153
@Override
147154
public void onWillDismiss(IInAppMessageWillDismissEvent event) {
148155
try {
149-
invokeMethodOnUiThread("OneSignal#onWillDismissInAppMessage",
150-
OneSignalSerializer.convertInAppMessageWillDismissEventToMap(event));
156+
invokeMethodOnUiThread(
157+
"OneSignal#onWillDismissInAppMessage",
158+
OneSignalSerializer.convertInAppMessageWillDismissEventToMap(event));
151159
} catch (JSONException e) {
152160
e.getStackTrace();
153161
Logging.error(
@@ -160,15 +168,15 @@ public void onWillDismiss(IInAppMessageWillDismissEvent event) {
160168
@Override
161169
public void onDidDismiss(IInAppMessageDidDismissEvent event) {
162170
try {
163-
invokeMethodOnUiThread("OneSignal#onDidDismissInAppMessage",
164-
OneSignalSerializer.convertInAppMessageDidDismissEventToMap(event));
171+
invokeMethodOnUiThread(
172+
"OneSignal#onDidDismissInAppMessage",
173+
OneSignalSerializer.convertInAppMessageDidDismissEventToMap(event));
165174
} catch (JSONException e) {
166175
e.getStackTrace();
167176
Logging.error(
168177
"Encountered an error attempting to convert IInAppMessageDidDismissEvent object to hash map:"
169178
+ e.toString(),
170179
null);
171180
}
172-
173181
}
174182
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static OneSignalLocation getSharedInstance() {
1818
return sharedInstance;
1919
}
2020

21-
private OneSignalLocation() { }
21+
private OneSignalLocation() {}
2222

2323
static void registerWith(BinaryMessenger messenger) {
2424
OneSignalLocation controller = getSharedInstance();

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
import org.json.JSONException;
2323
import org.json.JSONObject;
2424

25-
public class OneSignalNotifications extends FlutterMessengerResponder implements MethodCallHandler, INotificationClickListener, INotificationLifecycleListener, IPermissionObserver {
25+
public class OneSignalNotifications extends FlutterMessengerResponder
26+
implements MethodCallHandler, INotificationClickListener, INotificationLifecycleListener, IPermissionObserver {
2627
private static OneSignalNotifications sharedInstance;
2728

2829
private final HashMap<String, INotificationWillDisplayEvent> notificationOnWillDisplayEventCache = new HashMap<>();
@@ -35,7 +36,7 @@ public static OneSignalNotifications getSharedInstance() {
3536
return sharedInstance;
3637
}
3738

38-
private OneSignalNotifications() { }
39+
private OneSignalNotifications() {}
3940

4041
/**
4142
* A helper class to encapsulate invoking the suspending function [requestPermission] in Java.
@@ -127,7 +128,8 @@ private void clearAll(MethodCall call, Result result) {
127128
replySuccess(result, null);
128129
}
129130

130-
/// Our bridge layer needs to preventDefault() so that the Flutter listener has time to preventDefault() before the notification is displayed
131+
/// Our bridge layer needs to preventDefault() so that the Flutter listener has time to preventDefault() before the
132+
// notification is displayed
131133
/// This function is called after all of the flutter listeners have responded to the willDisplay event.
132134
/// If any of them have called preventDefault() we will not call display(). Otherwise we will display.
133135
private void proceedWithWillDisplay(MethodCall call, Result result) {
@@ -218,7 +220,7 @@ public void onWillDisplay(INotificationWillDisplayEvent event) {
218220
}
219221

220222
@Override
221-
public void onNotificationPermissionChange(boolean permission) {
223+
public void onNotificationPermissionChange(boolean permission) {
222224
HashMap<String, Object> hash = new HashMap<>();
223225
hash.put("permission", permission);
224226
invokeMethodOnUiThread("OneSignal#onNotificationPermissionDidChange", hash);

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

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,15 @@ public class OneSignalPlugin extends FlutterMessengerResponder
1919

2020
public OneSignalPlugin() {}
2121

22-
private void init(Context context, BinaryMessenger messenger)
23-
{
24-
this.context = context;
25-
this.messenger = messenger;
26-
OneSignalWrapper.setSdkType("flutter");
27-
// For 5.0.0, hard code to reflect SDK version
28-
OneSignalWrapper.setSdkVersion("050305");
22+
private void init(Context context, BinaryMessenger messenger) {
23+
this.context = context;
24+
this.messenger = messenger;
25+
OneSignalWrapper.setSdkType("flutter");
26+
// For 5.0.0, hard code to reflect SDK version
27+
OneSignalWrapper.setSdkVersion("050305");
2928

30-
channel = new MethodChannel(messenger, "OneSignal");
31-
channel.setMethodCallHandler(this);
29+
channel = new MethodChannel(messenger, "OneSignal");
30+
channel.setMethodCallHandler(this);
3231

3332
channel = new MethodChannel(messenger, "OneSignal");
3433
channel.setMethodCallHandler(this);
@@ -97,13 +96,13 @@ private void setConsentGiven(MethodCall call, Result reply) {
9796
replySuccess(reply, null);
9897
}
9998

100-
private void loginWithJWT(MethodCall call, Result result) {
101-
OneSignal.login((String) call.argument("externalId"), (String) call.argument("jwt"));
102-
replySuccess(result, null);
103-
}
99+
private void loginWithJWT(MethodCall call, Result result) {
100+
OneSignal.login((String) call.argument("externalId"), (String) call.argument("jwt"));
101+
replySuccess(result, null);
102+
}
104103

105-
private void logout(MethodCall call, Result result) {
106-
OneSignal.logout();
107-
replySuccess(result, null);
108-
}
104+
private void logout(MethodCall call, Result result) {
105+
OneSignal.logout();
106+
replySuccess(result, null);
107+
}
109108
}

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
import io.flutter.plugin.common.MethodChannel.Result;
1212
import org.json.JSONException;
1313

14-
public class OneSignalPushSubscription extends FlutterMessengerResponder implements MethodCallHandler, IPushSubscriptionObserver {
14+
public class OneSignalPushSubscription extends FlutterMessengerResponder
15+
implements MethodCallHandler, IPushSubscriptionObserver {
1516
private static OneSignalPushSubscription sharedInstance;
1617

1718
public static OneSignalPushSubscription getSharedInstance() {
@@ -21,7 +22,7 @@ public static OneSignalPushSubscription getSharedInstance() {
2122
return sharedInstance;
2223
}
2324

24-
private OneSignalPushSubscription() { }
25+
private OneSignalPushSubscription() {}
2526

2627
static void registerWith(BinaryMessenger messenger) {
2728
OneSignalPushSubscription controller = getSharedInstance();
@@ -68,7 +69,10 @@ public void onPushSubscriptionChange(PushSubscriptionChangedState changeState) {
6869
OneSignalSerializer.convertOnPushSubscriptionChange(changeState));
6970
} catch (JSONException e) {
7071
e.getStackTrace();
71-
Logging.error("Encountered an error attempting to convert PushSubscriptionChangedState object to hash map:" + e.toString(), null);
72+
Logging.error(
73+
"Encountered an error attempting to convert PushSubscriptionChangedState object to hash map:"
74+
+ e.toString(),
75+
null);
7276
}
7377
}
7478
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public static OneSignalSession getSharedInstance() {
1717
return sharedInstance;
1818
}
1919

20-
private OneSignalSession() { }
20+
private OneSignalSession() {}
2121

2222
static void registerWith(BinaryMessenger messenger) {
2323
OneSignalSession controller = getSharedInstance();

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
import java.util.Map;
1414
import org.json.JSONException;
1515

16-
public class OneSignalUser extends FlutterMessengerResponder
17-
implements MethodCallHandler, IUserStateObserver {
16+
public class OneSignalUser extends FlutterMessengerResponder implements MethodCallHandler, IUserStateObserver {
1817
private static OneSignalUser sharedInstance;
1918

2019
public static OneSignalUser getSharedInstance() {
@@ -24,7 +23,7 @@ public static OneSignalUser getSharedInstance() {
2423
return sharedInstance;
2524
}
2625

27-
private OneSignalUser() { }
26+
private OneSignalUser() {}
2827

2928
static void registerWith(BinaryMessenger messenger) {
3029
OneSignalUser controller = getSharedInstance();

0 commit comments

Comments
 (0)