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

enable background starts by default only for Service intent calls

This commit is contained in:
Nathan Freitas 2015-06-22 12:57:59 -04:00
parent dc16c98ff7
commit 765bc61ded
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/preferences.xml
View File

@ -23,7 +23,7 @@ android:enabled="true"
android:title="@string/pref_use_expanded_notifications_title"/> android:title="@string/pref_use_expanded_notifications_title"/>
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="false" android:defaultValue="true"
android:key="pref_allow_background_starts" android:key="pref_allow_background_starts"
android:summary="@string/pref_allow_background_starts_summary" android:summary="@string/pref_allow_background_starts_summary"
android:title="@string/pref_allow_background_starts_title"/> android:title="@string/pref_allow_background_starts_title"/>

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

@ -570,6 +570,9 @@ public class OrbotMainActivity extends Activity
startTor(); startTor();
//never allow backgrounds start from this type of intent start
//app devs who want background starts, can use the service intents
/**
if (Prefs.allowBackgroundStarts()) if (Prefs.allowBackgroundStarts())
{ {
Intent resultIntent; Intent resultIntent;
@ -581,7 +584,7 @@ public class OrbotMainActivity extends Activity
resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus); resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus);
setResult(RESULT_OK, resultIntent); setResult(RESULT_OK, resultIntent);
finish(); finish();
} }*/
} }
else if (action.equals(Intent.ACTION_VIEW)) else if (action.equals(Intent.ACTION_VIEW))