[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdeconnect-android/sslrefactor] src/org/kde/kdeconnect: Do not use encryption if the protocol is 6
From:       Albert Vaca <albertvaka () gmail ! com>
Date:       2016-05-31 19:05:14
Message-ID: E1b7oyY-0001CO-CA () scm ! kde ! org
[Download RAW message or body]

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/240fa348335ade6f8cfb98bd759ea0fac6d214ae

diff --git a/src/org/kde/kdeconnect/Device.java b/src/org/kde/kdeconnect/Device.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 = \
(!np.getType().equals(NetworkPackage.PACKAGE_TYPE_PAIR) && isPaired()); +             \
boolean useEncryption = (protocolVersion < 6 && \
(!np.getType().equals(NetworkPackage.PACKAGE_TYPE_PAIR) && isPaired()));  
                 //Make a copy to avoid concurrent modification exception if the \
original list changes  for (final BaseLink link : links) {


[prev in list] [next in list] [prev in thread] [next in thread]