feature: fixing logs

Author: efraespada

android/src/main/java/com/onesignal/flutter/BackgroundExecutor.java

@@ -34,7 +34,9 @@
  * callback dispatcher, used to invoke Dart callbacks while backgrounded.
  */
 public class BackgroundExecutor implements MethodCallHandler {
-  private static final String TAG = "BackgroundExecutor";
+  private static final String TAG = "OneSignal - BackgroundExecutor";
+  private static final String CHANNEL = "OneSignalBackground";
+  private static final String OSK = "one_signal_key";
   private static final String CALLBACK_HANDLE_KEY = "callback_handle";
   private static final String USER_CALLBACK_HANDLE_KEY = "user_callback_handle";
 
@@ -69,7 +71,7 @@ public static void setPluginRegistrant(
   public static void setCallbackDispatcher(long callbackHandle) {
     Context context = ContextHolder.getApplicationContext();
     SharedPreferences prefs =
-        context.getSharedPreferences("one_signal_key", 0);
+        context.getSharedPreferences(OSK, 0);
     prefs.edit().putLong(CALLBACK_HANDLE_KEY, callbackHandle).apply();
   }
 
@@ -82,7 +84,7 @@ public void onMethodCall(MethodCall call, @NonNull Result result) {
         // is running. From this point forward, the Android side of this plugin can send
         // callback handles through the background method channel, and the Dart side will execute
         // the Dart methods corresponding to those callback handles.
-        Log.i("OneSignal", "Background channel ready");
+        Log.i(TAG, "Background channel ready");
 
         result.success(true);
       } else {
@@ -128,7 +130,7 @@ private void onInitialized() {
    * </ul>
    */
   public void startBackgroundIsolate(IsolateStatusHandler isolate) {
-    Log.i("OneSignal", "Starting background isolate.");
+    Log.i(TAG, "Starting background isolate.");
     if (isNotRunning()) {
       long callbackHandle = getPluginCallbackHandle();
       if (callbackHandle != 0) {
@@ -268,7 +270,7 @@ private long getUserCallbackHandle() {
     }
     SharedPreferences prefs =
         ContextHolder.getApplicationContext()
-            .getSharedPreferences("one_signal_key", 0);
+            .getSharedPreferences(OSK, 0);
     return prefs.getLong(USER_CALLBACK_HANDLE_KEY, 0);
   }
 
@@ -279,7 +281,7 @@ private long getUserCallbackHandle() {
   public static void setUserCallbackHandle(long callbackHandle) {
     Context context = ContextHolder.getApplicationContext();
     SharedPreferences prefs =
-        context.getSharedPreferences("one_signal_key", 0);
+        context.getSharedPreferences(OSK, 0);
     prefs.edit().putLong(USER_CALLBACK_HANDLE_KEY, callbackHandle).apply();
   }
 
@@ -290,15 +292,14 @@ private long getPluginCallbackHandle() {
     }
     SharedPreferences prefs =
         ContextHolder.getApplicationContext()
-            .getSharedPreferences("one_signal_key", 0);
+            .getSharedPreferences(OSK, 0);
     return prefs.getLong(CALLBACK_HANDLE_KEY, 0);
   }
 
   // This channel is responsible for sending requests from Android to Dart to execute Dart
   // callbacks in the background isolate.
   private void initializeMethodChannel(BinaryMessenger isolate) {
-    backgroundChannel =
-        new MethodChannel(isolate, "OneSignalBackground");
+    backgroundChannel = new MethodChannel(isolate, CHANNEL);
     backgroundChannel.setMethodCallHandler(this);
   }
 }

android/src/main/java/com/onesignal/flutter/XNotificationServiceExtension.java

@@ -21,6 +21,7 @@
 
 public class XNotificationServiceExtension implements OSRemoteNotificationReceivedHandler {
 
+    private static final String TAG = "OneSignal - XNotificationServiceExtension";
     public static BackgroundExecutor be;
     public static HashMap<String, OSNotificationReceivedEvent> notificationReceivedEventCache = new HashMap<>();
 
@@ -29,28 +30,28 @@ public void remoteNotificationReceived(Context context, OSNotificationReceivedEv
         OSNotification notification = notificationReceivedEvent.getNotification();
         XNotificationServiceExtension.notificationReceivedEventCache.put(notification.getNotificationId(), notificationReceivedEvent);
         JSONObject data = notification.getAdditionalData();
-        Log.i("OneSignal", "Received Notification Data: " + data.toString());
-        // notificationReceivedEvent.complete(null);
+        Log.i(TAG, "Received Notification Data: " + data.toString());
 
         if (ContextHolder.getApplicationContext() == null) {
             ContextHolder.setApplicationContext(context.getApplicationContext());
         }
         if (XNotificationServiceExtension.be == null) {
             XNotificationServiceExtension.be = new BackgroundExecutor();
         }
-        Log.i("OneSignal", "Checking isolated BackgroundExecutor.");
+        Log.i(TAG, "Checking isolated BackgroundExecutor.");
         try {
             HashMap<String, Object> receivedMap = OneSignalSerializer.convertNotificationReceivedEventToMap(notificationReceivedEvent);
             XNotificationServiceExtension.be.startBackgroundIsolate(new IsolateStatusHandler() {
                 @Override
                 public void done() {
                     if (XNotificationServiceExtension.be != null) {
+                        Log.i(TAG, "Executing dart code in isolate.");
                         XNotificationServiceExtension.be.executeDartCallbackInBackgroundIsolate(receivedMap);
                     }
                 }
             });
         } catch (Exception e) {
-            Log.i("OneSignal", "Exception on XNotificationServiceExtension", e);
+            Log.i(TAG, "Exception while executing dart code in isolate", e);
         }
     }
 }