Merge pull request #739 from ianmacd/pr1

Display the service node's IP address after its country.
4 years ago · 678d8094a1
parent 3b7f7f03cd 7b3035104d
commit 678d8094a1
1 changed files with 2 additions and 2 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt
@ -99,7 +99,7 @@ class IP2Country private constructor(private val context: Context) {

        val bestMatchCountry = comps.lastOrNull { it.key <= Ipv4Int(ip)  }?.let { (_, code) ->
            if (code != null) {
-                countryToNames[code]
+                countryToNames[code] + " [" + ip + "]"
            } else {
                null
            }
@ -126,4 +126,4 @@ class IP2Country private constructor(private val context: Context) {
        }
    }
    // endregion
-}
+}