|
@@ -110,7 +110,10 @@ class HomeActivityTV : AppCompatActivity(), VPNConnectionCallBacks, CallBacks {
|
|
|
|
|
|
fun clickListeners() {
|
|
|
tvHomeBinding.ivConnect.setOnClickListener {
|
|
|
+ serverobj = prefHelper.getServerObject()
|
|
|
prefHelper.setServerObject(serverobj)
|
|
|
+ prefHelper.setConnectedServer(serverobj)
|
|
|
+ serverobj?.let { it1 -> setData(it1) }
|
|
|
Log.d("test_tv_connection", "ivConnect click => ${serverobj?.server_name}")
|
|
|
vpnConnectionsUtil.connectVpn()
|
|
|
}
|
|
@@ -199,7 +202,10 @@ class HomeActivityTV : AppCompatActivity(), VPNConnectionCallBacks, CallBacks {
|
|
|
|
|
|
var filterServerByConnectionCount = Server()
|
|
|
if (prefHelper.getServerObject() != null) {
|
|
|
- filterServerByConnectionCount = prefHelper.getServerObject()!!
|
|
|
+ val server = prefHelper.getServerObject()
|
|
|
+ server?.let {
|
|
|
+ filterServerByConnectionCount = it
|
|
|
+ }
|
|
|
} else {
|
|
|
filterServerByConnectionCount = serverViewModel.filterServerByConnectionCount(
|
|
|
prefHelper.getServerData().get(0).servers!!
|
|
@@ -371,6 +377,7 @@ class HomeActivityTV : AppCompatActivity(), VPNConnectionCallBacks, CallBacks {
|
|
|
fun setData(server: Server) {
|
|
|
serverobj = server
|
|
|
prefHelper.setServerObject(server)
|
|
|
+ prefHelper.setConnectedServer(server)
|
|
|
tvHomeBinding.tvServer.text = server.server_name ?: server.name
|
|
|
Log.d("HomeActivityTV_Log", "${server.server_name} ${server.iso}")
|
|
|
tvHomeBinding.ivCountryServer.setImageDrawable(
|
|
@@ -461,7 +468,7 @@ class HomeActivityTV : AppCompatActivity(), VPNConnectionCallBacks, CallBacks {
|
|
|
Log.d("HomeActivityTV_Log", "server: conn: ${server?.server_name} ${server?.iso}")
|
|
|
tvHomeBinding.tvIp?.let {
|
|
|
it.text = "IP: ${server?.ip}"
|
|
|
- if (server!!.city == null)
|
|
|
+ if (server?.city == null)
|
|
|
{
|
|
|
tvHomeBinding.tvCountry.text ="${server?.country}"
|
|
|
}
|