diff --git a/app/src/main/java/com/futo/platformplayer/states/StateSync.kt b/app/src/main/java/com/futo/platformplayer/states/StateSync.kt index c080170f..57c9f93e 100644 --- a/app/src/main/java/com/futo/platformplayer/states/StateSync.kt +++ b/app/src/main/java/com/futo/platformplayer/states/StateSync.kt @@ -1115,7 +1115,7 @@ class StateSync { _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 { throw e diff --git a/app/src/main/java/com/futo/platformplayer/sync/internal/Channel.kt b/app/src/main/java/com/futo/platformplayer/sync/internal/Channel.kt index 0b3b710d..1303d741 100644 --- a/app/src/main/java/com/futo/platformplayer/sync/internal/Channel.kt +++ b/app/src/main/java/com/futo/platformplayer/sync/internal/Channel.kt @@ -5,6 +5,8 @@ import com.futo.platformplayer.noise.protocol.CipherStatePair import com.futo.platformplayer.noise.protocol.DHState import com.futo.platformplayer.noise.protocol.HandshakeState import com.futo.platformplayer.states.StateSync +import com.futo.polycentric.core.base64ToByteArray +import com.futo.polycentric.core.toBase64 import java.io.ByteArrayOutputStream import java.nio.ByteBuffer import java.nio.ByteOrder @@ -82,7 +84,7 @@ class ChannelRelayed( override var authorizable: IAuthorizable? = null val isAuthorized: Boolean get() = authorizable?.isAuthorized ?: false var connectionId: Long = 0L - override var remotePublicKey: String? = publicKey + override var remotePublicKey: String? = publicKey.base64ToByteArray().toBase64() private set override var remoteVersion: Int? = null private set diff --git a/app/src/main/java/com/futo/platformplayer/sync/internal/SyncSocketSession.kt b/app/src/main/java/com/futo/platformplayer/sync/internal/SyncSocketSession.kt index 1f3f9fcf..bd6f70db 100644 --- a/app/src/main/java/com/futo/platformplayer/sync/internal/SyncSocketSession.kt +++ b/app/src/main/java/com/futo/platformplayer/sync/internal/SyncSocketSession.kt @@ -998,7 +998,7 @@ class SyncSocketSession { suspend fun startRelayedChannel(publicKey: String, appId: UInt = 0u, pairingCode: String? = null): ChannelRelayed? { val requestId = generateRequestId() val deferred = CompletableDeferred() - val channel = ChannelRelayed(this, _localKeyPair, publicKey, true) + val channel = ChannelRelayed(this, _localKeyPair, publicKey.base64ToByteArray().toBase64(), true) _onNewChannel?.invoke(this, channel) _pendingChannels[requestId] = channel to deferred try {