Skip to content

Commit 6462641

Browse files
committed
Remove OSInAppMessage Android
* Remove OSInAppMessage * Remove InAppMessage Lifecycle HandlerParams methods * Remove InAppMessage Lifecycle Flutter methods * Move invokeMethodonUiThread for InAppMessageLifecycle methods in setInAppMessageLifecycleHandler
1 parent 68b8e36 commit 6462641

File tree

1 file changed

+4
-80
lines changed

1 file changed

+4
-80
lines changed

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

Lines changed: 4 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -168,14 +168,6 @@ else if (call.method.contentEquals("OneSignal#initNotificationOpenedHandlerParam
168168
this.initNotificationOpenedHandlerParams();
169169
else if (call.method.contentEquals("OneSignal#initInAppMessageClickedHandlerParams"))
170170
this.initInAppMessageClickedHandlerParams();
171-
else if (call.method.contentEquals("OneSignal#onWillDisplayInAppMessageHandlerParams"))
172-
this.OnWillDisplayInAppMessageHandlerParams();
173-
else if (call.method.contentEquals("OneSignal#onDidDisplayInAppMessageHandlerParams"))
174-
this.OnDidDisplayInAppMessageHandlerParams();
175-
else if (call.method.contentEquals("OneSignal#onWillDismissInAppMessageHandlerParams"))
176-
this.OnWillDismissInAppMessageHandlerParams();
177-
else if (call.method.contentEquals("OneSignal#onDidDismissInAppMessageHandlerParams"))
178-
this.OnDidDismissInAppMessageHandlerParams();
179171
else if (call.method.contentEquals("OneSignal#initNotificationWillShowInForegroundHandlerParams"))
180172
this.initNotificationWillShowInForegroundHandlerParams();
181173
else if (call.method.contentEquals("OneSignal#completeNotification"))
@@ -427,98 +419,30 @@ public void inAppMessageClicked(OSInAppMessageAction action) {
427419
}
428420

429421
/* in app message lifecycle */
430-
private void OnWillDisplayInAppMessageHandlerParams() {
431-
this.hasSetOnWillDisplayInAppMessageHandler = true;
432-
if(this.inAppMessage != null) {
433-
this.onWillDisplayInAppMessageFlutter(this.inAppMessage);
434-
this.inAppMessage = null;
435-
}
436-
}
437-
438-
private void OnDidDisplayInAppMessageHandlerParams() {
439-
this.hasSetOnDidDisplayInAppMessageHandler = true;
440-
if(this.inAppMessage != null) {
441-
this.onDidDisplayInAppMessageFlutter(this.inAppMessage);
442-
this.inAppMessage = null;
443-
}
444-
}
445-
446-
private void OnWillDismissInAppMessageHandlerParams() {
447-
this.hasSetOnWillDismissInAppMessageHandler = true;
448-
if(this.inAppMessage != null) {
449-
this.onWillDismissInAppMessageFlutter(this.inAppMessage);
450-
this.inAppMessage = null;
451-
}
452-
}
453-
454-
private void OnDidDismissInAppMessageHandlerParams() {
455-
this.hasSetOnDidDismissInAppMessageHandler = true;
456-
if(this.inAppMessage != null) {
457-
this.onDidDismissInAppMessageFlutter(this.inAppMessage);
458-
this.inAppMessage = null;
459-
}
460-
}
461-
462422
public void setInAppMessageLifecycleHandler() {
463423
OneSignal.setInAppMessageLifecycleHandler(new OSInAppMessageLifecycleHandler() {
464424
@Override
465425
public void onWillDisplayInAppMessage(OSInAppMessage message) {
466-
onWillDisplayInAppMessageFlutter(message);
426+
invokeMethodOnUiThread("OneSignal#onWillDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
467427
}
468428

469429
@Override
470430
public void onDidDisplayInAppMessage(OSInAppMessage message) {
471-
onDidDisplayInAppMessageFlutter(message);
431+
invokeMethodOnUiThread("OneSignal#onDidDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
472432
}
473433

474434
@Override
475435
public void onWillDismissInAppMessage(OSInAppMessage message) {
476-
onWillDismissInAppMessageFlutter(message);
436+
invokeMethodOnUiThread("OneSignal#onWillDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
477437
}
478438

479439
@Override
480440
public void onDidDismissInAppMessage(OSInAppMessage message) {
481-
onDidDismissInAppMessageFlutter(message);
441+
invokeMethodOnUiThread("OneSignal#onDidDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
482442
}
483443
});
484444
}
485445

486-
public void onWillDisplayInAppMessageFlutter(OSInAppMessage message) {
487-
if (!this.hasSetOnWillDisplayInAppMessageHandler) {
488-
this.inAppMessage = message;
489-
return;
490-
}
491-
492-
invokeMethodOnUiThread("OneSignal#onWillDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
493-
}
494-
495-
public void onDidDisplayInAppMessageFlutter(OSInAppMessage message) {
496-
if (!this.hasSetOnDidDisplayInAppMessageHandler) {
497-
this.inAppMessage = message;
498-
return;
499-
}
500-
501-
invokeMethodOnUiThread("OneSignal#onDidDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
502-
}
503-
504-
public void onWillDismissInAppMessageFlutter(OSInAppMessage message) {
505-
if (!this.hasSetOnWillDismissInAppMessageHandler) {
506-
this.inAppMessage = message;
507-
return;
508-
}
509-
510-
invokeMethodOnUiThread("OneSignal#onWillDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
511-
}
512-
513-
public void onDidDismissInAppMessageFlutter(OSInAppMessage message) {
514-
if (!this.hasSetOnDidDismissInAppMessageHandler) {
515-
this.inAppMessage = message;
516-
return;
517-
}
518-
519-
invokeMethodOnUiThread("OneSignal#onDidDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
520-
}
521-
522446
@Override
523447
public void notificationWillShowInForeground(OSNotificationReceivedEvent notificationReceivedEvent) {
524448
if (!this.hasSetNotificationWillShowInForegroundHandler) {

0 commit comments

Comments
 (0)