TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 09:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't block while countries are loading

Browse Source
This commit is contained in:
nielsandriesse 2020-06-02 15:59:25 +10:00
parent 07df442d3e
commit 5b5413991d
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
View File

@ -53,6 +53,14 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
} }
broadcastReceivers.add(pathsBuiltReceiver) broadcastReceivers.add(pathsBuiltReceiver)
LocalBroadcastManager.getInstance(this).registerReceiver(pathsBuiltReceiver, IntentFilter("pathsBuilt")) LocalBroadcastManager.getInstance(this).registerReceiver(pathsBuiltReceiver, IntentFilter("pathsBuilt"))
val onionRequestPathCountriesLoadedReceiver: BroadcastReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
handleOnionRequestPathCountriesLoaded()
}
}
broadcastReceivers.add(onionRequestPathCountriesLoadedReceiver)
LocalBroadcastManager.getInstance(this).registerReceiver(onionRequestPathCountriesLoadedReceiver, IntentFilter("onionRequestPathCountriesLoaded"))
} }
override fun onDestroy() { override fun onDestroy() {
@ -66,6 +74,7 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
// region Updating // region Updating
private fun handleBuildingPathsEvent() { update(false) } private fun handleBuildingPathsEvent() { update(false) }
private fun handlePathsBuiltEvent() { update(false) } private fun handlePathsBuiltEvent() { update(false) }
private fun handleOnionRequestPathCountriesLoaded() { update(false) }
private fun update(isAnimated: Boolean) { private fun update(isAnimated: Boolean) {
pathRowsContainer.removeAllViews() pathRowsContainer.removeAllViews()
@ -131,7 +140,7 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
private fun getPathRow(snode: Snode, location: LineView.Location, dotAnimationStartDelay: Long, dotAnimationRepeatInterval: Long, isGuardSnode: Boolean): LinearLayout { 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 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.getCountry(snode.ip) val subtitle = IP2Country.shared.countryNamesCache[snode.ip] ?: "Loading..."
return getPathRow(title, subtitle, location, dotAnimationStartDelay, dotAnimationRepeatInterval) return getPathRow(title, subtitle, location, dotAnimationStartDelay, dotAnimationRepeatInterval)
} }
// endregion // endregion

13
src/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
View File

@ -14,7 +14,7 @@ import java.io.FileReader
class IP2Country private constructor(private val context: Context) { class IP2Country private constructor(private val context: Context) {
private val pathsBuiltEventReceiver: BroadcastReceiver private val pathsBuiltEventReceiver: BroadcastReceiver
private val countryNamesCache = mutableMapOf<String, String>() val countryNamesCache = mutableMapOf<String, String>()
private val ipv4Table by lazy { private val ipv4Table by lazy {
loadFile("geolite2_country_blocks_ipv4.csv") loadFile("geolite2_country_blocks_ipv4.csv")
@ -36,11 +36,11 @@ class IP2Country private constructor(private val context: Context) {
} }
init { init {
preloadCountriesIfNeeded() populateCacheIfNeeded()
pathsBuiltEventReceiver = object : BroadcastReceiver() { pathsBuiltEventReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
preloadCountriesIfNeeded() populateCacheIfNeeded()
} }
} }
LocalBroadcastManager.getInstance(context).registerReceiver(pathsBuiltEventReceiver, IntentFilter("pathsBuilt")) LocalBroadcastManager.getInstance(context).registerReceiver(pathsBuiltEventReceiver, IntentFilter("pathsBuilt"))
@ -67,7 +67,7 @@ class IP2Country private constructor(private val context: Context) {
return file return file
} }
fun getCountry(ip: String): String { private fun cacheCountryForIP(ip: String): String {
var truncatedIP = ip var truncatedIP = ip
fun getCountryInternal(): String { fun getCountryInternal(): String {
val country = countryNamesCache[ip] val country = countryNamesCache[ip]
@ -103,12 +103,13 @@ class IP2Country private constructor(private val context: Context) {
return getCountryInternal() return getCountryInternal()
} }
private fun preloadCountriesIfNeeded() { private fun populateCacheIfNeeded() {
Thread { Thread {
val path = OnionRequestAPI.paths.firstOrNull() ?: return@Thread val path = OnionRequestAPI.paths.firstOrNull() ?: return@Thread
path.forEach { snode -> path.forEach { snode ->
getCountry(snode.ip) // Preload if needed cacheCountryForIP(snode.ip) // Preload if needed
} }
Broadcaster(context).broadcast("onionRequestPathCountriesLoaded")
Log.d("Loki", "Finished preloading onion request path countries.") Log.d("Loki", "Finished preloading onion request path countries.")
}.start() }.start()
} }