diff --git a/src/org/kde/kdeconnect/Plugins/SftpPlugin/SimpleSftpServer.java b/src/org/kde/kdeconnect/Plugins/SftpPlugin/SimpleSftpServer.java --- a/src/org/kde/kdeconnect/Plugins/SftpPlugin/SimpleSftpServer.java +++ b/src/org/kde/kdeconnect/Plugins/SftpPlugin/SimpleSftpServer.java @@ -140,7 +140,8 @@ } public String getLocalIpAddress() { - String ip6 = null; + String ip6 = ""; + String ip4 = ""; try { for (Enumeration en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) { NetworkInterface intf = en.nextElement(); @@ -152,24 +153,24 @@ // // If we run across an interface that has this, we can safely // ignore it. In fact, it's much safer to do. If we don't, we - // might get invalid IP adddresses out of it. + // might get invalid IP addresses out of it. if(intf.getDisplayName().contains("rmnet")) continue; for (Enumeration enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements();) { InetAddress inetAddress = enumIpAddr.nextElement(); if (!inetAddress.isLoopbackAddress()) { String address = inetAddress.getHostAddress(); - if(inetAddress instanceof Inet4Address) { //Prefer IPv4 over IPv6, because sshfs doesn't seem to like IPv6 - return address; + if(inetAddress instanceof Inet4Address) { + ip4 += address + ";"; } else { - ip6 = address; + ip6 += address + ";"; } } } } } catch (SocketException ex) { } - return ip6; + return ip4 + ip6; //IPv4 first, then IPv6, because sshfs doesn't seem to like IPv6 } static class AndroidFileSystemFactory implements FileSystemFactory {