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

tweaked bindService call

This commit is contained in:
Nathan Freitas 2012-02-12 01:25:33 -05:00
parent ebb7535b0f
commit bfaf01203e
1 changed files with 9 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

@ -3,6 +3,8 @@
package org.torproject.android; package org.torproject.android;
import java.util.Locale;
import org.torproject.android.service.ITorService; import org.torproject.android.service.ITorService;
import org.torproject.android.service.ITorServiceCallback; import org.torproject.android.service.ITorServiceCallback;
import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.TorServiceConstants;
@ -22,6 +24,7 @@ import android.content.ServiceConnection;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor; import android.content.SharedPreferences.Editor;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Configuration;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
@ -40,7 +43,8 @@ import android.widget.TextView;
public class Orbot extends Activity implements OnLongClickListener, TorConstants public class Orbot extends Activity implements OnLongClickListener, TorConstants
{ {
/* Useful UI bits */ /* Useful UI bits */
// so this is probably pretty obvious, here, but also an area // so this is probably pretty obvious, here, but also an area
// which we might see quite a bit of change+complexity was the main screen // which we might see quite a bit of change+complexity was the main screen
@ -72,7 +76,9 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants
//if Tor binary is not running, then start the service up //if Tor binary is not running, then start the service up
//might want to look at whether we need to call this every time //might want to look at whether we need to call this every time
//or whether binding to the service is enough //or whether binding to the service is enough
//bindService();
bindService();
startService(new Intent(INTENT_TOR_SERVICE)); startService(new Intent(INTENT_TOR_SERVICE));
@ -339,9 +345,6 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
if (!mIsBound)
bindService();
if (getIntent() == null) if (getIntent() == null)
return; return;
@ -896,4 +899,5 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants
} }
} }