react-native-nitro-player 0.5.3 → 0.5.5

package/android/src/main/java/com/margelo/nitro/nitroplayer/HybridAudioDevices.kt

@@ -7,6 +7,7 @@ import android.os.Build
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
 import com.margelo.nitro.NitroModules
+import com.margelo.nitro.nitroplayer.core.NitroPlayerLogger
 
 @DoNotStrip
 @Keep
@@ -83,7 +84,7 @@ class HybridAudioDevices : HybridAudioDevicesSpec() {
 
         // Check if device type is valid for communication
         if (!validCommunicationDeviceTypes.contains(device.type)) {
-            android.util.Log.w(TAG, "Device type ${device.type} is not a valid communication device")
+            NitroPlayerLogger.log("HybridAudioDevices", "Device type ${device.type} is not a valid communication device")
             return false
         }
 
@@ -115,13 +116,14 @@ class HybridAudioDevices : HybridAudioDevicesSpec() {
                     }
 
                     else -> {
-                        android.util.Log.w(TAG, "Unsupported device type for pre-Android 12: ${device.type}")
+                        NitroPlayerLogger.log("HybridAudioDevices", "Unsupported device type for pre-Android 12: ${device.type}")
                         false
                     }
                 }
             }
         } catch (e: Exception) {
-            android.util.Log.e(TAG, "Error setting audio device: ${e.message}", e)
+            NitroPlayerLogger.log("HybridAudioDevices", "Error setting audio device: ${e.message}")
+            e.printStackTrace()
             false
         }
     }

package/android/src/main/java/com/margelo/nitro/nitroplayer/HybridTrackPlayer.kt

