Skip to content

Commit 66754e2

Browse files
fadi-georgefadi-george
committed
add spotless check
1 parent 2675039 commit 66754e2

File tree

14 files changed

+800
-631
lines changed

14 files changed

+800
-631
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ coverage/
99

1010
# tsc / build
1111
#
12+
.gradle
13+
build
1214
dist
1315
android/build
1416
*.tgz

‎android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java‎

Lines changed: 62 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@ of this software and associated documentation files (the "Software"), to deal
3636
package com.onesignal.rnonesignalandroid;
3737

3838
import android.content.Context;
39-
import android.content.pm.ApplicationInfo;
40-
import android.os.Bundle;
41-
import com.onesignal.debug.internal.logging.Logging;
42-
import com.facebook.react.bridge.Callback;
39+
import com.facebook.react.bridge.Arguments;
4340
import com.facebook.react.bridge.LifecycleEventListener;
4441
import com.facebook.react.bridge.Promise;
4542
import com.facebook.react.bridge.ReactApplicationContext;
@@ -48,46 +45,41 @@ of this software and associated documentation files (the "Software"), to deal
4845
import com.facebook.react.bridge.ReactMethod;
4946
import com.facebook.react.bridge.ReadableArray;
5047
import com.facebook.react.bridge.ReadableMap;
51-
import com.facebook.react.modules.core.DeviceEventManagerModule;
5248
import com.facebook.react.bridge.WritableMap;
53-
import com.facebook.react.bridge.Arguments;
49+
import com.facebook.react.modules.core.DeviceEventManagerModule;
5450
import com.onesignal.Continue;
5551
import com.onesignal.OneSignal;
56-
import com.onesignal.debug.LogLevel;
5752
import com.onesignal.common.OneSignalWrapper;
58-
import com.onesignal.inAppMessages.IInAppMessage;
59-
import com.onesignal.inAppMessages.IInAppMessageClickListener;
53+
import com.onesignal.debug.LogLevel;
54+
import com.onesignal.debug.internal.logging.Logging;
6055
import com.onesignal.inAppMessages.IInAppMessageClickEvent;
61-
import com.onesignal.inAppMessages.IInAppMessageClickResult;
62-
import com.onesignal.inAppMessages.IInAppMessageLifecycleListener;
63-
import com.onesignal.inAppMessages.IInAppMessageWillDisplayEvent;
56+
import com.onesignal.inAppMessages.IInAppMessageClickListener;
57+
import com.onesignal.inAppMessages.IInAppMessageDidDismissEvent;
6458
import com.onesignal.inAppMessages.IInAppMessageDidDisplayEvent;
59+
import com.onesignal.inAppMessages.IInAppMessageLifecycleListener;
6560
import com.onesignal.inAppMessages.IInAppMessageWillDismissEvent;
66-
import com.onesignal.inAppMessages.IInAppMessageDidDismissEvent;
61+
import com.onesignal.inAppMessages.IInAppMessageWillDisplayEvent;
6762
import com.onesignal.notifications.INotification;
68-
import com.onesignal.notifications.INotificationClickListener;
6963
import com.onesignal.notifications.INotificationClickEvent;
64+
import com.onesignal.notifications.INotificationClickListener;
7065
import com.onesignal.notifications.INotificationLifecycleListener;
7166
import com.onesignal.notifications.INotificationWillDisplayEvent;
7267
import com.onesignal.notifications.IPermissionObserver;
68+
import com.onesignal.user.state.IUserStateObserver;
69+
import com.onesignal.user.state.UserChangedState;
7370
import com.onesignal.user.subscriptions.IPushSubscription;
7471
import com.onesignal.user.subscriptions.IPushSubscriptionObserver;
75-
import com.onesignal.user.subscriptions.PushSubscriptionState;
7672
import com.onesignal.user.subscriptions.PushSubscriptionChangedState;
77-
import com.onesignal.user.state.UserState;
78-
import com.onesignal.user.state.UserChangedState;
79-
import com.onesignal.user.state.IUserStateObserver;
80-
import org.json.JSONException;
81-
8273
import java.util.HashMap;
8374
import java.util.Map;
75+
import org.json.JSONException;
8476

