| 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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 { | 234 { |
| 235 unregisterReceiver(receiver); | 235 unregisterReceiver(receiver); |
| 236 } | 236 } |
| 237 catch (IllegalArgumentException e) | 237 catch (IllegalArgumentException e) |
| 238 { | 238 { |
| 239 // ignore - it is thrown if receiver is not registered but it can not be | 239 // ignore - it is thrown if receiver is not registered but it can not be |
| 240 // true in normal conditions | 240 // true in normal conditions |
| 241 } | 241 } |
| 242 unbindService(proxyServiceConnection); | 242 unbindService(proxyServiceConnection); |
| 243 proxyService = null; | 243 proxyService = null; |
| 244 | 244 |
| 245 hideConfigurationMsg(); | 245 hideConfigurationMsg(); |
| 246 } | 246 } |
| 247 | 247 |
| 248 @Override | 248 @Override |
| 249 protected void onStop() | 249 protected void onStop() |
| 250 { | 250 { |
| 251 super.onStop(); | 251 super.onStop(); |
| 252 AdblockPlus application = AdblockPlus.getApplication(); | 252 AdblockPlus application = AdblockPlus.getApplication(); |
| 253 if (!application.isFilteringEnabled()) | 253 if (!application.isFilteringEnabled()) |
| 254 application.stopEngine(); | 254 application.stopEngine(); |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 500 { | 500 { |
| 501 setSubscriptionStatus(text, time); | 501 setSubscriptionStatus(text, time); |
| 502 } | 502 } |
| 503 }); | 503 }); |
| 504 } | 504 } |
| 505 } | 505 } |
| 506 }; | 506 }; |
| 507 | 507 |
| 508 /** | 508 /** |
| 509 * Constructs and updates subscription status text. | 509 * Constructs and updates subscription status text. |
| 510 * | 510 * |
| 511 * @param text | 511 * @param text |
| 512 * status message | 512 * status message |
| 513 * @param time | 513 * @param time |
| 514 * time of last change | 514 * time of last change |
| 515 */ | 515 */ |
| 516 private void setSubscriptionStatus(String text, long time) | 516 private void setSubscriptionStatus(String text, long time) |
| 517 { | 517 { |
| 518 ListPreference subscriptionList = (ListPreference) findPreference(getString(
R.string.pref_subscription)); | 518 ListPreference subscriptionList = (ListPreference) findPreference(getString(
R.string.pref_subscription)); |
| 519 CharSequence summary = subscriptionList.getEntry(); | 519 CharSequence summary = subscriptionList.getEntry(); |
| 520 StringBuilder builder = new StringBuilder(); | 520 StringBuilder builder = new StringBuilder(); |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 571 showConfigurationMsg(getString(R.string.msg_configuration)); | 571 showConfigurationMsg(getString(R.string.msg_configuration)); |
| 572 } | 572 } |
| 573 | 573 |
| 574 public void onServiceDisconnected(ComponentName className) | 574 public void onServiceDisconnected(ComponentName className) |
| 575 { | 575 { |
| 576 proxyService = null; | 576 proxyService = null; |
| 577 Log.d(TAG, "Proxy service disconnected"); | 577 Log.d(TAG, "Proxy service disconnected"); |
| 578 } | 578 } |
| 579 }; | 579 }; |
| 580 } | 580 } |
| OLD | NEW |