bug fixes

Author: rdelrosario

Directory.build.props

@@ -18,7 +18,7 @@
     <RepositoryUrl>https://github.com/CrossGeeks/FirebasePushNotificationPlugin</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>3.2.0</Version>
+    <Version>3.3.0</Version>
 
     <!--<Nullable>enable</Nullable>-->
     <LangVersion>8.0</LangVersion>

Plugin.FirebasePushNotification/FirebasePushNotificationManager.ios.cs

@@ -139,19 +139,30 @@ public static void Initialize(NSDictionary options, bool autoRegistration = true
 
             CrossFirebasePushNotification.Current.NotificationHandler = CrossFirebasePushNotification.Current.NotificationHandler ?? new DefaultPushNotificationHandler();
             Messaging.SharedInstance.AutoInitEnabled = autoRegistration;
-            if (autoRegistration)
+
+            if (options?.ContainsKey(UIApplication.LaunchOptionsRemoteNotificationKey) ?? false)
             {
-                CrossFirebasePushNotification.Current.RegisterForPushNotifications();
-            }
+                var pushPayload = options[UIApplication.LaunchOptionsRemoteNotificationKey] as NSDictionary;
+                if (pushPayload != null)
+                {
+                    var parameters = GetParameters(pushPayload);
 
+                    var notificationResponse = new NotificationResponse(parameters, string.Empty, NotificationCategoryType.Default);
 
-            /*if (options != null && options.Keys != null && options.Keys.Count() != 0 && options.ContainsKey(new NSString("UIApplicationLaunchOptionsRemoteNotificationKey")))
-            {
-                NSDictionary data = options.ObjectForKey(new NSString("UIApplicationLaunchOptionsRemoteNotificationKey")) as NSDictionary;
 
-                // CrossFirebasePushNotification.Current.OnNotificationOpened(GetParameters(data));
+                    /*if (_onNotificationOpened == null && enableDelayedResponse)
+                        delayedNotificationResponse = notificationResponse;
+                    else*/
+                    _onNotificationOpened?.Invoke(CrossFirebasePushNotification.Current, new FirebasePushNotificationResponseEventArgs(notificationResponse.Data, notificationResponse.Identifier, notificationResponse.Type));
 
-            }*/
+                    CrossFirebasePushNotification.Current.NotificationHandler?.OnOpened(notificationResponse);
+                }
+            }
+
+            if (autoRegistration)
+            {
+                CrossFirebasePushNotification.Current.RegisterForPushNotifications();
+            }
 
         }
         public static void Initialize(NSDictionary options, IPushNotificationHandler pushNotificationHandler, bool autoRegistration = true)
@@ -236,7 +247,7 @@ public void RegisterForPushNotifications()
 
             Messaging.SharedInstance.Delegate = CrossFirebasePushNotification.Current as IMessagingDelegate;
 
-            Messaging.SharedInstance.ShouldEstablishDirectChannel = true;
+            //Messaging.SharedInstance.ShouldEstablishDirectChannel = true;
 
             // Register your app for remote notifications.
             if (UIDevice.CurrentDevice.CheckSystemVersion(10, 0))
@@ -283,7 +294,7 @@ public void UnregisterForPushNotifications()
             if (hasToken)
             {
                 CrossFirebasePushNotification.Current.UnsubscribeAll();
-                Messaging.SharedInstance.ShouldEstablishDirectChannel = false;
+                //Messaging.SharedInstance.ShouldEstablishDirectChannel = false;
                 hasToken = false;
                 // Disconnect();
             }
@@ -476,13 +487,16 @@ public void SendDeviceGroupMessage(IDictionary<string, string> parameters, strin
         {
             if (hasToken)
             {
-                var message = new NSMutableDictionary();
-                foreach (var p in parameters)
+                using (var message = new NSMutableDictionary())
                 {
-                    message.Add(new NSString(p.Key), new NSString(p.Value));
-                }
+                    foreach (var p in parameters)
+                    {
+                        message.Add(new NSString(p.Key), new NSString(p.Value));
+                    }
 
-                Messaging.SharedInstance.SendMessage(message, groupKey, messageId, timeOfLive);
+                    Messaging.SharedInstance.SendMessage(message, groupKey, messageId, timeOfLive);
+                }
+                  
             }
         }
 

Plugin.FirebasePushNotification/Plugin.FirebasePushNotification.csproj

@@ -108,11 +108,13 @@
     <AndroidResource Include="Resources\**\*.json" Generator="MSBuild:UpdateAndroidResources" />
     <Compile Include="**\*.android.cs" />
     <Compile Include="**\*.android.*.cs" />
+    <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Firebase.Common" Version="71.1610.0" />
     <PackageReference Include="Xamarin.Firebase.Messaging" Version="71.1740.0" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Base" Version="71.1610.0" />
     <PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="71.1620.0" />
     <PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="71.1601.0" />
-    <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
+    
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('tizen')) ">