mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-28 12:47:43 +00:00
Code Issues Releases Wiki Activity

Do not disconnect when there's a version mismatch

Browse Source 
Just trust the encrypted packet.
This commit is contained in:
Albert Vaca Cintora 2025-02-08 01:55:44 +01:00
parent bec807fa63
commit 6121fa04bc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
View File

@ -223,7 +223,7 @@ public class LanLinkProvider extends BaseLinkProvider {
int protocolVersion = identityPacket.getInt("protocolVersion"); int protocolVersion = identityPacket.getInt("protocolVersion");
if (deviceTrusted && isProtocolDowngrade(deviceId, protocolVersion)) { if (deviceTrusted && isProtocolDowngrade(deviceId, protocolVersion)) {
Log.w("KDE/LanLinkProvider", "Refusing to connect to a device using an older protocol version."); Log.w("KDE/LanLinkProvider", "Refusing to connect to a device using an older protocol version:" + protocolVersion);
return; return;
} }
@ -254,9 +254,9 @@ public class LanLinkProvider extends BaseLinkProvider {
if (!DeviceInfo.isValidIdentityPacket(secureIdentityPacket)) { if (!DeviceInfo.isValidIdentityPacket(secureIdentityPacket)) {
throw new JSONException("Invalid identity packet"); throw new JSONException("Invalid identity packet");
} }
if (secureIdentityPacket.getInt("protocolVersion") != protocolVersion) { int newProtocolVersion = secureIdentityPacket.getInt("protocolVersion");
Log.e("KDE/LanLinkProvider", "Protocol version changed half-way through the handshake"); if (newProtocolVersion != protocolVersion) {
return; Log.w("KDE/LanLinkProvider", "Protocol version changed half-way through the handshake: " + protocolVersion + " ->" + newProtocolVersion);
} }
} else { } else {
secureIdentityPacket = identityPacket; secureIdentityPacket = identityPacket;