Skip to content

Commit 0a1e142

Browse files
fhboswellfhboswell
committed
Android testing updates, general cleanup
1 parent cfba13b commit 0a1e142

25 files changed

+168
-380
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
import io.flutter.plugin.common.PluginRegistry.Registrar;
2020

2121
public class OneSignalDebug extends FlutterRegistrarResponder implements MethodCallHandler {
22-
private MethodChannel channel;
23-
24-
static void registerWith(BinaryMessenger messenger) {
22+
23+
static void registerWith(BinaryMessenger messenger) {
2524
OneSignalDebug controller = new OneSignalDebug();
2625
controller.messenger = messenger;
2726
controller.channel = new MethodChannel(messenger, "OneSignal#debug");

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

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
import io.flutter.plugin.common.PluginRegistry.Registrar;
1818

1919
public class OneSignalInAppMessages extends FlutterRegistrarResponder implements MethodCallHandler,
20-
IInAppMessageClickHandler{
21-
private MethodChannel channel;
22-
20+
IInAppMessageClickHandler, IInAppMessageLifecycleHandler{
21+
2322
private IInAppMessageClickResult inAppMessageClickedResult;
2423
private boolean hasSetInAppMessageClickedHandler = false;
2524

@@ -109,26 +108,26 @@ public void inAppMessageClicked(IInAppMessageClickResult action) {
109108

110109
/* in app message lifecycle */
111110
public void setInAppMessageLifecycleHandler() {
112-
OneSignal.getInAppMessages().setInAppMessageLifecycleHandler(new IInAppMessageLifecycleHandler() {
113-
@Override
114-
public void onWillDisplayInAppMessage(IInAppMessage message) {
115-
invokeMethodOnUiThread("OneSignal#onWillDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
116-
}
117-
118-
@Override
119-
public void onDidDisplayInAppMessage(IInAppMessage message) {
120-
invokeMethodOnUiThread("OneSignal#onDidDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
121-
}
122-
123-
@Override
124-
public void onWillDismissInAppMessage(IInAppMessage message) {
125-
invokeMethodOnUiThread("OneSignal#onWillDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
126-
}
127-
128-
@Override
129-
public void onDidDismissInAppMessage(IInAppMessage message) {
130-
invokeMethodOnUiThread("OneSignal#onDidDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
131-
}
132-
});
133-
}
111+
OneSignal.getInAppMessages().setInAppMessageLifecycleHandler(this);
112+
}
113+
114+
@Override
115+
public void onWillDisplayInAppMessage(IInAppMessage message) {
116+
invokeMethodOnUiThread("OneSignal#onWillDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
117+
}
118+
119+
@Override
120+
public void onDidDisplayInAppMessage(IInAppMessage message) {
121+
invokeMethodOnUiThread("OneSignal#onDidDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
122+
}
123+
124+
@Override
125+
public void onWillDismissInAppMessage(IInAppMessage message) {
126+
invokeMethodOnUiThread("OneSignal#onWillDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
127+
}
128+
129+
@Override
130+
public void onDidDismissInAppMessage(IInAppMessage message) {
131+
invokeMethodOnUiThread("OneSignal#onDidDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
132+
}
134133
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import io.flutter.plugin.common.PluginRegistry.Registrar;
2020

2121
public class OneSignalLocation extends FlutterRegistrarResponder implements MethodCallHandler {
22-
private MethodChannel channel;
2322

2423
static void registerWith(BinaryMessenger messenger) {
2524
OneSignalLocation controller = new OneSignalLocation();

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.onesignal.flutter;
22

3+
import com.onesignal.debug.internal.logging.Logging;
34
import com.onesignal.OneSignal;
45
import com.onesignal.Continue;
56

@@ -37,8 +38,6 @@
3738
import io.flutter.plugin.common.PluginRegistry.Registrar;
3839

3940
public class OneSignalNotifications extends FlutterRegistrarResponder implements MethodCallHandler, INotificationClickHandler, INotificationWillShowInForegroundHandler, IPermissionChangedHandler {
40-
// private MethodChannel channel;
41-
4241
private boolean hasSetNotificationWillShowInForegroundHandler = false;
4342
private final HashMap<String, INotificationReceivedEvent> notificationReceivedEventCache = new HashMap<>();
4443

@@ -114,7 +113,7 @@ private void completeNotification(MethodCall call, final Result reply) {
114113
INotificationReceivedEvent notificationReceivedEvent = notificationReceivedEventCache.get(notificationId);
115114

116115
if (notificationReceivedEvent == null) {
117-
//OneSignal.onesignalLog(OneSignal.LOG_LEVEL.ERROR, "Could not find notification completion block with id: " + notificationId);
116+
Logging.error("Could not find notification completion block with id: " + notificationId, null);
118117
return;
119118
}
120119

@@ -131,7 +130,7 @@ public void notificationClicked(INotificationClickResult result) {
131130
invokeMethodOnUiThread("OneSignal#handleOpenedNotification", OneSignalSerializer.convertNotificationClickResultToMap(result));
132131
} catch (JSONException e) {
133132
e.getStackTrace();
134-
android.util.Log.w("TestHenryTest ", e.toString());
133+
Logging.error("Encountered an error attempting to convert INotificationClickResult object to hash map:" + e.toString(), null);
135134
}
136135
}
137136

@@ -162,12 +161,12 @@ public void notificationWillShowInForeground(INotificationReceivedEvent notifica
162161
invokeMethodOnUiThread("OneSignal#handleNotificationWillShowInForeground", receivedMap);
163162
} catch (JSONException e) {
164163
e.getStackTrace();
164+
Logging.error("Encountered an error attempting to convert INotification object to hash map:" + e.toString(), null);
165165
}
166166
}
167167

168168
@Override
169169
public void onPermissionChanged(boolean permission) {
170-
171170
invokeMethodOnUiThread("OneSignal#OSPermissionChanged", OneSignalSerializer.convertPermissionChanged(permission));
172171
}
173172

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

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,15 @@
3030
/** OnesignalPlugin */
3131
public class OneSignalPlugin extends FlutterRegistrarResponder implements FlutterPlugin, MethodCallHandler, ActivityAware {
3232

33-
private boolean hasSetRequiresPrivacyConsent = false;
34-
private boolean waitingForUserPrivacyConsent = false;
35-
3633
public OneSignalPlugin() {
3734
}
3835

3936
private void init(Context context, BinaryMessenger messenger)
4037
{
4138
this.context = context;
4239
this.messenger = messenger;
43-
40+
// TODO version
4441
// OneSignal.sdkType = "flutter";
45-
46-
waitingForUserPrivacyConsent = false;
4742
channel = new MethodChannel(messenger, "OneSignal");
4843
channel.setMethodCallHandler(this);
4944

@@ -54,9 +49,6 @@ private void init(Context context, BinaryMessenger messenger)
5449
OneSignalUser.registerWith(messenger);
5550
OneSignalPushSubscription.registerWith(messenger);
5651
OneSignalNotifications.registerWith(messenger);
57-
// OneSignalTagsController.registerWith(messenger);
58-
// OneSignalInAppMessagingController.registerWith(messenger);
59-
// OneSignalOutcomeEventsController.registerWith(messenger);
6052
}
6153

6254
@Override
@@ -73,8 +65,6 @@ public void onDetachedFromEngine(@NonNull FlutterPlugin.FlutterPluginBinding bin
7365
}
7466

7567
private void onDetachedFromEngine() {
76-
// OneSignal.setNotificationOpenedHandler(null);
77-
// OneSignal.setInAppMessageClickHandler(null);
7868
}
7969

8070
@Override
@@ -116,7 +106,7 @@ public boolean onViewDestroy(FlutterNativeView flutterNativeView) {
116106
public void onMethodCall(MethodCall call, Result result) {
117107
if (call.method.contentEquals("OneSignal#initialize"))
118108
this.initWithContext(call, result);
119-
else if (call.method.contentEquals("OneSignal#getRequiresPrivacyConsent"))
109+
else if (call.method.contentEquals("OneSignal#requiresPrivacyConsent"))
120110
replySuccess(result, OneSignal.getRequiresPrivacyConsent());
121111
else if (call.method.contentEquals("OneSignal#setRequiresPrivacyConsent"))
122112
this.setRequiresPrivacyConsent(call, result);
@@ -135,26 +125,18 @@ else if (call.method.contentEquals("OneSignal#logout"))
135125
private void initWithContext(MethodCall call, Result reply) {
136126
String appId = call.argument("appId");
137127
OneSignal.initWithContext(context, appId);
138-
// if (hasSetRequiresPrivacyConsent && !OneSignal.userProvidedPrivacyConsent())
139-
// this.waitingForUserPrivacyConsent = true;
140-
// else
141-
// this.addObservers();
142-
143128
replySuccess(reply, null);
144129
}
145130

146131
private void setRequiresPrivacyConsent(MethodCall call, Result reply) {
147132
boolean required = call.argument("required");
148-
149133
OneSignal.setRequiresPrivacyConsent(required);
150-
151134
replySuccess(reply, null);
152135
}
153136

154137
private void setPrivacyConsent(MethodCall call, Result reply) {
155138
boolean granted = call.argument("granted");
156139
OneSignal.setPrivacyConsent(granted);
157-
158140
replySuccess(reply, null);
159141
}
160142

@@ -166,17 +148,4 @@ private void logout(MethodCall call, Result result) {
166148
OneSignal.logout();
167149
replySuccess(result, null);
168150
}
169-
170-
static class OSFlutterHandler extends FlutterRegistrarResponder {
171-
protected final Result result;
172-
protected final String methodName;
173-
protected final AtomicBoolean replySubmitted = new AtomicBoolean(false);
174-
175-
OSFlutterHandler(BinaryMessenger messenger, MethodChannel channel, Result res, String methodName) {
176-
this.messenger = messenger;
177-
this.channel = channel;
178-
this.result = res;
179-
this.methodName = methodName;
180-
}
181-
}
182151
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.flutter.plugin.common.PluginRegistry.Registrar;
2323

2424
public class OneSignalPushSubscription extends FlutterRegistrarResponder implements MethodCallHandler, ISubscriptionChangedHandler {
25-
private MethodChannel channel;
2625

2726
static void registerWith(BinaryMessenger messenger) {
2827
OneSignalPushSubscription controller = new OneSignalPushSubscription();

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import io.flutter.plugin.common.PluginRegistry.Registrar;
1515

1616
public class OneSignalSession extends FlutterRegistrarResponder implements MethodCallHandler {
17-
private MethodChannel channel;
1817

1918
static void registerWith(BinaryMessenger messenger) {
2019
OneSignalSession controller = new OneSignalSession();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ else if (call.method.contentEquals("OneSignal#removeEmail"))
4242
this.removeEmail(call, result);
4343
else if (call.method.contentEquals("OneSignal#addSms"))
4444
this.addSms(call, result);
45-
else if (call.method.contentEquals("OneSignal#removeSMS"))
45+
else if (call.method.contentEquals("OneSignal#removeSms"))
4646
this.removeSms(call, result);
4747
else if (call.method.contentEquals("OneSignal#addTags"))
4848
this.addTags(call, result);
@@ -52,7 +52,7 @@ else if (call.method.contentEquals("OneSignal#removeTags"))
5252
replyNotImplemented(result);
5353
}
5454

55-
private void setLanguage(MethodCall call, final Result result) {
55+
private void setLanguage(MethodCall call, Result result) {
5656
String language = call.argument("language");
5757
if (language != null && language.length() == 0)
5858
language = null;

0 commit comments

Comments
 (0)