fixes #862 by adding proxy port display to the more tab

guardianproject · Apr 7, 2023 · 18ccc90 · 18ccc90
1 parent 92159c1
commit 18ccc90
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 5 deletions.
diff --git a/app/src/main/java/org/torproject/android/MoreFragment.kt b/app/src/main/java/org/torproject/android/MoreFragment.kt
@@ -1,6 +1,8 @@
 package org.torproject.android
 
+import android.app.Activity
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -36,6 +38,12 @@ class MoreFragment : Fragment() {
 
     private lateinit var lvMore : ListView;
 
+
+    var httpPort = -1
+    var socksPort = -1
+
+    private lateinit var tvStatus : TextView
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         arguments?.let {
@@ -44,17 +52,51 @@ class MoreFragment : Fragment() {
         }
     }
 
+    override fun onAttach(activity: Activity) {
+        super.onAttach(activity)
+        (activity as OrbotActivity).fragMore = this
+    }
+
+
+    fun setPorts (newHttpPort : Int, newSocksPort: Int) {
+        httpPort = newHttpPort
+        socksPort = newSocksPort
+
+        updateStatus()
+    }
+
+    fun updateStatus () {
+        var sb = java.lang.StringBuilder()
+
+        sb.append(getString(R.string.proxy_ports)).append(" ")
+
+        if (httpPort != -1 && socksPort != -1) {
+            sb.append("HTTP:").append(httpPort).append(" ").append(" SOCKS:").append(socksPort)
+        }
+        else
+        {
+            sb.append("none")
+        }
+
+        sb.append("\n\n")
+
+        val manager = requireActivity().packageManager
+        val info = manager.getPackageInfo(requireActivity().packageName, PackageManager.GET_ACTIVITIES)
+        sb.append(getString(R.string.app_name)).append(" ").append(info.versionName).append("\n")
+        sb.append("Tor v").append(getTorVersion())
+
+        tvStatus.text = sb.toString()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         // Inflate the layout for this fragment
         val view = inflater.inflate(R.layout.fragment_more, container, false)
+        tvStatus = view.findViewById<TextView>(R.id.tvVersion)
 
-        val tvVersion = view.findViewById<TextView>(R.id.tvVersion)
-        tvVersion.text = "Tor v" + getTorVersion()
-
-
+        updateStatus()
         lvMore = view.findViewById(R.id.lvMoreActions)
 
         val listItems = arrayListOf(

diff --git a/app/src/main/java/org/torproject/android/OrbotActivity.kt b/app/src/main/java/org/torproject/android/OrbotActivity.kt
@@ -30,6 +30,7 @@ class OrbotActivity : AppCompatActivity() {
 
     private lateinit var logBottomSheet: LogBottomSheet
     lateinit var fragConnect : ConnectFragment
+    lateinit var fragMore : MoreFragment
 
     var previousReceivedTorStatus: String? = null
 
@@ -173,7 +174,7 @@ class OrbotActivity : AppCompatActivity() {
                 OrbotConstants.LOCAL_ACTION_PORTS -> {
                     val socks = intent.getIntExtra(OrbotConstants.EXTRA_SOCKS_PROXY_PORT, -1)
                     val http = intent.getIntExtra(OrbotConstants.EXTRA_HTTP_PROXY_PORT, -1)
-//                    if (http > 0 && socks > 0) tvPorts.text = "SOCKS $socks | HTTP $http"
+                    if (http > 0 && socks > 0) fragMore?.setPorts(http, socks)
                 }
                 else -> {}
             }