From 7f3deefea8156b6cc403028556b49db07b3fdc88 Mon Sep 17 00:00:00 2001 From: m1ga Date: Thu, 16 Feb 2023 13:22:29 +0100 Subject: [PATCH 1/3] Android: update to latest module --- Module-Source/android/build.gradle | 4 ++-- Module-Source/android/manifest | 2 +- .../pushwoosh/module/PushnotificationsModule.java | 14 ++++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Module-Source/android/build.gradle b/Module-Source/android/build.gradle index 4060880..15ffe53 100644 --- a/Module-Source/android/build.gradle +++ b/Module-Source/android/build.gradle @@ -1,5 +1,5 @@ ext { - pushwoosh = "6.4.4" + pushwoosh = "6.6.8" } dependencies { @@ -7,5 +7,5 @@ dependencies { implementation "com.pushwoosh:pushwoosh-firebase:${pushwoosh}" implementation "com.pushwoosh:pushwoosh-amazon:${pushwoosh}" implementation "com.pushwoosh:pushwoosh-badge:${pushwoosh}" - implementation "com.google.firebase:firebase-messaging:(+,20.0.99]" + implementation "com.google.firebase:firebase-messaging:(+,23.1.1]" } diff --git a/Module-Source/android/manifest b/Module-Source/android/manifest index fe3f0a6..07db75c 100644 --- a/Module-Source/android/manifest +++ b/Module-Source/android/manifest @@ -2,7 +2,7 @@ # this is your module manifest and used by Titanium # during compilation, packaging, distribution, etc. # -version: 6.0.9 +version: 6.1.0 apiversion: 4 architectures: arm64-v8a armeabi-v7a x86 x86_64 description: pushnotifications diff --git a/Module-Source/android/src/com/pushwoosh/module/PushnotificationsModule.java b/Module-Source/android/src/com/pushwoosh/module/PushnotificationsModule.java index eb30aa9..23737b7 100644 --- a/Module-Source/android/src/com/pushwoosh/module/PushnotificationsModule.java +++ b/Module-Source/android/src/com/pushwoosh/module/PushnotificationsModule.java @@ -19,11 +19,13 @@ import androidx.annotation.NonNull; import com.pushwoosh.Pushwoosh; +import com.pushwoosh.RegisterForPushNotificationsResultData; import com.pushwoosh.badge.PushwooshBadge; import com.pushwoosh.exception.GetTagsException; import com.pushwoosh.exception.RegisterForPushNotificationsException; import com.pushwoosh.function.Callback; import com.pushwoosh.function.Result; +import com.pushwoosh.inapp.InAppManager; import com.pushwoosh.inapp.PushwooshInApp; import com.pushwoosh.internal.utils.JsonUtils; import com.pushwoosh.notification.LocalNotification; @@ -149,11 +151,11 @@ public void registerForPushNotifications(KrollFunction success, KrollFunction er registrationSuccessCallback.set(success); registrationErrorCallback.set(error); - Pushwoosh.getInstance().registerForPushNotifications(new Callback() { + Pushwoosh.getInstance().registerForPushNotifications(new Callback() { @Override - public void process(Result result) { + public void process(@NonNull Result result) { if (result.isSuccess()) { - onRegistrationSucceed(result.getData()); + onRegistrationSucceed(result.getData().getToken()); } else if (result.getException() != null) { onRegistrationFailed(result.getException().getLocalizedMessage()); } @@ -170,7 +172,7 @@ public void unregister() { @Kroll.method public void setTags(HashMap params) { - Pushwoosh.getInstance().sendTags(Tags.fromJson(JsonUtils.mapToJson(params)), null); + Pushwoosh.getInstance().setTags(Tags.fromJson(JsonUtils.mapToJson(params)), null); } @Kroll.method @@ -240,12 +242,12 @@ public void addBadgeNumber(int deltaBadge) { @Kroll.method public void setUserId(String userId) { - PushwooshInApp.getInstance().setUserId(userId); + Pushwoosh.getInstance().setUserId(userId); } @Kroll.method public void postEvent(String event, HashMap attributes) { - PushwooshInApp.getInstance().postEvent(event, Tags.fromJson(JsonUtils.mapToJson((Map) attributes))); + InAppManager.getInstance().postEvent(event, Tags.fromJson(JsonUtils.mapToJson((Map) attributes))); } @Kroll.method From fbc5b02bb815d77486c9fc3971b0be8861ca1b2c Mon Sep 17 00:00:00 2001 From: m1ga Date: Wed, 22 Feb 2023 10:40:04 +0100 Subject: [PATCH 2/3] update lib --- Module-Source/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Module-Source/android/build.gradle b/Module-Source/android/build.gradle index 15ffe53..30d3920 100644 --- a/Module-Source/android/build.gradle +++ b/Module-Source/android/build.gradle @@ -1,5 +1,5 @@ ext { - pushwoosh = "6.6.8" + pushwoosh = "6.6.9" } dependencies { From 3224b633a39fa9e4d3cfe0dcef9638a9cf370d4e Mon Sep 17 00:00:00 2001 From: Vitaly Romanychev Date: Thu, 2 Mar 2023 13:09:50 +0700 Subject: [PATCH 3/3] Revert firebase-messaging version change, cleanup unused imports --- Module-Source/android/build.gradle | 2 +- .../src/com/pushwoosh/module/PushnotificationsModule.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Module-Source/android/build.gradle b/Module-Source/android/build.gradle index 30d3920..d055658 100644 --- a/Module-Source/android/build.gradle +++ b/Module-Source/android/build.gradle @@ -7,5 +7,5 @@ dependencies { implementation "com.pushwoosh:pushwoosh-firebase:${pushwoosh}" implementation "com.pushwoosh:pushwoosh-amazon:${pushwoosh}" implementation "com.pushwoosh:pushwoosh-badge:${pushwoosh}" - implementation "com.google.firebase:firebase-messaging:(+,23.1.1]" + implementation "com.google.firebase:firebase-messaging:(+,20.0.99]" } diff --git a/Module-Source/android/src/com/pushwoosh/module/PushnotificationsModule.java b/Module-Source/android/src/com/pushwoosh/module/PushnotificationsModule.java index 23737b7..bc09839 100644 --- a/Module-Source/android/src/com/pushwoosh/module/PushnotificationsModule.java +++ b/Module-Source/android/src/com/pushwoosh/module/PushnotificationsModule.java @@ -26,7 +26,6 @@ import com.pushwoosh.function.Callback; import com.pushwoosh.function.Result; import com.pushwoosh.inapp.InAppManager; -import com.pushwoosh.inapp.PushwooshInApp; import com.pushwoosh.internal.utils.JsonUtils; import com.pushwoosh.notification.LocalNotification; import com.pushwoosh.notification.LocalNotificationReceiver;