commit 7f8e9b80bec33eba45a2d787152992db0cede8a4 Author: Nathan Freitas nathan@freitas.net Date: Fri Jun 27 13:02:41 2014 -0400

remove test/diag option --- src/org/torproject/android/Orbot.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 5e6a955..83d8e42 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -397,11 +397,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic

} - else if (item.getItemId() == R.id.menu_diag) - { - startActivity(new Intent(getApplicationContext(), OrbotDiagnosticsActivity.class)); - - } else if (item.getItemId() == R.id.menu_about) { showAbout(); @@ -437,6 +432,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); mNotificationManager.cancelAll();

+ mConnection = null; + mService = null;

} catch (RemoteException e) { Log.w(TAG, e); @@ -953,11 +950,13 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } }

- torStatus = newTorStatus;

- + + torStatus = newTorStatus;

} + + }

// guess what? this start's Tor! actually no it just requests via the local ITorService to the remote TorService instance @@ -1260,7 +1259,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic protected void onDestroy() { super.onDestroy(); - unbindService(mConnection); + if (mConnection != null) + unbindService(mConnection); }

public class DataCount {