dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove test/diag option

This commit is contained in:
Nathan Freitas 2014-06-27 13:02:41 -04:00
parent e13d228dfc
commit 7f8e9b80be
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/torproject/android/Orbot.java
View File

@ -396,11 +396,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
doExit(); doExit();
}
else if (item.getItemId() == R.id.menu_diag)
{
startActivity(new Intent(getApplicationContext(), OrbotDiagnosticsActivity.class));
} }
else if (item.getItemId() == R.id.menu_about) 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); NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
mNotificationManager.cancelAll(); mNotificationManager.cancelAll();
mConnection = null;
mService = null;
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(TAG, 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 // 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() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
unbindService(mConnection); if (mConnection != null)
unbindService(mConnection);
} }
public class DataCount { public class DataCount {