mirrors/grayjay
0
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2025-09-18 07:22:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Crashfix in nsdmanager. StateSync reconnects less often. Channels are closed when sending fails in sync.

Browse source
This commit is contained in:
Koen J 2025-05-01 21:53:48 +02:00
commit 9f78e9b7dd
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/futo/platformplayer/casting/StateCasting.kt
View file

@ -176,7 +176,11 @@ class StateCasting {
fun stopDiscovering() { fun stopDiscovering() {
_nsdManager?.apply { _nsdManager?.apply {
_discoveryListeners.forEach { _discoveryListeners.forEach {
stopServiceDiscovery(it.value) try {
stopServiceDiscovery(it.value)
} catch (e: Throwable) {
//Ignored
}
} }
} }
} }

5
app/src/main/java/com/futo/platformplayer/states/StateSync.kt
View file

@ -460,10 +460,10 @@ class StateSync {
Log.i(TAG, "Started relay session.") Log.i(TAG, "Started relay session.")
} catch (e: Throwable) { } catch (e: Throwable) {
Log.e(TAG, "Relay session failed.", e) Log.e(TAG, "Relay session failed.", e)
Thread.sleep(5000)
} finally { } finally {
_relaySession?.stop() _relaySession?.stop()
_relaySession = null _relaySession = null
Thread.sleep(5000)
} }
} }
}.apply { start() } }.apply { start() }
@ -737,6 +737,9 @@ class StateSync {
val json = String(dataBody, Charsets.UTF_8); val json = String(dataBody, Charsets.UTF_8);
val history = Serializer.json.decodeFromString<List<HistoryVideo>>(json); val history = Serializer.json.decodeFromString<List<HistoryVideo>>(json);
Logger.i(TAG, "SyncHistory received ${history.size} videos from ${remotePublicKey}"); Logger.i(TAG, "SyncHistory received ${history.size} videos from ${remotePublicKey}");
if (history.size == 1) {
Logger.i(TAG, "SyncHistory received update video '${history[0].video.name}' (url: ${history[0].video.url}) at timestamp ${history[0].position}");
}
var lastHistory = OffsetDateTime.MIN; var lastHistory = OffsetDateTime.MIN;
for(video in history){ for(video in history){

4
app/src/main/java/com/futo/platformplayer/sync/internal/SyncSession.kt
View file

@ -218,7 +218,9 @@ class SyncSession : IAuthorizable {
sent = true sent = true
break break
} catch (e: Throwable) { } catch (e: Throwable) {
Logger.w(TAG, "Packet failed to send (opcode = $opcode, subOpcode = $subOpcode)", e) Logger.w(TAG, "Packet failed to send (opcode = $opcode, subOpcode = $subOpcode), closing channel", e)
channel.close()
removeChannel(channel)
} }
} }