[tor-commits] [orbot/master] change how we look up the version of tor being used

[n8fr8 at torproject.org]

commit e903ea9a312b039fd3a864ae2ed9e84ffe05273a
Author: n8fr8 <nathan at freitas.net>
Date:   Sat Apr 21 23:29:10 2018 -0400

    change how we look up the version of tor being used
---
 app/src/main/java/org/torproject/android/OrbotMainActivity.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 13891219..06a2c4bd 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -92,7 +92,6 @@ import com.google.zxing.integration.android.IntentResult;
 import pl.bclogic.pulsator4droid.library.PulsatorLayout;
 
 import static android.support.v4.content.FileProvider.getUriForFile;
-import static org.torproject.android.binary.TorServiceConstants.BINARY_TOR_VERSION;
 
 public class OrbotMainActivity extends AppCompatActivity
         implements OrbotConstants, OnLongClickListener {
@@ -499,7 +498,7 @@ public class OrbotMainActivity extends AppCompatActivity
             String version = "";
             
             try {
-                version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName + " (Tor " + BINARY_TOR_VERSION + ")";
+                version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName + " (Tor " + TorService.TOR_VERSION + ")";
             } catch (NameNotFoundException e) {
                 version = "Version Not Found";
             }
@@ -1161,7 +1160,7 @@ public class OrbotMainActivity extends AppCompatActivity
         } else if (torStatus == TorServiceConstants.STATUS_OFF) {
 
             imgStatus.setImageResource(R.drawable.toroff);
-            lblStatus.setText("Tor v" + BINARY_TOR_VERSION);
+            lblStatus.setText("Tor v" + TorService.TOR_VERSION);
 			mBtnStart.setText(R.string.menu_start);
             mPulsator.start();