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

tune bind/create service logic

This commit is contained in:
Nathan Freitas 2014-06-11 20:24:08 -04:00
parent 4716696515
commit 328c6af2c6
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,9 +106,12 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
} }
Intent torService;
private void startService () private void startService ()
{ {
Intent torService = new Intent(this, TorService.class); torService = new Intent(this, TorService.class);
startService(torService);
/* /*
if (Build.VERSION.SDK_INT > 14) if (Build.VERSION.SDK_INT > 14)
@ -120,11 +123,9 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
else else
{ {
*/ */
bindService(torService,
mConnection, Context.BIND_AUTO_CREATE);
//} //}
startService(torService);
} }
@ -463,6 +464,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
if (aDialog != null) if (aDialog != null)
aDialog.dismiss(); aDialog.dismiss();
unbindService(mConnection);
} }
private void doTorCheck () private void doTorCheck ()
@ -796,6 +799,9 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
bindService(torService,
mConnection, 0);
if (mService != null) if (mService != null)
{ {
try { try {