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

purge CMD_INIT/initialize() from TorService, an IntentService doesn't need it 

when switching to an IntentService, a new Intent will always start the
Service, and onCreate() can be used to initialize the Service.
This commit is contained in:
Hans-Christoph Steiner 2015-06-08 20:22:03 -04:00
parent f09379d86c
commit ae83f011b2
4 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/torproject/android/OrbotMainActivity.java
View File

@ -113,16 +113,6 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
LocalBroadcastManager.getInstance(this).registerReceiver(mMessageReceiver, LocalBroadcastManager.getInstance(this).registerReceiver(mMessageReceiver,
new IntentFilter(TorServiceConstants.LOCAL_ACTION_LOG)); new IntentFilter(TorServiceConstants.LOCAL_ACTION_LOG));
mHandler.postDelayed(new Runnable ()
{
public void run ()
{
startService(TorServiceConstants.CMD_INIT);
}
},INIT_DELAY);
} }

3
src/org/torproject/android/service/OnBootReceiver.java
View File

@ -20,13 +20,10 @@ public class OnBootReceiver extends BroadcastReceiver {
if (startOnBoot) if (startOnBoot)
{ {
startService(TorServiceConstants.CMD_INIT,context);
startService(TorServiceConstants.CMD_START,context); startService(TorServiceConstants.CMD_START,context);
if (useVPN) if (useVPN)
startVpnService(context); startVpnService(context);
} }
} }

8
src/org/torproject/android/service/TorService.java
View File

@ -375,9 +375,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
setTorProfile(STATUS_ON); setTorProfile(STATUS_ON);
}else if (action.equals(CMD_STOP)){ }else if (action.equals(CMD_STOP)){
setTorProfile(STATUS_OFF); setTorProfile(STATUS_OFF);
}else if (action.equals(CMD_INIT)){
initialize();
sendCallbackStatus(mCurrentStatus);
}else if (action.equals(CMD_NEWNYM)){ }else if (action.equals(CMD_NEWNYM)){
newIdentity(); newIdentity();
}else if (action.equals(CMD_FLUSH)){ }else if (action.equals(CMD_FLUSH)){
@ -623,11 +620,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
initialize();
}
private void initialize()
{
try try
{ {
mNumberFormat = NumberFormat.getInstance(Locale.getDefault()); //localized numbers! mNumberFormat = NumberFormat.getInstance(Locale.getDefault()); //localized numbers!

1
src/org/torproject/android/service/TorServiceConstants.java
View File

@ -87,7 +87,6 @@ public interface TorServiceConstants {
public static final String CMD_STOP = "stop"; public static final String CMD_STOP = "stop";
public static final String CMD_FLUSH = "flush"; public static final String CMD_FLUSH = "flush";
public static final String CMD_NEWNYM = "newnym"; public static final String CMD_NEWNYM = "newnym";
public static final String CMD_INIT = "init";
public static final String CMD_VPN = "vpn"; public static final String CMD_VPN = "vpn";
public static final String CMD_VPN_CLEAR = "vpnclear"; public static final String CMD_VPN_CLEAR = "vpnclear";
public static final String CMD_UPDATE = "update"; public static final String CMD_UPDATE = "update";