Merge pull request #112 from OutSystems/development

Prepare `main` for `2.3.1`
OutSystems · Aug 12, 2024 · afc5402 · afc5402
2 parents 1873bf0 + 9abe3d8
commit afc5402
Show file tree

Hide file tree

Showing 31 changed files with 1,473 additions and 1,452 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,18 @@ 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.1]
+
+### Fixes
+- Fixes notification click when notification is delievered while the app is in foreground (https://outsystemsrd.atlassian.net/browse/RMET-3559).
+- Removes protected/reserverd keys from being sent as deeplink parameters data when clicking notification, and also when receiving in-app notifications. (https://outsystemsrd.atlassian.net/browse/RMET-3559).
+
+### Fixes
+- Remove return by callbacks, eliminating the disalignment with the threads where the methods are being called (https://outsystemsrd.atlassian.net/browse/RMET-3554).
+
+### Chores:
+- Update `firebaseMessaging` iOS pod to version `10.29.0`.
+
 ## [Version 2.3.0]
 
 ### Features

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.outsystems.firebase.cloudmessaging",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Outsystems plugin for Firebase Cloud Messaging",
   "keywords": [
     "ecosystem:cordova",

diff --git a/plugin.xml b/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin id="com.outsystems.firebase.cloudmessaging" version="2.3.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="com.outsystems.firebase.cloudmessaging" version="2.3.1" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
 
   <name>OSFirebaseCloudMessaging</name>
   <description>Outsystems plugin for Firebase Cloud Messaging</description>
@@ -20,8 +20,7 @@
         <param name="ios-package" value="OSFirebaseCloudMessaging"/>
         <param name="onload" value="true" />
       </feature>
-      <preference name="deployment-target" value="13" />
-      <preference name="UseSwiftLanguageVersion" value="5" />
+      <preference name="SwiftVersion" value="5" />
     </config-file>
 
     <config-file target="*-Info.plist" parent="UIBackgroundModes">
@@ -46,8 +45,6 @@
     <framework src="src/ios/frameworks/OSFirebaseMessagingLib.xcframework" embed="true" custom="true" />
     <framework src="src/ios/frameworks/OSLocalNotificationsLib.xcframework" embed="true" custom="true" />
 
-    <dependency id="cordova-plugin-add-swift-support" url="https://github.com/OutSystems/cordova-plugin-add-swift-support.git#2.0.3-OS1"/>
-
     <!-- Hooks -->
     <hook type="after_prepare" src="hooks/ios/iOSCopyPreferences.js" />
 
@@ -56,8 +53,7 @@
             <source url="https://cdn.cocoapods.org/"/>
         </config>
         <pods use-frameworks="true">
-            <pod name="FirebaseMessaging" spec="10.23.0" />
-            <pod name="OSCommonPluginLib" spec="1.0.0" />
+            <pod name="FirebaseMessaging" spec="10.29.0" />
         </pods>
     </podspec>
 

diff --git 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.0@aar")
+    implementation("com.github.outsystems:osfirebasemessaging-android:1.2.1@aar")
     implementation("com.github.outsystems:oslocalnotifications-android:1.0.0@aar")
 
     implementation("com.google.code.gson:gson:2.8.9")

diff --git a/src/ios/AppDelegate+OSFirebaseCloudMessaging.m b/src/ios/AppDelegate+OSFirebaseCloudMessaging.m
@@ -1,5 +1,4 @@
 #import "AppDelegate+OSFirebaseCloudMessaging.h"
-#import "OutSystems-Swift.h"
 #import <objc/runtime.h>
 #import <OSFirebaseMessagingLib/OSFirebaseMessagingLib-Swift.h>
 

diff --git a/src/ios/OSFCMEventExtensions.swift b/src/ios/OSFCMEventExtensions.swift
@@ -2,18 +2,14 @@ import OSFirebaseMessagingLib
 
 extension OSFCMClickableType: CustomStringConvertible {
     public var description: String {
-        var result: String
-        switch self {
+        return switch self {
         case .notification(latestVersion: let latestVersion):
-            result = "notificationClick"
-            if latestVersion {
-                result += "V2"
-            }
+            "notificationClick\(latestVersion ? "V2" : "")"
         case .action:
-            result = "internalRouteActionClick"
+            "internalRouteActionClick"
+        @unknown default:
+            preconditionFailure("Not supposed to get here")
         }
-
-        return result
     }
 }