85-
public class RNOneSignal extends ReactContextBaseJavaModule implements
86-
IPushSubscriptionObserver,
87-
IPermissionObserver,
88-
IUserStateObserver,
89-
LifecycleEventListener,
90-
INotificationLifecycleListener{
77+
public class RNOneSignal extends ReactContextBaseJavaModule
78+
implements IPushSubscriptionObserver,
79+
IPermissionObserver,
80+
IUserStateObserver,
81+
LifecycleEventListener,
82+
INotificationLifecycleListener {
9183
private ReactApplicationContext mReactApplicationContext;
9284
private ReactContext mReactContext;
9385

@@ -108,7 +100,9 @@ public class RNOneSignal extends ReactContextBaseJavaModule implements
108100
@Override
109101
public void onClick(IInAppMessageClickEvent event) {
110102
try {
111-
sendEvent("OneSignal-inAppMessageClicked", RNUtils.convertHashMapToWritableMap(RNUtils.convertInAppMessageClickEventToMap(event)));
103+
sendEvent(
104+
"OneSignal-inAppMessageClicked",
105+
RNUtils.convertHashMapToWritableMap(RNUtils.convertInAppMessageClickEventToMap(event)));
112106
} catch (JSONException e) {
113107
e.printStackTrace();
114108
}
@@ -119,7 +113,9 @@ public void onClick(IInAppMessageClickEvent event) {
119113
@Override
120114
public void onWillDisplay(IInAppMessageWillDisplayEvent event) {
121115
try {
122-
sendEvent("OneSignal-inAppMessageWillDisplay", RNUtils.convertHashMapToWritableMap(RNUtils.convertInAppMessageWillDisplayEventToMap(event)));
116+
sendEvent(
117+
"OneSignal-inAppMessageWillDisplay",
118+
RNUtils.convertHashMapToWritableMap(RNUtils.convertInAppMessageWillDisplayEventToMap(event)));
123119
} catch (JSONException e) {
124120
e.printStackTrace();
125121
}
@@ -128,7 +124,9 @@ public void onWillDisplay(IInAppMessageWillDisplayEvent event) {
128124
@Override
129125
public void onDidDisplay(IInAppMessageDidDisplayEvent event) {
130126
try {
131-
sendEvent("OneSignal-inAppMessageDidDisplay", RNUtils.convertHashMapToWritableMap(RNUtils.convertInAppMessageDidDisplayEventToMap(event)));
127+
sendEvent(
128+
"OneSignal-inAppMessageDidDisplay",
129+
RNUtils.convertHashMapToWritableMap(RNUtils.convertInAppMessageDidDisplayEventToMap(event)));
132130
} catch (JSONException e) {
133131
e.printStackTrace();
134132
}
@@ -137,7 +135,9 @@ public void onDidDisplay(IInAppMessageDidDisplayEvent event) {
137135
@Override
138136
public void onWillDismiss(IInAppMessageWillDismissEvent event) {
139137
try {
140-
sendEvent("OneSignal-inAppMessageWillDismiss", RNUtils.convertHashMapToWritableMap(RNUtils.convertInAppMessageWillDismissEventToMap(event)));
138+
sendEvent(
139+
"OneSignal-inAppMessageWillDismiss",
140+
RNUtils.convertHashMapToWritableMap(RNUtils.convertInAppMessageWillDismissEventToMap(event)));
141141
} catch (JSONException e) {
142142
e.printStackTrace();
143143
}
@@ -146,7 +146,9 @@ public void onWillDismiss(IInAppMessageWillDismissEvent event) {
146146
@Override
147147
public void onDidDismiss(IInAppMessageDidDismissEvent event) {
148148
try {
149-
sendEvent("OneSignal-inAppMessageDidDismiss", RNUtils.convertHashMapToWritableMap(RNUtils.convertInAppMessageDidDismissEventToMap(event)));
149+
sendEvent(
150+
"OneSignal-inAppMessageDidDismiss",
151+
RNUtils.convertHashMapToWritableMap(RNUtils.convertInAppMessageDidDismissEventToMap(event)));
150152
} catch (JSONException e) {
151153
e.printStackTrace();
152154
}
@@ -157,7 +159,9 @@ public void onDidDismiss(IInAppMessageDidDismissEvent event) {
157159
@Override
158160
public void onClick(INotificationClickEvent event) {
159161
try {
160-
sendEvent("OneSignal-notificationClicked", RNUtils.convertHashMapToWritableMap(RNUtils.convertNotificationClickEventToMap(event)));
162+
sendEvent(
163+
"OneSignal-notificationClicked",
164+
RNUtils.convertHashMapToWritableMap(RNUtils.convertNotificationClickEventToMap(event)));
161165
} catch (JSONException e) {
162166
e.printStackTrace();
163167
}
@@ -171,7 +175,7 @@ private void removeObservers() {
171175
}
172176

173177
private void removeHandlers() {
174-
if(!oneSignalInitDone) {
178+
if (!oneSignalInitDone) {
175179
Logging.debug("OneSignal React-Native SDK not initialized yet. Could not remove handlers.", null);
176180
return;
177181
}
@@ -187,7 +191,9 @@ private void removeHandlers() {
187191
}
188192

189193
private void sendEvent(String eventName, Object params) {
190-
mReactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, params);
194+
mReactContext
195+
.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
196+
.emit(eventName, params);
191197
}
192198

193199
public RNOneSignal(ReactApplicationContext reactContext) {
@@ -199,7 +205,6 @@ public RNOneSignal(ReactApplicationContext reactContext) {
199205
preventDefaultCache = new HashMap<String, INotificationWillDisplayEvent>();
200206
}
201207

202-
203208
/** Native Module Overrides */
204209
@Override
205210
public String getName() {
@@ -257,7 +262,6 @@ public void setPrivacyConsentRequired(Boolean required) {
257262
OneSignal.setConsentRequired(required);
258263
}
259264

260-
261265
// OneSignal.Debug namespace methods
262266
@ReactMethod
263267
public void setLogLevel(int logLevel) {
@@ -269,7 +273,6 @@ public void setAlertLevel(int logLevel) {
269273
OneSignal.getDebug().setAlertLevel(LogLevel.fromInt(logLevel));
270274
}
271275

272-
273276
// OneSignal.InAppMessages namespace methods
274277
@ReactMethod
275278
public void addInAppMessageClickListener() {
@@ -322,7 +325,6 @@ public void clearTriggers() {
322325
OneSignal.getInAppMessages().clearTriggers();
323326
}
324327

325-
326328
// OneSignal.Location namespace methods
327329
@ReactMethod
328330
public void requestLocationPermission() {
@@ -339,7 +341,6 @@ public void setLocationShared(Boolean shared) {
339341
OneSignal.getLocation().setShared(shared);
340342
}
341343

342-
343344
// OneSignal.Notifications namespace methods
344345
@ReactMethod
345346
public void addNotificationClickListener() {
@@ -373,17 +374,17 @@ public void onWillDisplay(INotificationWillDisplayEvent event) {
373374
event.preventDefault();
374375

375376
try {
376-
sendEvent("OneSignal-notificationWillDisplayInForeground",
377-
RNUtils.convertHashMapToWritableMap(
378-
RNUtils.convertNotificationToMap(notification)));
377+
sendEvent(
378+
"OneSignal-notificationWillDisplayInForeground",
379+
RNUtils.convertHashMapToWritableMap(RNUtils.convertNotificationToMap(notification)));
379380

380381
try {
381382
synchronized (event) {
382383
while (preventDefaultCache.containsKey(notificationId)) {
383384
event.wait();
384385
}
385386
}
386-
} catch(InterruptedException e){
387+
} catch (InterruptedException e) {
387388
Logging.error("InterruptedException: " + e.toString(), null);
388389
}
389390
} catch (JSONException e) {
@@ -392,10 +393,11 @@ public void onWillDisplay(INotificationWillDisplayEvent event) {
392393
}
393394

394395
@ReactMethod
395-
private void displayNotification(String notificationId){
396+
private void displayNotification(String notificationId) {
396397
INotificationWillDisplayEvent event = notificationWillDisplayCache.get(notificationId);
397398
if (event == null) {
398-
Logging.error("Could not find onWillDisplayNotification event for notification with id: " + notificationId, null);
399+
Logging.error(
400+
"Could not find onWillDisplayNotification event for notification with id: " + notificationId, null);
399401
return;
400402
}
401403
event.getNotification().display();
@@ -405,7 +407,8 @@ private void displayNotification(String notificationId){
405407
private void preventDefault(String notificationId) {
406408
INotificationWillDisplayEvent event = notificationWillDisplayCache.get(notificationId);
407409
if (event == null) {
408-
Logging.error("Could not find onWillDisplayNotification event for notification with id: " + notificationId, null);
410+
Logging.error(
411+
"Could not find onWillDisplayNotification event for notification with id: " + notificationId, null);
409412
return;
410413
}
411414
event.preventDefault();
@@ -431,7 +434,9 @@ public void removePermissionObserver() {
431434
@Override
432435
public void onNotificationPermissionChange(boolean permission) {
433436
try {
434-
sendEvent("OneSignal-permissionChanged", RNUtils.convertHashMapToWritableMap(RNUtils.convertPermissionToMap(permission)));
437+
sendEvent(
438+
"OneSignal-permissionChanged",
439+
RNUtils.convertHashMapToWritableMap(RNUtils.convertPermissionToMap(permission)));
435440
Logging.debug("Sending permission change event", null);
436441
} catch (JSONException e) {
437442
e.printStackTrace();
@@ -464,8 +469,7 @@ public void hasNotificationPermission(Promise promise) {
464469
public void permissionNative(Promise promise) {
465470
if (OneSignal.getNotifications().getPermission()) {
466471
promise.resolve(2);
467-
}
468-
else {
472+
} else {
469473
promise.resolve(1);
470474
}
471475
}
@@ -490,13 +494,12 @@ public void removeGroupedNotifications(String id) {
490494
OneSignal.getNotifications().removeGroupedNotifications(id);
491495
}
492496

493-
494497
// OneSignal.User.pushSubscription namespace methods
495498
@ReactMethod
496499
public void getPushSubscriptionId(Promise promise) {
497500
IPushSubscription pushSubscription = OneSignal.getUser().getPushSubscription();
498501
String pushId = pushSubscription.getId();
499-
if (pushId != null && !pushId.isEmpty()){
502+
if (pushId != null && !pushId.isEmpty()) {
500503
promise.resolve(pushId);
501504
} else {
502505
promise.resolve(null);
@@ -543,13 +546,14 @@ public void addPushSubscriptionObserver() {
543546
@Override
544547
public void onPushSubscriptionChange(PushSubscriptionChangedState pushSubscriptionChangedState) {
545548
try {
546-
sendEvent("OneSignal-subscriptionChanged",
549+
sendEvent(
550+
"OneSignal-subscriptionChanged",
547551
RNUtils.convertHashMapToWritableMap(
548552
RNUtils.convertPushSubscriptionChangedStateToMap(pushSubscriptionChangedState)));
549553
Logging.debug("Sending subscription change event", null);
550554
} catch (JSONException e) {
551555
e.printStackTrace();
552-
}
556+
}
553557
}
554558

555559
@ReactMethod
@@ -619,7 +623,7 @@ public void getTags(Promise promise) {
619623
for (Map.Entry<String, String> entry : tags.entrySet()) {
620624
writableTags.putString(entry.getKey(), entry.getValue());
621625
}
622-
promise.resolve(writableTags);
626+
promise.resolve(writableTags);
623627
}
624628

625629
@ReactMethod
@@ -689,7 +693,6 @@ public void getOnesignalId(Promise promise) {
689693
onesignalId = null;
690694
}
691695
promise.resolve(onesignalId);
692-
693696
}
694697

695698
@ReactMethod
@@ -712,13 +715,13 @@ public void addUserStateObserver() {
712715
@Override
713716
public void onUserStateChange(UserChangedState state) {
714717
try {
715-
sendEvent("OneSignal-userStateChanged",
716-
RNUtils.convertHashMapToWritableMap(
717-
RNUtils.convertUserChangedStateToMap(state)));
718+
sendEvent(
719+
"OneSignal-userStateChanged",
720+
RNUtils.convertHashMapToWritableMap(RNUtils.convertUserChangedStateToMap(state)));
718721
Logging.debug("Sending user state change event", null);
719722
} catch (JSONException e) {
720723
e.printStackTrace();
721-
}
724+
}
722725
}
723726

724727
@ReactMethod

0 commit comments

Comments
 (0)