Add category support for Android

Author: Dave Nottage

Features/Firebase/DW.FCMManager.Android.pas

@@ -95,6 +95,7 @@   TPlatformFCMManager = class(TCustomPlatformFCMManager, IFCMManager)
   protected
     function CanHandleNotification(const AServiceNotification: TPushServiceNotification): Boolean; override;
     procedure CreateChannel; override;
+    procedure ReceiveNotification(const AServiceNotification: TPushServiceNotification); override;
   public
     constructor Create;
     destructor Destroy; override;
@@ -241,6 +242,16 @@ procedure TPlatformFCMManager.CheckPushEnabled(const AHandler: TCheckPushEnabled
   AHandler(IsAndroidPushEnabled);
 end;
 
+procedure TPlatformFCMManager.ReceiveNotification(const AServiceNotification: TPushServiceNotification);
+var
+  LAction: string;
+  LCategory: INotificationCategory;
+begin
+  AServiceNotification.Json.TryGetValue('click_action', LAction);
+  if AServiceNotification.Json.TryGetValue('click_action', LAction) and FindCategory(LAction, LCategory) then
+    LCategory.Handler();
+end;
+
 procedure TPlatformFCMManager.RemoveNotifications;
 var
   LNotifications: TJavaObjectArray<JStatusBarNotification>;

Features/Firebase/DW.FCMManager.pas

@@ -195,6 +195,7 @@   TCustomPlatformFCMManager = class(TInterfacedObject)
     procedure DoStart;
     function FindCategory(const AID: string; out ACategory: INotificationCategory): Boolean;
     procedure HandleNotification(const AServiceNotification: TPushServiceNotification);
+    procedure ReceiveNotification(const AServiceNotification: TPushServiceNotification); virtual;
     procedure Started;
     property Categories: TNotificationCategories read FCategories;
     property IsForeground: Boolean read FIsForeground;
@@ -622,6 +623,11 @@ procedure TCustomPlatformFCMManager.HandleNotification(const AServiceNotificatio
     ReceiveNotificationHandler(Self, AServiceNotification);
 end;
 
+procedure TCustomPlatformFCMManager.ReceiveNotification(const AServiceNotification: TPushServiceNotification);
+begin
+  //
+end;
+
 procedure TCustomPlatformFCMManager.ReceiveNotificationHandler(Sender: TObject; const AServiceNotification: TPushServiceNotification);
 begin
   if Assigned(FOnNotificationReceived) then
@@ -630,6 +636,7 @@ procedure TCustomPlatformFCMManager.ReceiveNotificationHandler(Sender: TObject;
   begin
     if Assigned(FOnMessageReceived) and CanHandleNotification(AServiceNotification) then
       FOnMessageReceived(Self, AServiceNotification.Json);
+    ReceiveNotification(AServiceNotification);
   end;
 end;