refactor: move start method to PlayerService

cliambrown · Dec 4, 2021 · b1bd45b · b1bd45b
1 parent 3b5b741
commit b1bd45b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 25 deletions.
diff --git a/app/src/main/java/com/cliambrown/easynoise/NotificationReceiver.kt b/app/src/main/java/com/cliambrown/easynoise/NotificationReceiver.kt
@@ -3,7 +3,6 @@ package com.cliambrown.easynoise
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import com.cliambrown.easynoise.helpers.*
 
 class NotificationReceiver : BroadcastReceiver() {
@@ -14,6 +13,6 @@ class NotificationReceiver : BroadcastReceiver() {
         if (!actions.contains(action) || action == null) {
             return
         }
-        Util.startPlayerService(context, action)
+        PlayerService.start(context, action)
     }
 }
diff --git a/app/src/main/java/com/cliambrown/easynoise/OutsidePauseReceiver.kt b/app/src/main/java/com/cliambrown/easynoise/OutsidePauseReceiver.kt
@@ -48,7 +48,7 @@ class OutsidePauseReceiver : BroadcastReceiver() {
         }
 
         if (playerAction != null) {
-            Util.startPlayerService(context, playerAction)
+            PlayerService.start(context, playerAction)
         }
     }
 }
diff --git a/app/src/main/java/com/cliambrown/easynoise/PlayerService.kt b/app/src/main/java/com/cliambrown/easynoise/PlayerService.kt
@@ -2,13 +2,15 @@ package com.cliambrown.easynoise
 
 import android.app.Activity
 import android.app.Service
+import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.SharedPreferences
 import android.media.AudioAttributes
 import android.media.AudioManager
 import android.media.SoundPool
 import android.os.Binder
+import android.os.Build
 import android.os.IBinder
 import com.cliambrown.easynoise.helpers.*
 import android.widget.Toast
@@ -272,4 +274,14 @@ class PlayerService : Service(), SoundPool.OnLoadCompleteListener {
         }
         if (tempIsPlaying) play(false)
     }
+
+    companion object {
+        fun start(context: Context, action: String): Boolean {
+            Intent(context, PlayerService::class.java).setAction(action).run {
+                if (Build.VERSION.SDK_INT < 26) context.startService(this)
+                else context.startForegroundService(this)
+            }
+            return true
+        }
+    }
 }
diff --git a/app/src/main/java/com/cliambrown/easynoise/helpers/Util.kt b/app/src/main/java/com/cliambrown/easynoise/helpers/Util.kt