remove test/diag option
This commit is contained in:
parent
e13d228dfc
commit
7f8e9b80be
|
@ -396,11 +396,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
|
|||
doExit();
|
||||
|
||||
|
||||
}
|
||||
else if (item.getItemId() == R.id.menu_diag)
|
||||
{
|
||||
startActivity(new Intent(getApplicationContext(), OrbotDiagnosticsActivity.class));
|
||||
|
||||
}
|
||||
else if (item.getItemId() == R.id.menu_about)
|
||||
{
|
||||
|
@ -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;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
// guess what? this start's Tor! actually no it just requests via the local ITorService to the remote TorService instance
|
||||
|
@ -1260,6 +1259,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
|
|||
protected void onDestroy() {
|
||||
super.onDestroy();
|
||||
|
||||
if (mConnection != null)
|
||||
unbindService(mConnection);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue