Parcourir la source

Showing all servers list even Splash API not working, handled on splash screen also on TV

Khubaib il y a 4 mois
Parent
commit
6f4c70d38f

+ 2 - 2
.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-10-22T14:50:16.381154658Z">
+        <DropdownSelection timestamp="2024-10-25T14:29:18.942757970Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=1C051FDF60048Z" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=/home/ubuntu/.android/avd/Television_1080p_API_31.avd" />
             </handle>
           </Target>
         </DropdownSelection>

+ 0 - 8
app/src/main/java/com/vpn/fastestvpnservice/screens/SplashScreen.kt

@@ -158,18 +158,10 @@ fun Splash(navHostController: NavHostController) {
     }
 
     if (isLoggedIn) {
-        val splashResponse = splashViewModelSplash.liveDataServerData.observeAsState().value
         val serversGlobalResponse = serverListViewModelSplash.liveDataGetServersGlobal.observeAsState().value
-        val allServersResponse = serverListViewModelSplash.liveDataAllServers.observeAsState().value
         val serverData = basePreferenceHelper.getServerData()
 
-        Log.d("splashResponse", "splashResponse = ${splashResponse?.status} ${splashResponse?.message}")
-        Log.d("splashResponse", "getServerData = ${serverData.size}")
-        Log.d("splashResponse", "liveDataGetServersGlobal = ${serversGlobalResponse?.size}")
-        Log.d("splashResponse", "liveDataAllServers = ${allServersResponse?.size}")
-
         if (serversGlobalResponse.isNullOrEmpty() && serverData.size > 0) {
-            Log.d("splashResponse", "liveDataGetServersGlobal -> isNullOrEmpty")
             serverListViewModelSplash.setRecommendedSmartServers()
             serverListViewModelSplash.setCountryData()
             splashViewModelSplash.setRecommendedServer()

+ 16 - 0
app/src/main/java/com/vpn/fastestvpnservice/screensTV/SplashScreenTV.kt

@@ -124,5 +124,21 @@ fun SplashTV(navHostController: NavHostController) {
                 navHostController.navigate(ScreenTV.LoginTV.route)
             }
         }
+
+        if (isLoggedIn) {
+            val serversGlobalResponse = serverListViewModelSplash.liveDataGetServersGlobal.observeAsState().value
+            val serverData = basePreferenceHelper.getServerData()
+
+            if (serversGlobalResponse.isNullOrEmpty() && serverData.size > 0) {
+                serverListViewModelSplash.setCountryDataTV()
+                splashViewModelSplash.setRecommendedServer()
+                splashViewModelSplash.setRecentlyServer()
+                splashViewModelSplash.setServerObject()
+                splashViewModelSplash.setSmartServerObject()
+            }
+
+
+        }
+
     }
 }