mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-31 22:25:08 +00:00
Code Issues Releases Wiki Activity

Compare against version 6, not current version

Browse Source
This commit is contained in:
Albert Vaca
2016-03-15 13:37:23 -07:00
parent 00715f3b6e
commit 45aa9d151f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,6 +82,7 @@ public class LanLinkProvider extends BaseLinkProvider {
public static final String KEY_CUSTOM_DEVLIST_PREFERENCE = "device_list_preference"; public static final String KEY_CUSTOM_DEVLIST_PREFERENCE = "device_list_preference";
private final static int port = 1714; private final static int port = 1714;
private static final int MIN_VERSION_WITH_SSL_SUPPORT = 6;
private final Context context; private final Context context;
@@ -173,7 +174,7 @@ public class LanLinkProvider extends BaseLinkProvider {
// Add ssl handler if device uses new protocol // Add ssl handler if device uses new protocol
try { try {
if (NetworkPackage.ProtocolVersion <= np.getInt("protocolVersion")) { if (np.getInt("protocolVersion") >= MIN_VERSION_WITH_SSL_SUPPORT) {
final SSLEngine sslEngine = SslHelper.getSslEngine(context, np.getString("deviceId"), SslHelper.SslMode.Client); final SSLEngine sslEngine = SslHelper.getSslEngine(context, np.getString("deviceId"), SslHelper.SslMode.Client);
SslHandler sslHandler = new SslHandler(sslEngine); SslHandler sslHandler = new SslHandler(sslEngine);
@@ -278,7 +279,7 @@ public class LanLinkProvider extends BaseLinkProvider {
Log.i("KDE/LanLinkProvider", "Connection successful: " + channel.isActive()); Log.i("KDE/LanLinkProvider", "Connection successful: " + channel.isActive());
// Add ssl handler if device supports new protocol // Add ssl handler if device supports new protocol
if (NetworkPackage.ProtocolVersion <= identityPackage.getInt("protocolVersion")) { if (identityPackage.getInt("protocolVersion") >= MIN_VERSION_WITH_SSL_SUPPORT) {
// add ssl handler with start tls true // add ssl handler with start tls true
SSLEngine sslEngine = SslHelper.getSslEngine(context, identityPackage.getString("deviceId"), SslHelper.SslMode.Server); SSLEngine sslEngine = SslHelper.getSslEngine(context, identityPackage.getString("deviceId"), SslHelper.SslMode.Server);
SslHandler sslHandler = new SslHandler(sslEngine, true); SslHandler sslHandler = new SslHandler(sslEngine, true);