فهرست منبع

OpenVPN connecting on TV, now saving appdetails and filedetails .json file on splashviewmodel.

Khubaib 1 سال پیش
والد
کامیت
63c4e7f595

+ 2 - 2
.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-06-11T13:21:48.190010045Z">
+        <DropdownSelection timestamp="2024-06-13T15:03:04.638120296Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/home/ubuntu/.android/avd/Television_1080p_API_31.avd" />
+              <DeviceId pluginId="Default" identifier="serial=192.168.110.12:5555;connection=5c066f4b" />
             </handle>
           </Target>
         </DropdownSelection>

+ 7 - 4
app/build.gradle.kts

@@ -82,6 +82,9 @@ android {
             }
         }
     }
+    lintOptions {
+        disable("MissingTranslation")
+    }
     buildToolsVersion = "30.0.2"
     ndkVersion = "19.2.5345600"
 }
@@ -185,10 +188,10 @@ dependencies {
         commandLine(android.ndkDirectory.absolutePath + "/ndk-build", "clean")
     }
 
-//    tasks.withType<JavaCompile> {
-//        dependsOn("buildNative")
-//        options.compilerArgs.addAll(listOf("-Xlint:unchecked", "-Xlint:deprecation"))
-//    }
+    tasks.withType<JavaCompile> {
+        dependsOn("buildNative")
+        options.compilerArgs.addAll(listOf("-Xlint:unchecked", "-Xlint:deprecation"))
+    }
 
     tasks.getByName("clean").dependsOn("cleanNative")
 

BIN
app/release/app-release.apk


+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -29,7 +29,7 @@
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
     <application
         android:name="de.blinkt.openvpn.core.App"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:banner="@drawable/logo_banner"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"

+ 0 - 1
app/src/main/java/com/vpn/fastestvpnservice/MainActivity.kt

@@ -43,7 +43,6 @@ import com.vpn.fastestvpnservice.screens.helpScreensAll.fileChooserCallback
 import com.vpn.fastestvpnservice.ui.theme.FastestVPNTheme
 import com.vpn.fastestvpnservice.utils.StaticMethods
 import com.vpn.fastestvpnservice.viewmodels.LoginViewModel
