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

re-added startService() call as some devices/OS need it

This commit is contained in:
n8fr8 2012-06-29 12:04:26 -04:00
parent 85963c44e8
commit 318beaabcd
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,9 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener
imgStatus = (ImageView)findViewById(R.id.imgStatus); imgStatus = (ImageView)findViewById(R.id.imgStatus);
imgStatus.setOnLongClickListener(this); imgStatus.setOnLongClickListener(this);
startService(new Intent(INTENT_TOR_SERVICE));
} }
@ -307,12 +310,9 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
setLocale(); // setLocale();
bindService(); bindService();
// startService(new Intent(INTENT_TOR_SERVICE));
if (getIntent() == null) if (getIntent() == null)
return; return;
@ -393,19 +393,17 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener
} }
} }
}
/* (non-Javadoc)
* @see android.app.Activity#onStart()
*/
protected void onStart() {
super.onStart();
updateStatus (""); updateStatus ("");
} }
@Override
public void onConfigurationChanged(Configuration newConfig) {
// TODO Auto-generated method stub
super.onConfigurationChanged(newConfig);
}
/* (non-Javadoc) /* (non-Javadoc)
* @see android.app.Activity#onStop() * @see android.app.Activity#onStop()
*/ */
@ -462,7 +460,8 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener
//then update the preferences in an async background task //then update the preferences in an async background task
if (requestCode == 1 && resultCode == 1010 && mService != null) if (requestCode == 1 && resultCode == 1010 && mService != null)
{ {
new ProcessSettingsAsyncTask().execute(mService); new ProcessSettingsAsyncTask().execute(mService);
setLocale();
} }
} }