From e1841db991ad7f078dca97db1772a6381d570677 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Wed, 19 Aug 2020 12:15:02 +1000
Subject: [PATCH] Fix crash

---
 .../thoughtcrime/securesms/loki/activities/PathActivity.kt  | 6 +++++-
 src/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
index b42661be1..7e3b641b1 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
@@ -142,7 +142,11 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
 
     private fun getPathRow(snode: Snode, location: LineView.Location, dotAnimationStartDelay: Long, dotAnimationRepeatInterval: Long, isGuardSnode: Boolean): LinearLayout {
         val title = if (isGuardSnode) resources.getString(R.string.activity_path_guard_node_row_title) else resources.getString(R.string.activity_path_service_node_row_title)
-        val subtitle = IP2Country.shared.countryNamesCache[snode.ip] ?: "Resolving..."
+        val subtitle = if (IP2Country.isInitialized) {
+            IP2Country.shared.countryNamesCache[snode.ip] ?: "Resolving..."
+        } else {
+            "Resolving..."
+        }
         return getPathRow(title, subtitle, location, dotAnimationStartDelay, dotAnimationRepeatInterval)
     }
     // endregion
diff --git a/src/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt b/src/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
index 8cd120416..7f99b2c69 100644
--- a/src/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
+++ b/src/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
@@ -29,8 +29,10 @@ class IP2Country private constructor(private val context: Context) {
 
         public lateinit var shared: IP2Country
 
+        public val isInitialized: Boolean get() = ::shared.isInitialized
+
         public fun configureIfNeeded(context: Context) {
-            if (::shared.isInitialized) { return; }
+            if (isInitialized) { return; }
             shared = IP2Country(context)
         }
     }