Cleanup tor code

2 files changed, 15 insertions, 26 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/tor/OrbotHelper.java
index f57496767..84e4f36ab 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/tor/OrbotHelper.java
@@ -47,12 +47,9 @@
         *****
 */
 
-package org.sufficientlysecure.keychain.util.orbot;
+package org.sufficientlysecure.keychain.util.tor;
 
-import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Handler;
@@ -60,7 +57,7 @@ import android.os.Message;
 import android.os.Messenger;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
+
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.ui.dialog.InstallDialogFragment;
 import org.sufficientlysecure.keychain.ui.dialog.OrbotStartDialogFragment;
@@ -89,7 +86,8 @@ public class OrbotHelper {
 
     private static boolean isAppInstalled(String uri, Context context) {
         PackageManager pm = context.getPackageManager();
-        boolean installed = false;
+
+        boolean installed;
         try {
             pm.getPackageInfo(uri, PackageManager.GET_ACTIVITIES);
             installed = true;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/TorServiceUtils.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/tor/TorServiceUtils.java
index b1d8327fb..48adc9528 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/TorServiceUtils.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/tor/TorServiceUtils.java
@@ -47,9 +47,10 @@
         *****
 */
 
-package org.sufficientlysecure.keychain.util.orbot;
+package org.sufficientlysecure.keychain.util.tor;
 
-import android.util.Log;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.util.Log;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -60,10 +61,7 @@ import java.util.StringTokenizer;
 /**
  * This class is taken from the NetCipher library: https://github.com/guardianproject/NetCipher/
  */
-
 public class TorServiceUtils {
-
-    private final static String TAG = "TorUtils";
     // various console cmds
     public final static String SHELL_CMD_PS = "ps";
     public final static String SHELL_CMD_PIDOF = "pidof";
@@ -74,13 +72,14 @@ public class TorServiceUtils {
         try {
             procId = findProcessIdWithPidOf(command);
 
-            if (procId == -1)
+            if (procId == -1) {
                 procId = findProcessIdWithPS(command);
+            }
         } catch (Exception e) {
             try {
                 procId = findProcessIdWithPS(command);
             } catch (Exception e2) {
-                Log.e(TAG, "Unable to get proc id for command: " + URLEncoder.encode(command), e2);
+                Log.e(Constants.TAG, "Unable to get proc id for command: " + URLEncoder.encode(command), e2);
             }
         }
 
@@ -91,10 +90,8 @@ public class TorServiceUtils {
     public static int findProcessIdWithPidOf(String command) throws Exception {
 
         int procId = -1;
-
         Runtime r = Runtime.getRuntime();
-
-        Process procPs = null;
+        Process procPs;
 
         String baseName = new File(command).getName();
         // fix contributed my mikos on 2010.12.10
@@ -104,7 +101,7 @@ public class TorServiceUtils {
         // procPs = r.exec(SHELL_CMD_PIDOF);
 
         BufferedReader reader = new BufferedReader(new InputStreamReader(procPs.getInputStream()));
-        String line = null;
+        String line;
 
         while ((line = reader.readLine()) != null) {
 
@@ -118,25 +115,20 @@ public class TorServiceUtils {
         }
 
         return procId;
-
     }
 
     // use 'ps' command
     public static int findProcessIdWithPS(String command) throws Exception {
-
         int procId = -1;
-
         Runtime r = Runtime.getRuntime();
-
-        Process procPs = null;
+        Process procPs;
 
         procPs = r.exec(SHELL_CMD_PS);
 
         BufferedReader reader = new BufferedReader(new InputStreamReader(procPs.getInputStream()));
-        String line = null;
-
+        String line;
         while ((line = reader.readLine()) != null) {
-            if (line.indexOf(' ' + command) != -1) {
+            if (line.contains(' ' + command)) {
 
                 StringTokenizer st = new StringTokenizer(line, " ");
                 st.nextToken(); // proc owner
@@ -148,6 +140,5 @@ public class TorServiceUtils {
         }
 
         return procId;
-
     }
 }