Update RNReceivedMessageHandler.java

Author: Boris Tacyniak

android/src/main/java/com/dieam/reactnativepushnotification/modules/RNReceivedMessageHandler.java

@@ -9,6 +9,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.content.Context;
 import android.util.Log;
 import android.net.Uri;
 import androidx.annotation.NonNull;
@@ -46,10 +47,11 @@ public void handleReceivedMessage(RemoteMessage message) {
             // ^ It's null when message is from GCM
             RNPushNotificationConfig config = new RNPushNotificationConfig(mFirebaseMessagingService.getApplication());  
 
-            bundle.putString("title", getLocalizedString(remoteNotification.getTitleLocalizationKey(),
-                    remoteNotification.getTitleLocalizationArgs(), remoteNotification.getTitle()));
-            bundle.putString("message", getLocalizedString(remoteNotification.getBodyLocalizationKey(),
-                    remoteNotification.getBodyLocalizationArgs(), remoteNotification.getBody()));
+            String title = getLocalizedString(remoteNotification.getTitle(), remoteNotification.getTitleLocalizationKey(), remoteNotification.getTitleLocalizationArgs());
+            String body = getLocalizedString(remoteNotification.getBody(), remoteNotification.getBodyLocalizationKey(), remoteNotification.getBodyLocalizationArgs());
+
+            bundle.putString("title", title);
+            bundle.putString("message", body);
             bundle.putString("sound", remoteNotification.getSound());
             bundle.putString("color", remoteNotification.getColor());
             bundle.putString("tag", remoteNotification.getTag());
@@ -181,19 +183,27 @@ private void handleRemotePushNotification(ReactApplicationContext context, Bundl
         }
     }
 
-    private String getLocalizedString(String locKey, String[] locArgs, String defaultText) {
-        String packageName = getPackageName();
-        String result = defaultText;
+    private String getLocalizedString(String text, String locKey, String[] locArgs) {
+        if(text != null) {
+          return text;
+        }
+
+        Context context = mFirebaseMessagingService.getApplicationContext();
+        String packageName = context.getPackageName();
+
+        String result = null;
+
         if (locKey != null) {
-            int id = getResources().getIdentifier(locKey, "string", packageName);
+            int id = context.getResources().getIdentifier(locKey, "string", packageName);
             if (id != 0) {
                 if (locArgs != null) {
-                    result = res.getString(id, (Object[]) locArgs);
+                    result = context.getResources().getString(id, (Object[]) locArgs);
                 } else {
-                    result = res.getString(id);
+                    result = context.getResources().getString(id);
                 }
             }
         }
+
         return result;
     }
 }