From 31669efc51ddfa51e94461e130519a5c41709682 Mon Sep 17 00:00:00 2001
From: ThomasSession <thomas.r@getsession.org>
Date: Mon, 19 Aug 2024 16:59:19 +1000
Subject: [PATCH] Avoiding to recall Ipv4Int on every loop

---
 .../org/thoughtcrime/securesms/util/IP2Country.kt |  3 ++-
 .../org/thoughtcrime/securesms/util/ListUtil.java | 15 ---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt b/app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt
index 004dec8a5e..6ddeaf9282 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt
@@ -97,7 +97,8 @@ class IP2Country private constructor(private val context: Context) {
 
         val comps = ipv4ToCountry.asSequence()
 
-        val bestMatchCountry = comps.lastOrNull { it.key <= Ipv4Int(ip)  }?.let { (_, code) ->
+        val ipInt = Ipv4Int(ip)
+        val bestMatchCountry = comps.lastOrNull { it.key <= ipInt  }?.let { (_, code) ->
             if (code != null) {
                 countryToNames[code]
             } else {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ListUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ListUtil.java
index 20dd6d68cf..321a3abfc0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ListUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ListUtil.java
@@ -2,10 +2,7 @@ package org.thoughtcrime.securesms.util;
 
 import androidx.annotation.NonNull;
 
-import com.annimon.stream.Stream;
-
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 public final class ListUtil {
@@ -21,16 +18,4 @@ public final class ListUtil {
 
     return chunks;
   }
-
-  @SafeVarargs
-  public static <T> List<T> concat(Collection<T>... items) {
-    //noinspection Convert2MethodRef
-    final List<T> concat = new ArrayList<>(Stream.of(items).map(Collection::size).reduce(0, (lhs, rhs) -> lhs+rhs));
-
-    for (Collection<T> list : items) {
-      concat.addAll(list);
-    }
-
-    return concat;
-  }
 }