Development

CHANGELOG.md

@@ -8,6 +8,15 @@ The changes documented here do not include those from the original repository.
 
 ## [Unreleased]
 
+## 23-02-2023
+- Fix: Android - Add a guard to deal with cases when there's no data in the extras map (https://outsystemsrd.atlassian.net/browse/RMET-2312)
+
+### 10-02-2023
+- Feat: [iOS] Make library available as `xcframework` (https://outsystemsrd.atlassian.net/browse/RMET-2280).
+
+### 26-01-2023
+- Fix: [iOS] Silent Notifications not being triggered. (https://outsystemsrd.atlassian.net/browse/RPM-3590).
+
 ## [Version 1.1.0]
 
 ### 21-12-2022

plugin.xml

@@ -34,34 +34,12 @@
     </config-file>
 
 		<!-- iOS Source Files -->
-    <source-file src="src/ios/CoreDataManager/CoreDataManager.swift" />
-    <source-file src="src/ios/CoreDataManager/NotificationsModel.xcdatamodeld" />
-
-    <source-file src="src/ios/Extensions/Date+Extension.swift" />
-    <source-file src="src/ios/Extensions/Encodable+Extension.swift" />
-
-    <source-file src="src/ios/Managers/MessagingManager.swift" />
-    <source-file src="src/ios/Managers/NotificationManager.swift" />
-
-    <source-file src="src/ios/Model/OSFCMExtraData.swift" />
-    <source-file src="src/ios/Model/OSFCMNotification.swift" />
-
-    <source-file src="src/ios/Protocols/FirebaseMessagingProtocol.swift" />
-    <source-file src="src/ios/Protocols/MessagingProtocol.swift" />
-    <source-file src="src/ios/Protocols/UNUserNotificationCenterProtocol.swift" />
-
-    <source-file src="src/ios/Utils/FirebaseConfigurations.swift" />
-    <source-file src="src/ios/Utils/FirebaseMessagingErrors.swift" />
-    <source-file src="src/ios/Utils/FirebaseNotificationEventType.swift" />
-    <source-file src="src/ios/Utils/OSFCMTokenType.swift" />
-
-    <source-file src="src/ios/FirebaseMessagingApplicationDelegate.swift" />
-    <source-file src="src/ios/FirebaseMessagingController.swift" />
-
-		<source-file src="src/ios/OSFirebaseCloudMessaging.swift" />
+    <source-file src="src/ios/OSFirebaseCloudMessaging.swift" />
     <header-file src="src/ios/AppDelegate+OSFirebaseCloudMessaging.h" />
     <source-file src="src/ios/AppDelegate+OSFirebaseCloudMessaging.m" />
 
+    <framework src="src/ios/frameworks/OSFirebaseMessagingLib.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"/>
 
     <podspec>

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:1.2.0@aar")
-    implementation("com.github.outsystems:osfirebasemessaging-android:1.0.1@aar")
+    implementation("com.github.outsystems:osfirebasemessaging-android:1.0.2@aar")
     implementation("com.github.outsystems:osnotificationpermissions-android:0.0.4@aar")
 
     implementation("com.google.code.gson:gson:2.8.9")

src/ios/AppDelegate+OSFirebaseCloudMessaging.m

@@ -1,6 +1,7 @@
 #import "AppDelegate+OSFirebaseCloudMessaging.h"
 #import "OutSystems-Swift.h"
 #import <objc/runtime.h>
+#import <OSFirebaseMessagingLib/OSFirebaseMessagingLib-Swift.h>
 
 @implementation AppDelegate (OSFirebaseCloudMessaging)
 
@@ -26,15 +27,11 @@ - (BOOL)application:(UIApplication *)application firebaseCloudMessagingPluginDid
     return YES;
 }
 
-- (void)application:(UIApplication *)application firebaseCloudMessagingDidReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
-    [self application:application firebaseCloudMessagingDidReceiveRemoteNotification:userInfo fetchCompletionHandler:completionHandler];
-
+- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
     (void)[FirebaseMessagingApplicationDelegate.shared application:application didReceiveRemoteNotification:userInfo fetchCompletionHandler:completionHandler];
 }
 
-- (void)application:(UIApplication *)application firebaseCloudMessagingdidRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-    [self application:application firebaseCloudMessagingdidRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
-
+- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
     (void)[FirebaseMessagingApplicationDelegate.shared application:application didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
 }