Merge pull request #3946 from TeamAmaze/bugfix/3928

Force return IPv4 address when probing network interface for listening address
TeamAmaze · Oct 29, 2023 · f6a23f5 · f6a23f5
2 parents 4453863 + 63d59c8
commit f6a23f5
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/src/main/java/com/amaze/filemanager/utils/NetworkUtil.kt b/app/src/main/java/com/amaze/filemanager/utils/NetworkUtil.kt
@@ -28,6 +28,7 @@ import android.net.wifi.WifiManager
 import android.os.Build
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import java.net.Inet4Address
 import java.net.InetAddress
 import java.net.NetworkInterface
 import java.net.UnknownHostException
@@ -97,7 +98,7 @@ object NetworkUtil {
     /**
      * Determine device's IP address.
      *
-     * Caveat: doesn't handle IPv6 addresses well.
+     * Caveat: doesn't handle IPv6 addresses well. Forcing return IPv4 if possible.
      */
     @JvmStatic
     fun getLocalInetAddress(context: Context): InetAddress? {
@@ -115,7 +116,8 @@ object NetworkUtil {
                 netinterface.inetAddresses.iterator().forEach { address ->
                     // this is the condition that sometimes gives problems
                     if (!address.isLoopbackAddress &&
-                        !address.isLinkLocalAddress
+                        !address.isLinkLocalAddress &&
+                        address is Inet4Address
                     ) {
                         return address
                     }