@@ -79,6 +79,10 @@ class HybridTrackPlayer : HybridTrackPlayerSpec() {
     @Keep
     override fun setRepeatMode(mode: RepeatMode): Boolean = core.setRepeatMode(mode)
 
+    @DoNotStrip
+    @Keep
+    override fun getRepeatMode(): RepeatMode = core.getRepeatMode()
+
     override fun onChangeTrack(callback: (track: TrackItem, reason: Reason?) -> Unit) {
         core.addOnChangeTrackListener(callback)
     }

package/android/src/main/java/com/margelo/nitro/nitroplayer/connection/AndroidAutoConnectionDetector.kt

@@ -10,6 +10,7 @@ import android.database.Cursor
 import android.net.Uri
 import android.os.Build
 import android.util.Log
+import com.margelo.nitro.nitroplayer.core.NitroPlayerLogger
 
 /**
  * Detects Android Auto connection status using the official Android for Cars API
@@ -51,7 +52,7 @@ class AndroidAutoConnectionDetector(
 
     fun registerCarConnectionReceiver() {
         if (isRegistered) {
-            Log.w(TAG, "Receiver already registered")
+            NitroPlayerLogger.log("AndroidAutoConnection", "Receiver already registered")
             return
         }
 
@@ -66,12 +67,12 @@ class AndroidAutoConnectionDetector(
             }
 
             isRegistered = true
-            Log.i(TAG, "✅ Car connection receiver registered")
+            NitroPlayerLogger.log("AndroidAutoConnection", "✅ Car connection receiver registered")
 
             // Query initial state
             queryForState()
         } catch (e: Exception) {
-            Log.e(TAG, "❌ Error registering car connection receiver: ${e.message}")
+            NitroPlayerLogger.log("AndroidAutoConnection", "❌ Error registering car connection receiver: ${e.message}")
             e.printStackTrace()
         }
     }
@@ -84,9 +85,9 @@ class AndroidAutoConnectionDetector(
         try {
             context.unregisterReceiver(carConnectionReceiver)
             isRegistered = false
-            Log.i(TAG, "🛑 Car connection receiver unregistered")
+            NitroPlayerLogger.log("AndroidAutoConnection", "🛑 Car connection receiver unregistered")
         } catch (e: Exception) {
-            Log.e(TAG, "❌ Error unregistering car connection receiver: ${e.message}")
+            NitroPlayerLogger.log("AndroidAutoConnection", "❌ Error unregistering car connection receiver: ${e.message}")
             e.printStackTrace()
         }
     }
@@ -103,19 +104,19 @@ class AndroidAutoConnectionDetector(
                 null,
             )
         } catch (e: Exception) {
-            Log.e(TAG, "❌ Error querying car connection state: ${e.message}")
+            NitroPlayerLogger.log("AndroidAutoConnection", "❌ Error querying car connection state: ${e.message}")
             e.printStackTrace()
             notifyCarDisconnected()
         }
     }
 
     private fun notifyCarConnected(connectionType: Int) {
-        Log.i(TAG, "🚗 Android Auto CONNECTED (type: $connectionType)")
+        NitroPlayerLogger.log("AndroidAutoConnection", "🚗 Android Auto CONNECTED (type: $connectionType)")
         onConnectionChanged?.invoke(true, connectionType)
     }
 
     private fun notifyCarDisconnected() {
-        Log.i(TAG, "📱 Android Auto DISCONNECTED")
+        NitroPlayerLogger.log("AndroidAutoConnection", "📱 Android Auto DISCONNECTED")
         onConnectionChanged?.invoke(false, CONNECTION_TYPE_NOT_CONNECTED)
     }
 
@@ -124,7 +125,7 @@ class AndroidAutoConnectionDetector(
             context: Context?,
             intent: Intent?,
         ) {
-            Log.i(TAG, "🔔 Car connection broadcast received")
+            NitroPlayerLogger.log("AndroidAutoConnection", "🔔 Car connection broadcast received")
             queryForState()
         }
     }
@@ -138,26 +139,26 @@ class AndroidAutoConnectionDetector(
             response: Cursor?,
         ) {
             if (response == null) {
-                Log.w(TAG, "⚠️ Null response from content provider, treating as disconnected")
+                NitroPlayerLogger.log("AndroidAutoConnection", "⚠️ Null response from content provider, treating as disconnected")
                 notifyCarDisconnected()
                 return
             }
 
             val carConnectionTypeColumn = response.getColumnIndex(CAR_CONNECTION_STATE)
             if (carConnectionTypeColumn < 0) {
-                Log.w(TAG, "⚠️ Connection type column missing, treating as disconnected")
+                NitroPlayerLogger.log("AndroidAutoConnection", "⚠️ Connection type column missing, treating as disconnected")
                 notifyCarDisconnected()
                 return
             }
 
             if (!response.moveToNext()) {
-                Log.w(TAG, "⚠️ Empty response, treating as disconnected")
+                NitroPlayerLogger.log("AndroidAutoConnection", "⚠️ Empty response, treating as disconnected")
                 notifyCarDisconnected()
                 return
             }
 
             val connectionState = response.getInt(carConnectionTypeColumn)
-            Log.i(TAG, "📊 Connection state queried: $connectionState")
+            NitroPlayerLogger.log("AndroidAutoConnection", "📊 Connection state queried: $connectionState")
 
             if (connectionState == CONNECTION_TYPE_NOT_CONNECTED) {
                 notifyCarDisconnected()

package/android/src/main/java/com/margelo/nitro/nitroplayer/core/NitroPlayerLogger.kt

@@ -0,0 +1,31 @@
+package com.margelo.nitro.nitroplayer.core
+
+import android.util.Log
+import com.margelo.nitro.nitroplayer.BuildConfig
+
+object NitroPlayerLogger {
+    // Determine if logging is enabled based on build config
+    val isEnabled: Boolean = BuildConfig.DEBUG
+
+    /**
+     * Preferred overload: message lambda is only evaluated when logging is enabled.
+     * Use trailing lambda syntax: NitroPlayerLogger.log("Tag") { "msg $value" }
+     * The lambda is inlined (no heap allocation) and skipped entirely when disabled.
+     */
+    inline fun log(header: String = "NitroPlayer", message: () -> String) {
+        if (isEnabled) {
+            Log.d(header, message())
+        }
+    }
+
+    /**
+     * Compatibility overload for existing call sites.
+     * Note: the String is evaluated at the call site before this function runs.
+     * Migrate to the lambda overload for hot paths.
+     */
+    fun log(header: String = "NitroPlayer", message: String) {
+        if (isEnabled) {
+            Log.d(header, message)
+        }
+    }
+}