2
0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-02 07:05:09 +00:00

Merge branch '1.x'

This commit is contained in:
Albert Vaca
2016-09-13 16:58:41 +02:00
2 changed files with 6 additions and 1 deletions

View File

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

View File

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