OLD | NEW |
1 /* | 1 /* |
2 * This file is part of Adblock Plus <http://adblockplus.org/>, | 2 * This file is part of Adblock Plus <http://adblockplus.org/>, |
3 * Copyright (C) 2006-2014 Eyeo GmbH | 3 * Copyright (C) 2006-2014 Eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
434 } | 434 } |
435 else if (getString(R.string.pref_acceptableads).equals(key)) | 435 else if (getString(R.string.pref_acceptableads).equals(key)) |
436 { | 436 { |
437 final boolean enabled = sharedPreferences.getBoolean(key, false); | 437 final boolean enabled = sharedPreferences.getBoolean(key, false); |
438 application.setAcceptableAdsEnabled(enabled); | 438 application.setAcceptableAdsEnabled(enabled); |
439 } | 439 } |
440 else if (getString(R.string.pref_subscription).equals(key)) | 440 else if (getString(R.string.pref_subscription).equals(key)) |
441 { | 441 { |
442 final String url = sharedPreferences.getString(key, null); | 442 final String url = sharedPreferences.getString(key, null); |
443 if (url != null) | 443 if (url != null) |
| 444 { |
444 application.setSubscription(url); | 445 application.setSubscription(url); |
| 446 application.updateSubscriptionStatus(url); |
| 447 } |
445 } | 448 } |
446 else if (getString(R.string.pref_hideicon).equals(key)) | 449 else if (getString(R.string.pref_hideicon).equals(key)) |
447 { | 450 { |
448 final boolean hideIcon = sharedPreferences.getBoolean(key, false); | 451 final boolean hideIcon = sharedPreferences.getBoolean(key, false); |
449 if (hideIcon) | 452 if (hideIcon) |
450 showDialog(HIDEICONWARNING_DIALOG); | 453 showDialog(HIDEICONWARNING_DIALOG); |
451 final ProxyService proxyService = this.serviceBinder.get(); | 454 final ProxyService proxyService = this.serviceBinder.get(); |
452 if (proxyService != null) | 455 if (proxyService != null) |
453 proxyService.setEmptyIcon(hideIcon); | 456 proxyService.setEmptyIcon(hideIcon); |
454 } | 457 } |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
567 subscriptionSummary = state.getString("subscriptionSummary"); | 570 subscriptionSummary = state.getString("subscriptionSummary"); |
568 } | 571 } |
569 | 572 |
570 @Override | 573 @Override |
571 protected void onSaveInstanceState(final Bundle outState) | 574 protected void onSaveInstanceState(final Bundle outState) |
572 { | 575 { |
573 outState.putString("subscriptionSummary", subscriptionSummary); | 576 outState.putString("subscriptionSummary", subscriptionSummary); |
574 super.onSaveInstanceState(outState); | 577 super.onSaveInstanceState(outState); |
575 } | 578 } |
576 } | 579 } |
OLD | NEW |