From 83798a31eba904358a9384dc4a48fa0a9701a260 Mon Sep 17 00:00:00 2001 From: Alexandre Jacinto Date: Wed, 9 Oct 2024 15:40:16 +0100 Subject: [PATCH 1/7] chore: update dependency to OSFirebaseMessagingLib-Android References: https://outsystemsrd.atlassian.net/browse/RMET-2948 --- src/android/com/outsystems/firebase/cloudmessaging/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/com/outsystems/firebase/cloudmessaging/build.gradle b/src/android/com/outsystems/firebase/cloudmessaging/build.gradle index f6a64b4..eb19bc6 100644 --- a/src/android/com/outsystems/firebase/cloudmessaging/build.gradle +++ b/src/android/com/outsystems/firebase/cloudmessaging/build.gradle @@ -23,7 +23,7 @@ apply plugin: 'kotlin-kapt' dependencies { implementation("com.github.outsystems:oscore-android:1.2.0@aar") implementation("com.github.outsystems:oscordova-android:2.0.1@aar") - implementation("com.github.outsystems:osfirebasemessaging-android:1.2.2@aar") + implementation("com.github.outsystems:osfirebasemessaging-android:1.2.3-dev@aar") implementation("com.github.outsystems:oslocalnotifications-android:1.0.0@aar") implementation("com.google.code.gson:gson:2.8.9") From 835b36961af1aaa0c37643e2bd2d707cf7e5f993 Mon Sep 17 00:00:00 2001 From: Alexandre Jacinto Date: Wed, 9 Oct 2024 17:05:00 +0100 Subject: [PATCH 2/7] feat: pass app's package name to 'registerDevice' and 'unregisterDevice' References: https://outsystemsrd.atlassian.net/browse/RMET-2948 --- .../firebase/cloudmessaging/OSFirebaseCloudMessaging.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/com/outsystems/firebase/cloudmessaging/OSFirebaseCloudMessaging.kt b/src/android/com/outsystems/firebase/cloudmessaging/OSFirebaseCloudMessaging.kt index 307d5fa..9cc5080 100755 --- a/src/android/com/outsystems/firebase/cloudmessaging/OSFirebaseCloudMessaging.kt +++ b/src/android/com/outsystems/firebase/cloudmessaging/OSFirebaseCloudMessaging.kt @@ -275,7 +275,7 @@ class OSFirebaseCloudMessaging : CordovaImplementation() { flow?.collect { if (it == OSFCMPermissionEvents.Granted) { - if (controller.registerDevice()) { + if (controller.registerDevice(this.getPackageAppName())) { sendSuccess(callbackContext) } else { sendError(callbackContext, FirebaseMessagingError.REGISTRATION_ERROR) @@ -287,7 +287,7 @@ class OSFirebaseCloudMessaging : CordovaImplementation() { } private suspend fun unregisterDevice(callbackContext: CallbackContext) { - if (controller.unregisterDevice()) { + if (controller.unregisterDevice(this.getPackageAppName())) { sendSuccess(callbackContext) } else { sendError(callbackContext, FirebaseMessagingError.UNREGISTRATION_ERROR) From d2db2699f30fc71950d614d69ed0c6a06bc33366 Mon Sep 17 00:00:00 2001 From: Alexandre Jacinto Date: Wed, 9 Oct 2024 17:55:44 +0100 Subject: [PATCH 3/7] chore: update dependency to OSFirebaseMessagingLib-Android References: https://outsystemsrd.atlassian.net/browse/RMET-2948 --- src/android/com/outsystems/firebase/cloudmessaging/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/com/outsystems/firebase/cloudmessaging/build.gradle b/src/android/com/outsystems/firebase/cloudmessaging/build.gradle index eb19bc6..2c1a227 100644 --- a/src/android/com/outsystems/firebase/cloudmessaging/build.gradle +++ b/src/android/com/outsystems/firebase/cloudmessaging/build.gradle @@ -23,7 +23,7 @@ apply plugin: 'kotlin-kapt' dependencies { implementation("com.github.outsystems:oscore-android:1.2.0@aar") implementation("com.github.outsystems:oscordova-android:2.0.1@aar") - implementation("com.github.outsystems:osfirebasemessaging-android:1.2.3-dev@aar") + implementation("com.github.outsystems:osfirebasemessaging-android:1.2.3@aar") implementation("com.github.outsystems:oslocalnotifications-android:1.0.0@aar") implementation("com.google.code.gson:gson:2.8.9") From f0fccd7cf43a114826e5c145ac5389317075c1b8 Mon Sep 17 00:00:00 2001 From: Alexandre Jacinto Date: Wed, 9 Oct 2024 18:01:32 +0100 Subject: [PATCH 4/7] chore: update changelog and raise version References: https://outsystemsrd.atlassian.net/browse/RMET-2948 --- CHANGELOG.md | 5 ++++- package.json | 2 +- plugin.xml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee1e939..5b85990 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 The changes documented here do not include those from the original repository. -## [Unreleased] +## [Version 2.3.3] + +### Features +- (android) Subscribe to app general topic when registering device (and unsubscribe when unregistering) (https://outsystemsrd.atlassian.net/browse/RMET-2948). ### Fix - (ios) `NotificationClickedV2` not being triggered when deep link property is not set (https://outsystemsrd.atlassian.net/browse/RMET-3695). diff --git a/package.json b/package.json index e2bbe45..cc641b6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.outsystems.firebase.cloudmessaging", - "version": "2.3.2", + "version": "2.3.3", "description": "Outsystems plugin for Firebase Cloud Messaging", "keywords": [ "ecosystem:cordova", diff --git a/plugin.xml b/plugin.xml index 48106be..16eb409 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,5 +1,5 @@ - + OSFirebaseCloudMessaging Outsystems plugin for Firebase Cloud Messaging From 27d4c209e970e79e56e2dd0e99e02aaa9c1fda17 Mon Sep 17 00:00:00 2001 From: Alexandre Jacinto Date: Thu, 10 Oct 2024 09:25:03 +0100 Subject: [PATCH 5/7] chore: set version to unreleased References: https://outsystemsrd.atlassian.net/browse/RMET-2948 --- CHANGELOG.md | 2 +- package.json | 2 +- plugin.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b85990..aeebc5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 The changes documented here do not include those from the original repository. -## [Version 2.3.3] +## [Unreleased] ### Features - (android) Subscribe to app general topic when registering device (and unsubscribe when unregistering) (https://outsystemsrd.atlassian.net/browse/RMET-2948). diff --git a/package.json b/package.json index cc641b6..e2bbe45 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.outsystems.firebase.cloudmessaging", - "version": "2.3.3", + "version": "2.3.2", "description": "Outsystems plugin for Firebase Cloud Messaging", "keywords": [ "ecosystem:cordova", diff --git a/plugin.xml b/plugin.xml index 16eb409..48106be 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,5 +1,5 @@ - + OSFirebaseCloudMessaging Outsystems plugin for Firebase Cloud Messaging From 779d9ac14cd1afa8b62e6bd630b2874924d28933 Mon Sep 17 00:00:00 2001 From: Alexandre Jacinto Date: Thu, 10 Oct 2024 09:28:07 +0100 Subject: [PATCH 6/7] chore: update dependency to OSFirebaseMessagingLib-Android References: https://outsystemsrd.atlassian.net/browse/RMET-2948 --- src/android/com/outsystems/firebase/cloudmessaging/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/com/outsystems/firebase/cloudmessaging/build.gradle b/src/android/com/outsystems/firebase/cloudmessaging/build.gradle index 2c1a227..eb19bc6 100644 --- a/src/android/com/outsystems/firebase/cloudmessaging/build.gradle +++ b/src/android/com/outsystems/firebase/cloudmessaging/build.gradle @@ -23,7 +23,7 @@ apply plugin: 'kotlin-kapt' dependencies { implementation("com.github.outsystems:oscore-android:1.2.0@aar") implementation("com.github.outsystems:oscordova-android:2.0.1@aar") - implementation("com.github.outsystems:osfirebasemessaging-android:1.2.3@aar") + implementation("com.github.outsystems:osfirebasemessaging-android:1.2.3-dev@aar") implementation("com.github.outsystems:oslocalnotifications-android:1.0.0@aar") implementation("com.google.code.gson:gson:2.8.9") From 0203d4f1c671066e93a407b23f17a60d9989282d Mon Sep 17 00:00:00 2001 From: Alexandre Jacinto Date: Fri, 11 Oct 2024 16:43:59 +0100 Subject: [PATCH 7/7] chore: update dependency to OSLocalNotificationsLib-Android References: https://outsystemsrd.atlassian.net/browse/RMET-2948 --- src/android/com/outsystems/firebase/cloudmessaging/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/com/outsystems/firebase/cloudmessaging/build.gradle b/src/android/com/outsystems/firebase/cloudmessaging/build.gradle index eb19bc6..4ff8c93 100644 --- a/src/android/com/outsystems/firebase/cloudmessaging/build.gradle +++ b/src/android/com/outsystems/firebase/cloudmessaging/build.gradle @@ -24,7 +24,7 @@ dependencies { implementation("com.github.outsystems:oscore-android:1.2.0@aar") implementation("com.github.outsystems:oscordova-android:2.0.1@aar") implementation("com.github.outsystems:osfirebasemessaging-android:1.2.3-dev@aar") - implementation("com.github.outsystems:oslocalnotifications-android:1.0.0@aar") + implementation("com.github.outsystems:oslocalnotifications-android:1.1.0@aar") implementation("com.google.code.gson:gson:2.8.9")