Unified Diff: src/org/adblockplus/android/Preferences.java
Issue 9437197:
ABP/Android Proxy switch (Closed)
Patch Set:
Created Feb. 28, 2013, 1:20 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« src/org/adblockplus/android/AdblockPlus.java ('K')
|
« src/org/adblockplus/android/AdvancedPreferences.java ('k')
|
src/org/adblockplus/android/ProxyService.java » ('j')
|
src/org/adblockplus/android/Starter.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: src/org/adblockplus/android/Preferences.java |
| =================================================================== |
| --- a/src/org/adblockplus/android/Preferences.java |
| +++ b/src/org/adblockplus/android/Preferences.java |
| @@ -24,6 +24,8 @@ |
| import java.util.Date; |
| import java.util.List; |
| +import org.jraf.android.backport.switchwidget.SwitchPreference; |
| + |
| import android.app.ActivityManager; |
| import android.app.ActivityManager.RunningServiceInfo; |
| import android.app.AlertDialog; |
| @@ -42,7 +44,6 @@ |
| import android.os.Build; |
| import android.os.Bundle; |
| import android.os.IBinder; |
| -import android.preference.CheckBoxPreference; |
| import android.preference.ListPreference; |
| import android.preference.PreferenceManager; |
| import android.text.Html; |
| @@ -77,8 +78,8 @@ |
| { |
| super.onCreate(savedInstanceState); |
| - PreferenceManager.setDefaultValues(this, R.xml.preferences, false); |
| - PreferenceManager.setDefaultValues(this, R.xml.preferences_advanced, false); |
| + PreferenceManager.setDefaultValues(this, R.xml.preferences, true); |
| + PreferenceManager.setDefaultValues(this, R.xml.preferences_advanced, true); |
| setContentView(R.layout.preferences); |
| addPreferencesFromResource(R.xml.preferences); |
| @@ -194,18 +195,13 @@ |
| } |
| }).start(); |
| - // Check if service is running and update UI accordingly |
| + // Update service and UI state according to user settings |
| boolean enabled = prefs.getBoolean(getString(R.string.pref_enabled), false); |
| - if (enabled && !isServiceRunning()) |
| - { |
| - setEnabled(false); |
| - } |
| - // Run service if this is first application run |
| - else if (!enabled && firstRun) |
| - { |
| - startService(new Intent(this, ProxyService.class)); |
| - setEnabled(true); |
| - } |
| + boolean proxyenabled = prefs.getBoolean(getString(R.string.pref_proxyenabled), false); |
| + if (enabled || firstRun) |
| + setFilteringEnabled(true); |
| + if (enabled || firstRun || proxyenabled) |
| + setProxyEnabled(true); |
| bindService(new Intent(this, ProxyService.class), proxyServiceConnection, 0); |
| } |
| @@ -233,11 +229,9 @@ |
| protected void onStop() |
| { |
| super.onStop(); |
| - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); |
| - boolean enabled = prefs.getBoolean(getString(R.string.pref_enabled), false); |
| AdblockPlus application = AdblockPlus.getApplication(); |
| application.stopInteractive(); |
| - if (!enabled) |
| + if (!application.isFilteringEnabled()) |
| application.stopEngine(true); |
|
Felix Dahlke
2013/03/11 06:57:38
Why do this in onStop() and not in onSharedPrefere
Andrey Novikov
2013/03/11 07:32:55
Because we need to have JS running during all inte
|
| } |
| @@ -270,29 +264,24 @@ |
| } |
| } |
| - private void setEnabled(boolean enabled) |
| + private void setFilteringEnabled(boolean enabled) |
| { |
| SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(this).edit(); |
| editor.putBoolean(getString(R.string.pref_enabled), enabled); |
| editor.commit(); |
| - ((CheckBoxPreference) findPreference(getString(R.string.pref_enabled))).setChecked(enabled); |
| + ((SwitchPreference) findPreference(getString(R.string.pref_enabled))).setChecked(enabled); |
| + AdblockPlus application = AdblockPlus.getApplication(); |
| + application.setFilteringEnabled(enabled); |
| } |
| - /** |
| - * Checks if ProxyService is running. |
| - * |
| - * @return true if service is running |
| - */ |
| - private boolean isServiceRunning() |
| + private void setProxyEnabled(boolean enabled) |
| { |
| - ActivityManager manager = (ActivityManager) getSystemService(ACTIVITY_SERVICE); |
| - // Actually it returns not only running services, so extra check is required |
| - for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) |
| - { |
| - if ("org.adblockplus.android.ProxyService".equals(service.service.getClassName()) && service.pid > 0) |
| - return true; |
| - } |
| - return false; |
| + SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(this).edit(); |
| + editor.putBoolean(getString(R.string.pref_proxyenabled), enabled); |
| + editor.commit(); |
| + AdblockPlus application = AdblockPlus.getApplication(); |
| + if (enabled && !application.isServiceRunning()) |
| + startService(new Intent(this, ProxyService.class)); |
| } |
| /** |
| @@ -385,19 +374,27 @@ |
| @Override |
| public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) |
| { |
| + AdblockPlus application = AdblockPlus.getApplication(); |
| if (getString(R.string.pref_enabled).equals(key)) |
| { |
| boolean enabled = sharedPreferences.getBoolean(key, false); |
| - boolean serviceRunning = isServiceRunning(); |
| - if (enabled && !serviceRunning) |
| - startService(new Intent(this, ProxyService.class)); |
| - else if (!enabled && serviceRunning) |
| + boolean autoconfigured = sharedPreferences.getBoolean(getString(R.string.pref_proxyautoconfigured), false); |
| + boolean serviceRunning = application.isServiceRunning(); |
| + application.setFilteringEnabled(enabled); |
| + if (enabled) |
| + { |
| + // If user has enabled filtering, enable proxy as well |
| + setProxyEnabled(true); |
| + } |
| + else if (serviceRunning && autoconfigured) |
| + { |
| + // If user disabled filtering disable proxy only if it was autoconfigured |
| stopService(new Intent(this, ProxyService.class)); |
| + } |
| } |
| else if (getString(R.string.pref_subscription).equals(key)) |
| { |
| String current = sharedPreferences.getString(key, null); |
| - AdblockPlus application = AdblockPlus.getApplication(); |
| Subscription subscription = application.getSubscription(current); |
| application.setSubscription(subscription); |
| } |
| @@ -451,7 +448,7 @@ |
| } |
| else |
| { |
| - setEnabled(false); |
| + setFilteringEnabled(false); |
| hideConfigurationMsg(); |
| } |
| } |
| @@ -459,7 +456,7 @@ |
| { |
| String msg = extra.getString("msg"); |
| new AlertDialog.Builder(Preferences.this).setTitle(R.string.error).setMessage(msg).setIcon(android.R.drawable.ic_dialog_alert).setPositiveButton(R.string.ok, null).create().show(); |
| - setEnabled(false); |
| + setFilteringEnabled(false); |
| } |
| if (action.equals(AdblockPlus.BROADCAST_SUBSCRIPTION_STATUS)) |
| { |
