فهرست منبع

working fine on TV, resolved back issue...

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

BIN
app/release/app-release.apk


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

@@ -92,6 +92,7 @@ open class MainActivity : DockActivity(), ConnectivityReceiver.ConnectivityRecei
                     Log.d("test_platform_android", "TV")
                     val intent = Intent(context, SplashActivity::class.java)
                     context.startActivity(intent)
+                    finish()
                 } else {
                     Log.d("test_platform_android", "Mobile")
                     FastestVPNTheme(isDarkTheme.value) {
@@ -148,7 +149,9 @@ open class MainActivity : DockActivity(), ConnectivityReceiver.ConnectivityRecei
         super.onDestroy()
 
         val basePreferenceHelper = BasePreferenceHelper(baseContext)
-        basePreferenceHelper.clearServerObject()
+        if (!StaticMethods.isTV(this)) {
+            basePreferenceHelper.clearServerObject()
+        }
         Log.d("test_conn_ser_obj", "onDestroy() called")
 
     }
@@ -214,6 +217,16 @@ open class MainActivity : DockActivity(), ConnectivityReceiver.ConnectivityRecei
 
     override fun onNetworkConnectionChanged(isConnected: Boolean) {
     }
+
+//    override fun onBackPressed() {
+//        super.onBackPressed()
+//
+//        if (StaticMethods.isTV(this))
+//        {
+//            Log.d("test_backTV", "TV Back!!")
+////            this@MainActivity.finishAffinity()
+//        }
+//    }
 }
 
 //        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)       // commenting now...

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

@@ -397,6 +397,7 @@ public class GuidedActivity extends FragmentActivity {
 
         @Override
         public void onBackPressedCallback() {
+            Log.d("test_backTV", "onBackPressedCallback First");
             HomeActivityTV.Companion.setTvHome(true);
             HomeActivityTV.Companion.setFirstStepFragment(false);
             finishGuidedStepSupportFragments();

+ 9 - 2
app/src/main/java/com/vpn/fastestvpnservice/activities/HomeActivityTV.kt

@@ -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}"
                 }

+ 1 - 1
app/src/main/java/com/vpn/fastestvpnservice/screens/bottomNavBarScreens/HomeScreen.kt

@@ -871,7 +871,7 @@ fun ColumnScope.ShowProtocolDialog(
             }
         }
 
-        Log.d("server_protocol", "Home: $isServerFound ${desiredServer.id} ${desiredServer.server_name} ${desiredServer.ip} ${desiredServer.protocol} ${desiredServer.remoteId}")
+//        Log.d("server_protocol", "Home: $isServerFound ${desiredServer.id} ${desiredServer.server_name} ${desiredServer.ip} ${desiredServer.protocol} ${desiredServer.remoteId}")
 
 
         Surface(

+ 1 - 0
app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java

@@ -12,6 +12,7 @@ import androidx.core.util.Pair;
 
 import com.vpn.fastestvpnservice.beans.Server;
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper;
+import com.vpn.fastestvpnservice.utils.StaticMethods;
 import com.vpn.fastestvpnservice.viewmodels.ServerListViewModel;
 
 import java.io.BufferedReader;