wip

Author: nift4

app/src/main/kotlin/org/akanework/gramophone/logic/utils/AfFormatTracker.kt

@@ -716,7 +716,7 @@ class AfFormatTracker(
                 oid, sr,
                 getHalFormat(audioTrack), getHalChannelCount(audioTrack), mp?.channelMask,
                 grantedFlags, getIdFromDump(dump), findAfTrackFlags(dump, latency, audioTrack, grantedFlags)
-            )
+            ) // TODO find policy port ID: https://cs.android.com/android/_/android/platform/frameworks/av/+/20b9ef0b55c9150ae11057ab997ae61be2d496ef
         }.let {
             if (LOG_EVENTS)
                 Log.d(TAG, "audio hal format changed to: $it")

app/src/main/kotlin/org/akanework/gramophone/logic/utils/GramophoneShuffleOrder.kt

@@ -5,9 +5,8 @@ import androidx.annotation.OptIn
 import androidx.media3.common.C
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.source.ShuffleOrder
-import androidx.media3.session.MediaController
-import kotlin.random.Random
 import org.akanework.gramophone.logic.utils.exoplayer.EndedWorkaroundPlayer
+import kotlin.random.Random
 
 /**
  * This shuffle order will take "firstIndex" as first song and play all songs after it.
@@ -173,10 +172,16 @@ class CircularShuffleOrder private constructor(
                 if (data == null || data.length < 2) return Persistent(Random.nextLong(), null)
                 val split = data.split(';')
                 if (split.isEmpty()) return Persistent(Random.nextLong(), null)
-                return Persistent(
-                    split[0].toLong(), if (split.size > 1) split[1]
-                        .split(',').map(String::toInt).toIntArray() else null
-                )
+                return try {
+                    Persistent(
+                        split[0].toLong(), if (split.size > 1) split[1]
+                            .split(',').map(String::toInt).toIntArray() else null
+                    )
+                } catch (e: NumberFormatException) {
+                    // might happen with some real bad luck?
+                    Log.e(TAG, "gave up trying to restore shuffle order: " + Log.getStackTraceString(e))
+                    Persistent(Random.nextLong(), null)
+                }
             }
         }
 

app/src/main/kotlin/org/akanework/gramophone/logic/utils/LastPlayedManager.kt

@@ -24,13 +24,13 @@ import android.util.Base64
 import android.util.Log
 import androidx.annotation.OptIn
 import androidx.core.content.edit
+import androidx.core.net.toUri
 import androidx.media3.common.MediaItem
 import androidx.media3.common.MediaMetadata
 import androidx.media3.common.PlaybackParameters
 import androidx.media3.common.Player
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.session.MediaSession.MediaItemsWithStartPosition
-import java.nio.charset.StandardCharsets
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -49,6 +49,7 @@ import uk.akane.libphonograph.items.artistId
 import uk.akane.libphonograph.items.author
 import uk.akane.libphonograph.items.cdTrackNumber
 import uk.akane.libphonograph.items.modifiedDate
+import java.nio.charset.StandardCharsets
 
 @OptIn(UnstableApi::class)
 class LastPlayedManager(
@@ -355,7 +356,7 @@ private class SafeDelimitedStringDecat(delimiter: String, str: String) {
     fun readInt(): Int? = read()?.toInt()
     fun readLong(): Long? = read()?.toLong()
     fun readBool(): Boolean? = read()?.toBooleanStrict()
-    fun readUri(): Uri? = Uri.parse(readStringSafe())
+    fun readUri(): Uri? = readStringSafe()!!.toUri()
     fun skip() {
         read()
     }

app/src/main/kotlin/org/akanework/gramophone/ui/AudioPreviewActivity.kt

@@ -300,7 +300,7 @@ class AudioPreviewActivity : AppCompatActivity(), View.OnClickListener {
                     try {
                         if (hasScopedStorageV1()) MediaStore.getMediaUri(this, uri) else null
                     } catch (e: Exception) {
-                        if (e.message != "Provider for this Uri is not supported.")
+                        if (e.message != "Provider for this Uri is not supported." && e !is SecurityException)
                             throw e
                         null
                     } ?: run {

app/src/main/kotlin/org/akanework/gramophone/ui/adapters/SongAdapter.kt

@@ -39,6 +39,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.akanework.gramophone.R
+import org.akanework.gramophone.logic.getFile
 import org.akanework.gramophone.ui.MainActivity
 import org.akanework.gramophone.ui.MediaControllerViewModel
 import org.akanework.gramophone.ui.components.NowPlayingDrawable
@@ -300,7 +301,7 @@ class SongAdapter(
         }
 
         override fun getFile(item: MediaItem): File {
-            return item.localConfiguration!!.uri.toFile()
+            return item.getFile()
         }
 
         override fun getTitle(item: MediaItem): String {

app/src/main/kotlin/org/akanework/gramophone/ui/components/LegacyLyricsAdapter.kt

@@ -29,7 +29,6 @@ import org.akanework.gramophone.logic.GramophonePlaybackService
 import org.akanework.gramophone.logic.dpToPx
 import org.akanework.gramophone.logic.getBooleanStrict
 import org.akanework.gramophone.logic.ui.CustomSmoothScroller
-import org.akanework.gramophone.logic.ui.CustomSmoothScroller.SNAP_TO_START
 import org.akanework.gramophone.logic.ui.MyRecyclerView
 import org.akanework.gramophone.logic.utils.MediaStoreUtils
 import org.akanework.gramophone.ui.MainActivity
@@ -317,7 +316,7 @@ class LegacyLyricsAdapter(
     fun smoothScrollTo(position: Int, noAnimation: Boolean = false) {
         val smoothScroller = createSmoothScroller(noAnimation || forceNoAnimation)
         smoothScroller.targetPosition = position
-        recyclerView!!.layoutManager!!.startSmoothScroll(
+        recyclerView?.layoutManager?.startSmoothScroll(
             smoothScroller
         )
     }