Code refactor

app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt

@@ -34,7 +34,6 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
     }
 
     private val repository by inject<Repository>()
-
     private var blockRequestPermissions = false
 
     override fun createContentView(): View {
@@ -133,7 +132,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
             if (id >= 0) {
                 lifecycleScope.launch(Dispatchers.Main) {
                     val position = intent.getIntExtra("position", 0)
-                    openQueue(repository.albumById(id).songs!!, position, true)
+                    openQueue(repository.albumByIdAsync(id).songs!!, position, true)
                     handled = true
                 }
             }

app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt

@@ -4,17 +4,23 @@ import android.Manifest
 import android.content.*
 import android.os.Bundle
 import android.os.IBinder
+import androidx.lifecycle.lifecycleScope
 import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.db.toPlayCount
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.MusicServiceEventListener
+import code.name.monkey.retromusic.repository.RealRepository
 import code.name.monkey.retromusic.service.MusicService.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.koin.android.ext.android.inject
 import java.lang.ref.WeakReference
 import java.util.*
 
 abstract class AbsMusicServiceActivity : AbsBaseActivity(), MusicServiceEventListener {
 
     private val mMusicServiceEventListeners = ArrayList<MusicServiceEventListener>()
-
+    private val repository: RealRepository by inject()
     private var serviceToken: MusicPlayerRemote.ServiceToken? = null
     private var musicStateReceiver: MusicStateReceiver? = null
     private var receiverRegistered: Boolean = false
@@ -93,6 +99,22 @@ abstract class AbsMusicServiceActivity : AbsBaseActivity(), MusicServiceEventLis
         for (listener in mMusicServiceEventListeners) {
             listener.onPlayingMetaChanged()
         }
+        lifecycleScope.launch(Dispatchers.IO) {
+            val entity = repository.songPresentInHistory(MusicPlayerRemote.currentSong)
+            if (entity != null) {
+                repository.updateHistorySong(MusicPlayerRemote.currentSong)
+            } else {
+                repository.addSongToHistory(MusicPlayerRemote.currentSong)
+            }
+            val songs = repository.checkSongExistInPlayCount(MusicPlayerRemote.currentSong.id)
+            if (songs.isNotEmpty()) {
+                repository.updateSongInPlayCount(songs.first().apply {
+                    playCount += 1
+                })
+            } else {
+                repository.insertSongInPlayCount(MusicPlayerRemote.currentSong.toPlayCount())
+            }
+        }
     }
 
     override fun onQueueChanged() {

app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt

@@ -73,7 +73,6 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
         setContentView(createContentView())
         chooseFragmentForTheme()
         setupSlidingUpPanel()
-        addMusicServiceEventListener(libraryViewModel)
 
         setupBottomSheet()
 

app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt

@@ -14,7 +14,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.animation.OvershootInterpolator
 import androidx.appcompat.app.AlertDialog
-import androidx.lifecycle.lifecycleScope
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
@@ -182,11 +181,9 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() {
         saveFab = findViewById(R.id.saveTags)
         getIntentExtras()
 
-        lifecycleScope.launchWhenCreated {
-            songPaths = getSongPaths()
-            if (songPaths!!.isEmpty()) {
-                finish()
-            }
+        songPaths = getSongPaths()
+        if (songPaths!!.isEmpty()) {
+            finish()
         }
         setUpViews()
     }
@@ -258,7 +255,7 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() {
         }
     }
 
-    protected abstract suspend fun getSongPaths(): List<String>
+    protected abstract fun getSongPaths(): List<String>
 
     protected fun searchWebFor(vararg keys: String) {
         val stringBuilder = StringBuilder()

app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt

@@ -167,7 +167,7 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
         )
     }
 
-    override suspend fun getSongPaths(): List<String> {
+    override fun getSongPaths(): List<String> {
         val songs = repository.albumById(id).songs
         val paths = ArrayList<String>(songs!!.size)
         for (song in songs) {

app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt

@@ -88,7 +88,7 @@ class SongTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
         writeValuesToFiles(fieldKeyValueMap, null)
     }
 
-    override suspend fun getSongPaths(): List<String> {
+    override fun getSongPaths(): List<String> {
         val paths = ArrayList<String>(1)
         paths.add(songRepository.song(id).data)
         return paths