[tor-commits] [orbot/master] removed unused constants/warnings

[n8fr8 at torproject.org]

commit 5ef1da708fd46277ec131e2214634cf680bf2c62
Author: bim <dsnake at protonmail.com>
Date:   Thu Nov 12 14:02:33 2020 -0500

    removed unused constants/warnings
---
 app/src/main/java/org/torproject/android/MainConstants.java   |  2 --
 .../main/java/org/torproject/android/OrbotMainActivity.java   | 11 +++--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/MainConstants.java b/app/src/main/java/org/torproject/android/MainConstants.java
index d3188308..e08f4e4b 100644
--- a/app/src/main/java/org/torproject/android/MainConstants.java
+++ b/app/src/main/java/org/torproject/android/MainConstants.java
@@ -12,6 +12,4 @@ public interface MainConstants {
 
     String EMAIL_TOR_BRIDGES = "bridges at torproject.org";
 
-    int RESULT_CLOSE_ALL = 0;
-
 }
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 7102ea94..302154de 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -89,7 +89,6 @@ import pl.bclogic.pulsator4droid.library.PulsatorLayout;
 
 import static androidx.core.content.FileProvider.getUriForFile;
 import static org.torproject.android.MainConstants.COUNTRY_CODES;
-import static org.torproject.android.MainConstants.RESULT_CLOSE_ALL;
 import static org.torproject.android.MainConstants.URL_TOR_CHECK;
 import static org.torproject.android.service.TorServiceConstants.ACTION_START;
 import static org.torproject.android.service.TorServiceConstants.ACTION_START_VPN;
@@ -108,7 +107,6 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan
     private final static int REQUEST_VPN = 8888;
     private final static int REQUEST_SETTINGS = 0x9874;
     private final static int REQUEST_VPN_APPS_SELECT = 8889;
-    private final static int LOG_DRAWER_GRAVITY = GravityCompat.END;
     // message types for mStatusUpdateHandler
     private final static int STATUS_UPDATE = 1;
     private static final int MESSAGE_TRAFFIC_COUNT = 2;
@@ -143,7 +141,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan
      * so local ones are used here so other apps cannot interfere with Orbot's
      * operation.
      */
-    private BroadcastReceiver mLocalBroadcastReceiver = new BroadcastReceiver() {
+    private final BroadcastReceiver mLocalBroadcastReceiver = new BroadcastReceiver() {
 
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -296,7 +294,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan
         mTxtOrbotLog = findViewById(R.id.orbotLog);
 
         lblStatus = findViewById(R.id.lblStatus);
-        lblStatus.setOnClickListener(v -> mDrawer.openDrawer(LOG_DRAWER_GRAVITY));
+        lblStatus.setOnClickListener(v -> mDrawer.openDrawer(GravityCompat.END));
 
         lblPorts = findViewById(R.id.lblPorts);
 
@@ -481,9 +479,6 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan
      **/
     private void doExit() {
         stopTor();
-
-        // Kill all the wizard activities
-        setResult(RESULT_CLOSE_ALL);
         finish();
     }
 
@@ -501,7 +496,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan
     @Override
     public void onBackPressed() {
         // check to see if the log is open, if so close it
-        if (mDrawer.isDrawerOpen(LOG_DRAWER_GRAVITY)) {
+        if (mDrawer.isDrawerOpen(GravityCompat.END)) {
             mDrawer.closeDrawers();
         } else {
             super.onBackPressed();