Skip to content

bugfix: multihop - hide selected entry/exit server from opposite list #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
codewithtamim wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

bugfix: multihop - hide selected entry/exit server from opposite list #408

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions core/src/main/java/net/ivpn/core/v2/serverlist/all/AllServersRecyclerViewAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ class AllServersRecyclerViewAdapter(

private var bindings = HashMap<ServerItemBinding, Server>()
private var searchBinding: SearchItemBinding? = null
private var allServers = arrayListOf<Server>()
private var servers = arrayListOf<Server>()
private var filteredServers = arrayListOf<Server>()
private var displayServers = arrayListOf<ConnectionOption>()
Expand Down Expand Up @@ -226,14 +227,19 @@ class AllServersRecyclerViewAdapter(
}

private fun setServers(servers: ArrayList<Server>) {
this.servers = servers
this.allServers = servers
this.servers = if (forbiddenServer != null) {
ArrayList(servers.filter { it != forbiddenServer })
} else {
servers
}
setDistances()
setLatencies()

searchBinding?.search?.let {
searchFilter.filter(it.query)
} ?: run {
filteredServers = servers
filteredServers = this.servers
if (pings.isNullOrEmpty() && filter == Filters.LATENCY) {
Handler(Looper.getMainLooper()).postDelayed({
applyFilter()
Expand Down Expand Up @@ -268,7 +274,12 @@ class AllServersRecyclerViewAdapter(
}

override fun setForbiddenServer(server: Server?) {
forbiddenServer = server
if (forbiddenServer != server) {
forbiddenServer = server
if (allServers.isNotEmpty()) {
setServers(ArrayList(allServers))
}
}
}

private fun getPositionFor(server: Server): Int {
Expand Down