From kde-commits  Tue May 31 19:05:14 2016
From: Albert Vaca <albertvaka () gmail ! com>
Date: Tue, 31 May 2016 19:05:14 +0000
To: kde-commits
Subject: [kdeconnect-android/sslrefactor] src/org/kde/kdeconnect: Do not use encryption if the protocol is 6
Message-Id: <E1b7oyY-0001CO-CA () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=146472153313412

Git commit 240fa348335ade6f8cfb98bd759ea0fac6d214ae by Albert Vaca.
Committed on 31/05/2016 at 19:00.
Pushed by albertvaka into branch 'sslrefactor'.

Do not use encryption if the protocol is 6

M  +1    -1    src/org/kde/kdeconnect/Device.java

http://commits.kde.org/kdeconnect-android/240fa348335ade6f8cfb98bd759ea0fac=
6d214ae

diff --git a/src/org/kde/kdeconnect/Device.java b/src/org/kde/kdeconnect/De=
vice.java
index 3880cdd..66d0dad 100644
--- a/src/org/kde/kdeconnect/Device.java
+++ b/src/org/kde/kdeconnect/Device.java
@@ -621,7 +621,7 @@ public class Device implements BaseLink.PackageReceiver=
 {
             @Override
             public void run() {
 =

-                boolean useEncryption =3D (!np.getType().equals(NetworkPac=
kage.PACKAGE_TYPE_PAIR) && isPaired());
+                boolean useEncryption =3D (protocolVersion < 6 && (!np.get=
Type().equals(NetworkPackage.PACKAGE_TYPE_PAIR) && isPaired()));
 =

                 //Make a copy to avoid concurrent modification exception i=
f the original list changes
                 for (final BaseLink link : links) {