Skip to content

Commit b0ecdf3

Browse files
committed
remove unused activity
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent 51b6a34 commit b0ecdf3

3 files changed

Lines changed: 14 additions & 5 deletions

File tree

app/src/main/java/com/nextcloud/client/player/media3/Media3PlaybackModel.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import com.nextcloud.client.player.model.file.PlaybackFiles
2929
import com.nextcloud.client.player.model.state.PlaybackState
3030
import com.nextcloud.client.player.model.state.RepeatMode
3131
import com.nextcloud.client.player.util.PeriodicAction
32+
import com.owncloud.android.datamodel.OCFile
3233
import kotlinx.coroutines.CoroutineScope
3334
import kotlinx.coroutines.Dispatchers
3435
import kotlinx.coroutines.SupervisorJob
@@ -209,6 +210,15 @@ class Media3PlaybackModel @Inject constructor(
209210
}
210211
}
211212

213+
override fun stopPlaying(file: OCFile) {
214+
controller?.run {
215+
val mediaItemIndex = indexOfFirst { it.mediaId == file.localId.toString() }
216+
if (mediaItemIndex >= 0) {
217+
release()
218+
}
219+
}
220+
}
221+
212222
private fun onPlaybackUpdate() {
213223
state.ifPresent(modelCompositeListener::onPlaybackUpdate)
214224
}

app/src/main/java/com/nextcloud/client/player/model/PlaybackModel.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.nextcloud.client.player.model.file.PlaybackFile
1212
import com.nextcloud.client.player.model.file.PlaybackFiles
1313
import com.nextcloud.client.player.model.state.PlaybackState
1414
import com.nextcloud.client.player.model.state.RepeatMode
15+
import com.owncloud.android.datamodel.OCFile
1516
import kotlinx.coroutines.flow.Flow
1617
import java.util.Optional
1718

@@ -50,6 +51,8 @@ interface PlaybackModel {
5051

5152
fun switchToFile(file: PlaybackFile)
5253

54+
fun stopPlaying(file: OCFile)
55+
5356
interface Listener {
5457

5558
fun onPlaybackUpdate(state: PlaybackState)

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2106,7 +2106,7 @@ class FileDisplayActivity :
21062106

21072107
if (result.isSuccess) {
21082108
val removedFile = operation.file
2109-
tryStopPlaying(removedFile)
2109+
file?.let { playbackModel.stopPlaying(it) }
21102110
val leftFragment = this.leftFragment
21112111

21122112
// check if file is still available, if so do nothing
@@ -2167,10 +2167,6 @@ class FileDisplayActivity :
21672167
}
21682168
}
21692169

2170-
private fun tryStopPlaying(file: OCFile) {
2171-
// TODO: STOP PLAYER
2172-
}
2173-
21742170
/**
21752171
* Updates the view associated to the activity after the finish of an operation trying to move a file.
21762172
*

0 commit comments

Comments
 (0)