@siteed/expo-audio-studio 2.4.1 → 2.6.0

package/android/src/main/java/net/siteed/audiostream/AudioFileHandler.kt

@@ -6,8 +6,13 @@ import java.io.IOException
 import java.io.OutputStream
 import java.io.RandomAccessFile
 import java.util.UUID
+import net.siteed.audiostream.LogUtils
 
 class AudioFileHandler(private val filesDir: File) {
+    companion object {
+        private const val CLASS_NAME = "AudioFileHandler"
+    }
+    
     // Method to write WAV file header
     fun writeWavHeader(out: OutputStream, sampleRateInHz: Int, channels: Int, bitDepth: Int) {
         val header = ByteArray(44)
@@ -103,7 +108,7 @@ class AudioFileHandler(private val filesDir: File) {
                 createNewFile()      // Create the file
             }
         } catch (e: Exception) {
-            Log.e(Constants.TAG, "Failed to create audio file", e)
+            LogUtils.e(CLASS_NAME, "Failed to create audio file", e)
             throw e
         }
     }
@@ -111,20 +116,20 @@ class AudioFileHandler(private val filesDir: File) {
     fun deleteFile(file: File?): Boolean {
         return try {
             if (file == null) {
-                Log.w(Constants.TAG, "Attempted to delete null file")
+                LogUtils.w(CLASS_NAME, "Attempted to delete null file")
                 false
             } else if (!file.exists()) {
-                Log.w(Constants.TAG, "File does not exist: ${file.absolutePath}")
+                LogUtils.w(CLASS_NAME, "File does not exist: ${file.absolutePath}")
                 false
             } else {
                 val wasDeleted = file.delete()
                 if (!wasDeleted) {
-                    Log.w(Constants.TAG, "Failed to delete file: ${file.absolutePath}")
+                    LogUtils.w(CLASS_NAME, "Failed to delete file: ${file.absolutePath}")
                 }
                 wasDeleted
             }
         } catch (e: Exception) {
-            Log.e(Constants.TAG, "Error deleting file: ${file?.absolutePath}", e)
+            LogUtils.e(CLASS_NAME, "Error deleting file: ${file?.absolutePath}", e)
             false
         }
     }

package/android/src/main/java/net/siteed/audiostream/AudioNotificationsManager.kt

@@ -19,8 +19,24 @@ import java.lang.ref.WeakReference
 import java.util.Locale
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.Objects
+import net.siteed.audiostream.LogUtils
 
 class AudioNotificationManager private constructor(context: Context) {
+    companion object {
+        private const val CLASS_NAME = "AudioNotificationManager"
+        private const val WAVEFORM_UPDATE_INTERVAL = 100L
+        private const val UPDATE_INTERVAL = 1000L
+
+        @Volatile
+        private var instance: AudioNotificationManager? = null
+
+        fun getInstance(context: Context): AudioNotificationManager {
+            return instance ?: synchronized(this) {
+                instance ?: AudioNotificationManager(context).also { instance = it }
+            }
+        }
+    }
+    
     private val contextRef = WeakReference(context.applicationContext)
     private val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
     private val mainHandler = Handler(Looper.getMainLooper())
@@ -43,20 +59,6 @@ class AudioNotificationManager private constructor(context: Context) {
     private val waveformRenderer = WaveformRenderer()
     private var lastNotificationHash: Int? = null
 
-    companion object {
-        private const val WAVEFORM_UPDATE_INTERVAL = 100L
-        private const val UPDATE_INTERVAL = 1000L
-
-        @Volatile
-        private var instance: AudioNotificationManager? = null
-
-        fun getInstance(context: Context): AudioNotificationManager {
-            return instance ?: synchronized(this) {
-                instance ?: AudioNotificationManager(context).also { instance = it }
-            }
-        }
-    }
-
     fun initialize(config: RecordingConfig) {
         recordingConfig = config
         createNotificationChannel()
@@ -87,24 +89,24 @@ class AudioNotificationManager private constructor(context: Context) {
         try {
             remoteViews = RemoteViews(context.packageName, R.layout.notification_recording)
             remoteViews.apply {
-                setTextViewText(R.id.notification_title, recordingConfig.notification.title)
-                setTextViewText(R.id.notification_text, recordingConfig.notification.text)
+                setTextViewText(R.id.notification_title, recordingConfig.notification?.title)
+                setTextViewText(R.id.notification_text, recordingConfig.notification?.text)
                 setTextViewText(R.id.notification_duration, formatDuration(0))
                 setViewVisibility(
                     R.id.notification_waveform,
                     if (recordingConfig.showWaveformInNotification &&
-                        recordingConfig.notification.waveform != null) View.VISIBLE else View.GONE
+                        recordingConfig.notification?.waveform != null) View.VISIBLE else View.GONE
                 )
             }
 
             buildNotification(context)
         } catch (e: Exception) {
-            Log.e(Constants.TAG, "Failed to initialize notification", e)
+            LogUtils.e(CLASS_NAME, "Failed to initialize notification", e)
         }
     }
 
     private fun buildNotification(context: Context) {
-        val iconResId = recordingConfig.notification.icon?.let {
+        val iconResId = recordingConfig.notification?.icon?.let {
             getResourceIdByName(it)
         } ?: R.drawable.ic_microphone
 
@@ -214,7 +216,7 @@ class AudioNotificationManager private constructor(context: Context) {
 
             notificationManager.notify(recordingConfig.notification.notificationId, updatedNotification)
         } catch (e: Exception) {
-            Log.e(Constants.TAG, "Failed to update notification actions", e)
+            LogUtils.e(CLASS_NAME, "Failed to update notification actions", e)
         }
     }
 
@@ -296,7 +298,7 @@ class AudioNotificationManager private constructor(context: Context) {
                         setImageViewBitmap(R.id.notification_waveform, waveformBitmap)
                         lastWaveformUpdate = currentTime
                     } catch (e: Exception) {
-                        Log.e(Constants.TAG, "Error generating waveform", e)
+                        LogUtils.e(CLASS_NAME, "Error generating waveform", e)
                     }
                 }
             }
@@ -325,7 +327,7 @@ class AudioNotificationManager private constructor(context: Context) {
             consecutiveUpdateFailures = 0
 
         } catch (e: Exception) {
-            Log.e(Constants.TAG, "Error updating notification", e)
+            LogUtils.e(CLASS_NAME, "Error updating notification", e)
             consecutiveUpdateFailures++
 
             if (consecutiveUpdateFailures >= maxUpdateFailures) {
@@ -360,7 +362,7 @@ class AudioNotificationManager private constructor(context: Context) {
                     .build()
             )
         } catch (e: Exception) {
-            Log.e(Constants.TAG, "Error updating waveform", e)
+            LogUtils.e(CLASS_NAME, "Error updating waveform", e)
         }
     }
 
@@ -380,9 +382,9 @@ class AudioNotificationManager private constructor(context: Context) {
             )
 
             consecutiveUpdateFailures = 0
-            Log.d(Constants.TAG, "Successfully reinitialized notification")
+            LogUtils.d(CLASS_NAME, "Successfully reinitialized notification")
         } catch (e: Exception) {
-            Log.e(Constants.TAG, "Failed to reinitialize notification", e)
+            LogUtils.e(CLASS_NAME, "Failed to reinitialize notification", e)
         }
     }