| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2015 Eyeo GmbH | 3 * Copyright (C) 2006-2015 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 |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
| 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 16 */ | 16 */ |
| 17 | 17 |
| 18 package org.adblockplus.android; | 18 package org.adblockplus.android; |
| 19 | 19 |
| 20 import java.util.List; | 20 import java.util.List; |
| 21 import java.util.Locale; | 21 import java.util.Locale; |
| 22 | 22 |
| 23 import org.adblockplus.libadblockplus.AppInfo; | 23 import org.adblockplus.libadblockplus.AppInfo; |
| 24 import org.adblockplus.libadblockplus.Filter; | 24 import org.adblockplus.libadblockplus.Filter; |
| 25 import org.adblockplus.libadblockplus.FilterChangeCallback; | 25 import org.adblockplus.libadblockplus.FilterChangeCallback; |
| 26 import org.adblockplus.libadblockplus.FilterEngine; | 26 import org.adblockplus.libadblockplus.FilterEngine; |
| 27 import org.adblockplus.libadblockplus.FilterEngine.ContentType; | 27 import org.adblockplus.libadblockplus.FilterEngine.ContentType; |
| 28 import org.adblockplus.libadblockplus.JsEngine; | 28 import org.adblockplus.libadblockplus.JsEngine; |
| 29 import org.adblockplus.libadblockplus.LogSystem; | 29 import org.adblockplus.libadblockplus.LogSystem; |
| 30 import org.adblockplus.libadblockplus.Notification; |
| 30 import org.adblockplus.libadblockplus.Subscription; | 31 import org.adblockplus.libadblockplus.Subscription; |
| 31 import org.adblockplus.libadblockplus.UpdateAvailableCallback; | 32 import org.adblockplus.libadblockplus.UpdateAvailableCallback; |
| 32 import org.adblockplus.libadblockplus.UpdateCheckDoneCallback; | 33 import org.adblockplus.libadblockplus.UpdateCheckDoneCallback; |
| 33 | 34 |
| 34 import android.content.Context; | 35 import android.content.Context; |
| 35 import android.content.pm.PackageInfo; | 36 import android.content.pm.PackageInfo; |
| 36 import android.content.pm.PackageManager.NameNotFoundException; | 37 import android.content.pm.PackageManager.NameNotFoundException; |
| 37 import android.os.Build.VERSION; | 38 import android.os.Build.VERSION; |
| 38 import android.util.Log; | 39 import android.util.Log; |
| 39 | 40 |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 } | 274 } |
| 274 | 275 |
| 275 public void updateSubscriptionStatus(final String url) | 276 public void updateSubscriptionStatus(final String url) |
| 276 { | 277 { |
| 277 final Subscription sub = this.filterEngine.getSubscription(url); | 278 final Subscription sub = this.filterEngine.getSubscription(url); |
| 278 if (sub != null) | 279 if (sub != null) |
| 279 { | 280 { |
| 280 Utils.updateSubscriptionStatus(this.context, sub); | 281 Utils.updateSubscriptionStatus(this.context, sub); |
| 281 } | 282 } |
| 282 } | 283 } |
| 284 |
| 285 public Notification getNextNotificationToShow(String url) |
| 286 { |
| 287 return this.filterEngine.getNextNotificationToShow(url); |
| 288 } |
| 289 |
| 290 public Notification getNextNotificationToShow() |
| 291 { |
| 292 return this.filterEngine.getNextNotificationToShow(); |
| 293 } |
| 283 } | 294 } |
| OLD | NEW |