Browse Source

Merge branch 'bugfix/113-fix-invalid-null-handling-playlist' into 'develop'

Bugfix/113 fix invalid null handling playlist

See merge request funkwhale/funkwhale-android!143
technical/update-compile-sdk-version-docker
Ryan Harg 3 years ago
parent
commit
431b28ecd4
  1. 12
      app/src/main/java/audio/funkwhale/ffa/repositories/PlaylistsRepository.kt
  2. 1
      changes/changelog.d/113.bugfix

12
app/src/main/java/audio/funkwhale/ffa/repositories/PlaylistsRepository.kt

@ -108,7 +108,7 @@ class ManagementPlaylistsRepository(override val context: Context?) :
} }
suspend fun remove(albumId: Int, index: Int) { suspend fun remove(albumId: Int, index: Int) {
context?.let { if (context != null) {
val body = mapOf("index" to index) val body = mapOf("index" to index)
val request = Fuel.post(mustNormalizeUrl("/api/v1/playlists/$albumId/remove/")).apply { val request = Fuel.post(mustNormalizeUrl("/api/v1/playlists/$albumId/remove/")).apply {
@ -122,12 +122,13 @@ class ManagementPlaylistsRepository(override val context: Context?) :
.header("Content-Type", "application/json") .header("Content-Type", "application/json")
.body(Gson().toJson(body)) .body(Gson().toJson(body))
.awaitByteArrayResponseResult() .awaitByteArrayResponseResult()
} } else {
throw IllegalStateException("Illegal state: context is null") throw IllegalStateException("Illegal state: context is null")
}
} }
fun move(id: Int, from: Int, to: Int) { fun move(id: Int, from: Int, to: Int) {
context?.let { if (context != null) {
val body = mapOf("from" to from, "to" to to) val body = mapOf("from" to from, "to" to to)
val request = Fuel.post(mustNormalizeUrl("/api/v1/playlists/$id/move/")).apply { val request = Fuel.post(mustNormalizeUrl("/api/v1/playlists/$id/move/")).apply {
@ -143,7 +144,8 @@ class ManagementPlaylistsRepository(override val context: Context?) :
.body(Gson().toJson(body)) .body(Gson().toJson(body))
.awaitByteArrayResponseResult() .awaitByteArrayResponseResult()
} }
} else {
throw IllegalStateException("Illegal state: context is null")
} }
throw IllegalStateException("Illegal state: context is null")
} }
} }

1
changes/changelog.d/113.bugfix

@ -0,0 +1 @@
Fix App crashes when interacting with playlist
Loading…
Cancel
Save