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

Added insensitivity to base64 formats.

Browse source
This commit is contained in:
Koen J 2025-05-07 10:12:12 +02:00
commit f9caab48c4
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1115,7 +1115,7 @@ class StateSync {
_remotePendingStatusUpdate[deviceInfo.publicKey.base64ToByteArray().toBase64()] = onStatusUpdate _remotePendingStatusUpdate[deviceInfo.publicKey.base64ToByteArray().toBase64()] = onStatusUpdate
} }
} }
relaySession.startRelayedChannel(deviceInfo.publicKey, APP_ID, deviceInfo.pairingCode) relaySession.startRelayedChannel(deviceInfo.publicKey.base64ToByteArray().toBase64(), APP_ID, deviceInfo.pairingCode)
} }
} else { } else {
throw e throw e

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

@ -5,6 +5,8 @@ import com.futo.platformplayer.noise.protocol.CipherStatePair
import com.futo.platformplayer.noise.protocol.DHState import com.futo.platformplayer.noise.protocol.DHState
import com.futo.platformplayer.noise.protocol.HandshakeState import com.futo.platformplayer.noise.protocol.HandshakeState
import com.futo.platformplayer.states.StateSync import com.futo.platformplayer.states.StateSync
import com.futo.polycentric.core.base64ToByteArray
import com.futo.polycentric.core.toBase64
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.nio.ByteBuffer import java.nio.ByteBuffer
import java.nio.ByteOrder import java.nio.ByteOrder
@ -82,7 +84,7 @@ class ChannelRelayed(
override var authorizable: IAuthorizable? = null override var authorizable: IAuthorizable? = null
val isAuthorized: Boolean get() = authorizable?.isAuthorized ?: false val isAuthorized: Boolean get() = authorizable?.isAuthorized ?: false
var connectionId: Long = 0L var connectionId: Long = 0L
override var remotePublicKey: String? = publicKey override var remotePublicKey: String? = publicKey.base64ToByteArray().toBase64()
private set private set
override var remoteVersion: Int? = null override var remoteVersion: Int? = null
private set private set

2
app/src/main/java/com/futo/platformplayer/sync/internal/SyncSocketSession.kt
View file

@ -998,7 +998,7 @@ class SyncSocketSession {
suspend fun startRelayedChannel(publicKey: String, appId: UInt = 0u, pairingCode: String? = null): ChannelRelayed? { suspend fun startRelayedChannel(publicKey: String, appId: UInt = 0u, pairingCode: String? = null): ChannelRelayed? {
val requestId = generateRequestId() val requestId = generateRequestId()
val deferred = CompletableDeferred<ChannelRelayed>() val deferred = CompletableDeferred<ChannelRelayed>()
val channel = ChannelRelayed(this, _localKeyPair, publicKey, true) val channel = ChannelRelayed(this, _localKeyPair, publicKey.base64ToByteArray().toBase64(), true)
_onNewChannel?.invoke(this, channel) _onNewChannel?.invoke(this, channel)
_pendingChannels[requestId] = channel to deferred _pendingChannels[requestId] = channel to deferred
try { try {