tweak how tor version number is displayed

guardianproject · Oct 18, 2022 · 314fea4 · 314fea4
1 parent 0870b04
commit 314fea4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -313,7 +313,7 @@ private void doLayout() {
 
         lblStatus = findViewById(R.id.lblStatus);
         lblStatus.setOnClickListener(v -> mDrawer.openDrawer(GravityCompat.END));
-        lblStatus.setText(String.format("Tor v%s", OrbotService.BINARY_TOR_VERSION));
+        lblStatus.setText(String.format("Tor v%s", getTorVersion()));
 
         lblPorts = findViewById(R.id.lblPorts);
 
@@ -356,6 +356,9 @@ private void doLayout() {
         findViewById(R.id.ivAppVpnSettings).setOnClickListener(v -> startActivityForResult(new Intent(OrbotMainActivity.this, AppManagerActivity.class), REQUEST_VPN_APPS_SELECT));
     }
 
+    private String getTorVersion () {
+        return OrbotService.BINARY_TOR_VERSION.split("-")[0];
+    }
     private void resetBandwidthStatTextviews() {
         String zero = String.format("%s / %s", OrbotService.formatBandwidthCount(this, 0), formatTotal(0));
         downloadText.setText(zero);
@@ -800,7 +803,7 @@ private void updateStatus(String torServiceMsg, String newTorStatus) {
                     break;
 
                 case STATUS_OFF:
-                    lblStatus.setText(String.format("Tor v%s", OrbotService.BINARY_TOR_VERSION));
+                    lblStatus.setText(String.format("Tor v%s", getTorVersion()));
                     imgStatus.setImageResource(R.drawable.toroff);
                     lblPorts.setText("");
                     mBtnStart.setText(R.string.menu_start);