Merge branch '1.x'

AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.kde.kdeconnect_tp"
-    android:versionCode="1420"
+    android:versionCode="1423"
     android:versionName="1.4.2">
 
     <uses-sdk android:minSdkVersion="9"

src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java

@@ -255,6 +255,11 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
                                     device.unpair();
                                 }
                             });
+
+                            String[] ciphers = sslsocket.getSupportedCipherSuites();
+                            for (String cipher : ciphers) {
+                                Log.e("SupportedCiphers","cipher: " + cipher);
+                            }
                         }
                     }
                 }).start();