-import com.vpn.fastestvpnservice.viewmodels.SplashViewModel
 import de.blinkt.openvpn.core.App
 
 open class MainActivity : DockActivity(), ConnectivityReceiver.ConnectivityReceiverListener {

+ 0 - 1
app/src/main/java/com/vpn/fastestvpnservice/activities/HomeActivityTV.kt

@@ -37,7 +37,6 @@ import com.vpn.fastestvpnservice.utils.SnackBarUtils
 import com.vpn.fastestvpnservice.utils.StaticMethods
 import com.vpn.fastestvpnservice.utils.Utils
 import com.vpn.fastestvpnservice.utils.VPNConnectionUtilsTV
-import com.vpn.fastestvpnservice.utils.VPNConnectionsUtil
 import com.vpn.fastestvpnservice.viewmodels.HomeViewModel
 import com.vpn.fastestvpnservice.viewmodels.ProfileViewModel
 import com.vpn.fastestvpnservice.viewmodels.ServerListViewModel

+ 2 - 5
app/src/main/java/com/vpn/fastestvpnservice/activities/SplashActivity.kt

@@ -3,11 +3,8 @@ package com.vpn.fastestvpnservice.activities
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
-import androidx.activity.ComponentActivity
-import androidx.appcompat.app.AppCompatActivity
 import com.vpn.fastestvpnservice.MainActivity
 import com.vpn.fastestvpnservice.R
-import com.vpn.fastestvpnservice.constants.AppEnum
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
 import com.vpn.fastestvpnservice.utils.StaticMethods
 import com.vpn.fastestvpnservice.viewmodels.SplashViewModel
@@ -27,7 +24,7 @@ class SplashActivity : MainActivity() {
 
 //        val i = Intent(this, SplashActivity2::class.java)
 //        startActivity(i)
-//        splashViewModel = SplashViewModel(this)
+        splashViewModel = SplashViewModel(this)
 //
 //        window.decorView.systemUiVisibility =
 //            View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
@@ -110,7 +107,7 @@ class SplashActivity : MainActivity() {
 
         } else {
             Log.d("test_nav_tv", "getUser() =>")
-//            splashViewModel.serverDataApi()
+            splashViewModel.serverDataApi()
 //            initFragment(AppEnum.LOGIN_SCREEN.key)
 //            val i = Intent(this, SplashActivity2::class.java)
 //            startActivity(i)

+ 1 - 1
app/src/main/java/com/vpn/fastestvpnservice/beans/ServerData.kt

@@ -10,7 +10,7 @@ class ServerData(
     var name: String? = null,
     @SerializedName("servers")
     var servers: ArrayList<Server>? = null,
-)
+    )
 
 class ServerDataGlobal(
     var name: String? = null,

+ 6 - 7
app/src/main/java/com/vpn/fastestvpnservice/customItems/CountryItem.kt

@@ -208,13 +208,12 @@ fun CountryItem(
 
             /* Country Expandable's Row */
                 if (isServerExpanded) {
-                    val countriesServersData1 = basePreferenceHelper.getServerData().get(0).servers
-                    countriesServersData1?.let {
-//                        serverListViewModelSplash.getServerGroupList(server, it)
-                        val serversGroup = serverListViewModelSplash.liveDataGroupServers.observeAsState().value
-                        serversGroup?.get(index)?.servers?.let { it1 -> ExpandableRow(server = it1, navHostController) }
-                    }
-
+//                    val countriesServersData1 = basePreferenceHelper.getServerData().get(0).servers
+//                    countriesServersData1?.let {
+////                        serverListViewModelSplash.getServerGroupList(server, it)
+//                    }
+                    val serversGroup = serverListViewModelSplash.liveDataGroupServers.observeAsState().value
+                    serversGroup?.get(index)?.servers?.let { it1 -> ExpandableRow(server = it1, navHostController) }
                 }
         }
 

+ 23 - 24
app/src/main/java/com/vpn/fastestvpnservice/viewmodels/ServerListViewModel.kt

@@ -118,15 +118,15 @@ class ServerListViewModel(context: Context): ViewModel() {
                         sortedDistance.get(i).ping = it
                     }
                     recommendedListGlobal.add(sortedDistance.get(i))
-                    Log.d("recommendedListGlobal", "SS:: server = ${sortedDistance.get(i).server_name} ${sortedDistance.get(i).ping}")
+//                    Log.d("recommendedListGlobal", "SS:: server = ${sortedDistance.get(i).server_name} ${sortedDistance.get(i).ping}")
                 }
             }
 
             recommendedListFinalGlobal = recommendedListGlobal
 
-            recommendedListFinalGlobal.forEachIndexed { index, server ->
-                Log.d("recommendedListGlobal F", "SS:: server = ${server.server_name} ${server.ping}")
-            }
+//            recommendedListFinalGlobal.forEachIndexed { index, server ->
+//                Log.d("recommendedListGlobal F", "SS:: server = ${server.server_name} ${server.ping}")
+//            }
 
 //            if (isAlphabetList.value) {
 //                Log.d("test_filter_list", "inside flter: setRecommendedSmartServers")
@@ -135,7 +135,7 @@ class ServerListViewModel(context: Context): ViewModel() {
 //                }
 //            }
 
-            Log.d("test_filter_list", "setRecommendedSmartServers")
+//            Log.d("test_filter_list", "setRecommendedSmartServers")
             _mutableLiveDataGetRecommendedServers.value = recommendedListGlobal
             preferencesHelper.setRecommendedList(recommendedListGlobal)
 
@@ -244,9 +244,9 @@ class ServerListViewModel(context: Context): ViewModel() {
 
                     println("__testing"+entry.value.size +" : "+total_enables+" : "+value.country)
 
-                    entry.value.forEachIndexed { indexs, server ->
-                        Log.d("test_country_servers",server.country + " " + server.server_name.toString())
-                    }
+//                    entry.value.forEachIndexed { indexs, server ->
+//                        Log.d("test_country_servers",server.country + " " + server.server_name.toString())
+//                    }
 
 //                    distinctBy.get(index).countryServers = entry.value
 
@@ -401,18 +401,18 @@ class ServerListViewModel(context: Context): ViewModel() {
             it.protocol.equals(preferencesHelper.getProtocol().title, ignoreCase = true)
         }
 
-        serverprotocol.forEachIndexed { index, server ->
-            Log.d("filter_streaming_s", "server: ${server.server_name} ${server.country_sort}")
-        }
+//        serverprotocol.forEachIndexed { index, server ->
+//            Log.d("filter_streaming_s", "server: ${server.server_name} ${server.country_sort}")
+//        }
 
         var distinctBy: List<Server>
         distinctBy = serverprotocol.distinctBy {
             it.server_name
         }
 
-        distinctBy.forEachIndexed { index, server ->
-            Log.d("filter_streaming_p", "server: ${server.server_name} ${server.country_sort}")
-        }
+//        distinctBy.forEachIndexed { index, server ->
+//            Log.d("filter_streaming_p", "server: ${server.server_name} ${server.country_sort}")
+//        }
 
         serverprotocol.groupBy(Server::server_name).mapValues { entry ->
             for ((index, value) in distinctBy.withIndex()) {
@@ -530,9 +530,9 @@ class ServerListViewModel(context: Context): ViewModel() {
             it.connection_count
         }
 
-        tempList2.forEach {
-            Log.d("tempList2", it.server_name + " : " + it.connection_count)
-        }
+//        tempList2.forEach {
+//            Log.d("tempList2", it.server_name + " : " + it.connection_count)
+//        }
 
         return tempList2[0]
     }
@@ -557,15 +557,14 @@ class ServerListViewModel(context: Context): ViewModel() {
 
         for (i in tempList.indices) {
             val obj = tempList[i]
-            Log.d("test_ServerProtocol", "${obj.server_name} ${obj.protocol}")
+//            Log.d("test_ServerProtocol", "${obj.server_name} ${obj.protocol}")
             if (obj.server_name == serverObj.server_name && protocol.title.equals(obj.protocol, ignoreCase = true)) {
                 server = obj
                 isServerFound = true
             }
         }
 
-        Log.d("test_ServerProtocol", "is? ${server.server_name} $isServerFound")
-
+//        Log.d("test_ServerProtocol", "is? ${server.server_name} $isServerFound")
 
         return ServerProtocol(server, isServerFound)
     }
@@ -577,12 +576,12 @@ class ServerListViewModel(context: Context): ViewModel() {
                 RetrofitNetworkHandling.ResponseCallback<Any> {
                 override fun onSuccess(call: Call<Any>?, response: Any?) {
                     try {
-                        Log.d("test_api_response","Response favAndUnFav = " + response.toString())
+//                        Log.d("test_api_response","Response favAndUnFav = " + response.toString())
                         val gson = Gson()
                         val jsonString = gson.toJson(response)
                         val type = object : TypeToken<ServerResponse>() {}.type
                         val data = gson.fromJson<ServerResponse>(jsonString, type)
-                        Log.d("test_api_response","favAndUnFav = " + response.toString())
+//                        Log.d("test_api_response","favAndUnFav = " + response.toString())
 
                         if (data.error == 0)
                         {
@@ -594,7 +593,7 @@ class ServerListViewModel(context: Context): ViewModel() {
                             mutableLiveDataFavUnFav.value = null
                         }
                     } catch (ex: Exception) {
-                        Log.d("test_api_response","favAndUnFav catch = " + response.toString())
+//                        Log.d("test_api_response","favAndUnFav catch = " + response.toString())
 
                     }
                 }
@@ -666,7 +665,7 @@ class ServerListViewModel(context: Context): ViewModel() {
 
         tempList.forEachIndexed { index1, server1 ->
             calculatePing(server1){
-                Log.d("serverInfo_ping", "In: ${server1.server_name} $it")
+//                Log.d("serverInfo_ping", "In: ${server1.server_name} $it")
                 server1.ping = it
             }
             tempList2.add(server1)