From 19c35b2b4cb8e7b5a19cc708095ad626cae73f18 Mon Sep 17 00:00:00 2001
From: Tuan Luong <tuanluong.it@gmail.com>
Date: Tue, 4 Mar 2025 12:37:13 +0700
Subject: [PATCH] Standardizes log tags and refactors log messages

Declares a constant `TAG` for consistent log tag.

Updates log messages to use the constant `TAG`.
---
 .../rnonesignalandroid/RNOneSignal.java       | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java b/android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java
index a7db020d..abfa4eb3 100644
--- a/android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java
+++ b/android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java
@@ -87,7 +87,9 @@ public class RNOneSignal extends ReactContextBaseJavaModule implements
         IPermissionObserver,
         IUserStateObserver,
         LifecycleEventListener,
-        INotificationLifecycleListener{
+        INotificationLifecycleListener {
+    private static final String TAG = "OneSignal";
+
     private ReactApplicationContext mReactApplicationContext;
     private ReactContext mReactContext;
 
@@ -171,8 +173,8 @@ private void removeObservers() {
     }
 
     private void removeHandlers() {
-        if(!oneSignalInitDone) {
-            Log.i("OneSignal", "OneSignal React-Native SDK not initialized yet. Could not remove handlers.");
+        if (!oneSignalInitDone) {
+            Log.i(TAG, "OneSignal React-Native SDK not initialized yet. Could not remove handlers.");
             return;
         }
 
@@ -232,7 +234,7 @@ public void initialize(String appId) {
         OneSignalWrapper.setSdkVersion("050209");
 
         if (oneSignalInitDone) {
-            Log.e("OneSignal", "Already initialized the OneSignal React-Native SDK");
+            Log.e(TAG, "Already initialized the OneSignal React-Native SDK");
             return;
         }
 
@@ -383,8 +385,8 @@ public void onWillDisplay(INotificationWillDisplayEvent event) {
                         event.wait();
                     }
                 }
-            } catch(InterruptedException e){
-                Log.e("InterruptedException" + e.toString(), null);
+            } catch (InterruptedException e) {
+                Log.e(TAG, "InterruptedException " + e.toString());
             }
         } catch (JSONException e) {
             e.printStackTrace();
@@ -395,7 +397,7 @@ public void onWillDisplay(INotificationWillDisplayEvent event) {
     private void displayNotification(String notificationId){
         INotificationWillDisplayEvent event = notificationWillDisplayCache.get(notificationId);
         if (event == null) {
-            Log.e("Could not find onWillDisplayNotification event for notification with id: " + notificationId, null);
+            Log.e(TAG, "Could not find onWillDisplayNotification event for notification with id: " + notificationId);
             return;
         }
         event.getNotification().display();
@@ -405,7 +407,7 @@ private void displayNotification(String notificationId){
     private void preventDefault(String notificationId) {
         INotificationWillDisplayEvent event = notificationWillDisplayCache.get(notificationId);
         if (event == null) {
-            Log.e("Could not find onWillDisplayNotification event for notification with id: " + notificationId, null);
+            Log.e(TAG, "Could not find onWillDisplayNotification event for notification with id: " + notificationId);
             return;
         }
         event.preventDefault();
@@ -432,7 +434,7 @@ public void removePermissionObserver() {
     public void onNotificationPermissionChange(boolean permission) {
         try {
             sendEvent("OneSignal-permissionChanged", RNUtils.convertHashMapToWritableMap(RNUtils.convertPermissionToMap(permission)));
-            Log.i("OneSignal", "sending permission change event");
+            Log.i(TAG, "sending permission change event");
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -546,7 +548,7 @@ public void onPushSubscriptionChange(PushSubscriptionChangedState pushSubscripti
             sendEvent("OneSignal-subscriptionChanged",
                     RNUtils.convertHashMapToWritableMap(
                             RNUtils.convertPushSubscriptionChangedStateToMap(pushSubscriptionChangedState)));
-            Log.i("OneSignal", "sending subscription change event");
+            Log.i(TAG, "sending subscription change event");
         } catch (JSONException e) {
             e.printStackTrace();
         } 
@@ -715,7 +717,7 @@ public void onUserStateChange(UserChangedState state) {
             sendEvent("OneSignal-userStateChanged",
                     RNUtils.convertHashMapToWritableMap(
                             RNUtils.convertUserChangedStateToMap(state)));
-            Log.i("OneSignal", "sending user state change event");
+            Log.i(TAG, "sending user state change event");
         } catch (JSONException e) {
             e.printStackTrace();
         }