Skip to content

Fix process death and recreation causing generator conflict #2751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Luna712 wants to merge 1 commit into from
Closed

Fix process death and recreation causing generator conflict #2751

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import java.io.Serializable
import java.util.Calendar
import java.util.UUID

@OptIn(UnstableApi::class)
class GeneratorPlayer : FullScreenPlayer() {
Expand All @@ -139,11 +140,13 @@ class GeneratorPlayer : FullScreenPlayer() {
const val CHANNEL_ID = 7340
const val STOP_ACTION = "stopcs3"

private var lastUsedGenerator: IGenerator? = null
private var generatorMap = mutableMapOf<String, IGenerator>()
fun newInstance(generator: IGenerator, syncData: HashMap<String, String>? = null): Bundle {
Log.i(TAG, "newInstance = $syncData")
lastUsedGenerator = generator
val key = UUID.randomUUID().toString()
generatorMap[key] = generator
return Bundle().apply {
putString("generatorKey", key)
if (syncData != null) putSerializable("syncData", syncData)
}
}
Expand Down Expand Up @@ -2125,13 +2128,17 @@ class GeneratorPlayer : FullScreenPlayer() {
}
}

private var lastUsedGenerator: IGenerator? = null
override fun onBindingCreated(binding: FragmentPlayerBinding, savedInstanceState: Bundle?) {
viewModel = ViewModelProvider(this)[PlayerGeneratorViewModel::class.java]
sync = ViewModelProvider(this)[SyncViewModel::class.java]

val key = arguments?.getString("generatorKey")
lastUsedGenerator = key?.let { generatorMap[it] }
viewModel.attachGenerator(lastUsedGenerator)

unwrapBundle(savedInstanceState)
unwrapBundle(arguments)

super.onBindingCreated(binding, savedInstanceState)

var langFilterList = listOf<String>()
Expand Down