|
@@ -124,6 +124,7 @@ import com.vpn.fastestvpnservice.utils.VPNConnectionsUtil
|
|
|
import com.vpn.fastestvpnservice.utils.isTablet
|
|
|
import com.vpn.fastestvpnservice.viewmodels.HomeViewModel
|
|
|
import com.vpn.fastestvpnservice.viewmodels.ServerListViewModel
|
|
|
+import com.vpn.fastestvpnservice.views.initializeMutableItems
|
|
|
import com.wireguard.android.backend.GoBackend
|
|
|
import de.blinkt.openvpn.core.App
|
|
|
import kotlinx.coroutines.delay
|
|
@@ -222,6 +223,7 @@ val onServerTV = object : ServerCallbacksTV {
|
|
|
val lastServer1 = prefHelper.getServerObject()
|
|
|
}
|
|
|
}
|
|
|
+ initializeMutableItems()
|
|
|
serverListViewModelSplash.setCountryDataTV()
|
|
|
}
|
|
|
}
|
|
@@ -345,6 +347,7 @@ fun HomeTV(
|
|
|
if (!it.status) {
|
|
|
basePreferenceHelper.setLoggedInState(false)
|
|
|
basePreferenceHelper.clearAllData()
|
|
|
+ initializeMutableItems()
|
|
|
// setCustomLocale(context)
|
|
|
settingsNavHostController.popBackStack()
|
|
|
settingsNavHostController.navigate(ScreenTV.LoginTV.route)
|
|
@@ -365,31 +368,41 @@ fun HomeTV(
|
|
|
if (isLaunched) {
|
|
|
Log.d("test_lingual_splash", "isLaunched - true")
|
|
|
val countries = serverListViewModelSplash.liveDataGetServersGlobal.observeAsState().value
|
|
|
+ Log.d("test_serverlist_tv","$countries = ${countries?.size}")
|
|
|
+
|
|
|
+ val serverDataName = if (countries?.size == 5) listOf<String>("Servers", "Dedicated IP", "Streaming", "D-VPN", "P2P")
|
|
|
+ else listOf<String>("Servers", "Streaming", "D-VPN", "P2P")
|
|
|
+
|
|
|
+ Log.d("test_lingual_splash", "${serverDataName.size} , ${serverDataName}")
|
|
|
+ Log.d("test_lingual_splash","${isLocationsEnabled.value} ${isDedicatedIpEnabled.value}" +
|
|
|
+ " ${isStreamingEnabled.value}" +
|
|
|
+ " ${isDvpnEnabled.value} ${isP2pEnabled.value}")
|
|
|
+
|
|
|
countries?.forEachIndexed { index, serverData ->
|
|
|
- Log.d("test_serverlist_tv","$index ${serverData?.name} ${serverData?.servers?.size}")
|
|
|
- if (serverData?.name?.equals("Servers") == true) {
|
|
|
- Log.d("test_serverlist_tv","$index ${serverData?.name}")
|
|
|
- serverData.servers?.let { locations = it }
|
|
|
+// Log.d("test_serverlist_tv","$index ${serverData?.name} ${serverData?.servers?.size}")
|
|
|
+ if (serverDataName[index] == "Servers") {
|
|
|
+ Log.d("test_serverlist_tv","Inside ${serverData?.name}")
|
|
|
+ serverData?.servers?.let { locations = it }
|
|
|
if (locations.size > 0) isLocationsEnabled.value = true
|
|
|
}
|
|
|
- else if (serverData?.name?.equals("Dedicated IP") == true) {
|
|
|
- Log.d("test_serverlist_tv","$index ${serverData?.name}")
|
|
|
- serverData.servers?.let { dedicatedIP = it }
|
|
|
+ else if (serverDataName[index] == "Dedicated IP") {
|
|
|
+ Log.d("test_serverlist_tv","Inside ${serverData?.name}")
|
|
|
+ serverData?.servers?.let { dedicatedIP = it }
|
|
|
if (dedicatedIP.size > 0) isDedicatedIpEnabled.value = true
|
|
|
}
|
|
|
- else if (serverData?.name?.equals("Streaming") == true) {
|
|
|
- Log.d("test_serverlist_tv","$index ${serverData?.name}")
|
|
|
- serverData.servers?.let { streaming = it }
|
|
|
+ else if (serverDataName[index].equals("Streaming")) {
|
|
|
+ Log.d("test_serverlist_tv","Inside ${serverData?.name}")
|
|
|
+ serverData?.servers?.let { streaming = it }
|
|
|
if (streaming.size > 0) isStreamingEnabled.value = true
|
|
|
}
|
|
|
- else if (serverData?.name?.equals("D-VPN") == true) {
|
|
|
- Log.d("test_serverlist_tv","$index ${serverData?.name}")
|
|
|
- serverData.servers?.let { dvpn = it }
|
|
|
+ else if (serverDataName[index].equals("D-VPN")) {
|
|
|
+ Log.d("test_serverlist_tv","Inside ${serverData?.name}")
|
|
|
+ serverData?.servers?.let { dvpn = it }
|
|
|
if (dvpn.size > 0) isDvpnEnabled.value = true
|
|
|
}
|
|
|
- else if (serverData?.name?.equals("P2P") == true) {
|
|
|
- Log.d("test_serverlist_tv","$index ${serverData?.name}")
|
|
|
- serverData.servers?.let { p2p = it }
|
|
|
+ else if (serverDataName[index].equals("P2P")) {
|
|
|
+ Log.d("test_serverlist_tv","Inside ${serverData?.name}")
|
|
|
+ serverData?.servers?.let { p2p = it }
|
|
|
if (p2p.size > 0) isP2pEnabled.value = true
|
|
|
}
|
|
|
}
|
|
@@ -1324,6 +1337,7 @@ fun ColumnScope.ShowProtocolDialogTV(
|
|
|
}, 500)
|
|
|
Log.d("ServerCallbacks", "Yes click => ${isProtocolDialog.value}")
|
|
|
isProtocolDialog.value = false
|
|
|
+ initializeMutableItems()
|
|
|
serverListViewModelSplash.setCountryDataTV()
|
|
|
},
|
|
|
modifier = Modifier
|