Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: adblock-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java

Issue 29908555: Issue 7035 - Update libadblockplus dependency (Closed) Base URL: git@github.com:adblockplus/libadblockplus-android.git@d150f08d5d72de8938c7ebbdccd9b0c4e06b4070
Patch Set: Issue 7035 - Update libadblockplus dependency Created Oct. 16, 2018, 3:17 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « adblock-android/src/org/adblockplus/libadblockplus/UpdateCheckDoneCallback.java ('k') | dependencies » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: adblock-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java
diff --git a/adblock-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java b/adblock-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java
index 8cf6ab829fd3c032965aab4fe0e9792be8ece934..76dbddad9099662719bf7a988740d4b51369a280 100644
--- a/adblock-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java
+++ b/adblock-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java
@@ -37,8 +37,6 @@ import org.adblockplus.libadblockplus.LogSystem;
import org.adblockplus.libadblockplus.Platform;
import org.adblockplus.libadblockplus.ShowNotificationCallback;
import org.adblockplus.libadblockplus.Subscription;
-import org.adblockplus.libadblockplus.UpdateAvailableCallback;
-import org.adblockplus.libadblockplus.UpdateCheckDoneCallback;
import org.adblockplus.libadblockplus.WebRequest;
import android.content.Context;
@@ -69,8 +67,6 @@ public final class AdblockEngine
private volatile FilterEngine filterEngine;
private volatile LogSystem logSystem;
private volatile WebRequest webRequest;
- private volatile UpdateAvailableCallback updateAvailableCallback;
- private volatile UpdateCheckDoneCallback updateCheckDoneCallback;
private volatile FilterChangeCallback filterChangeCallback;
private volatile ShowNotificationCallback showNotificationCallback;
private volatile boolean elemhideEnabled;
@@ -178,18 +174,6 @@ public final class AdblockEngine
return this;
}
- public Builder setUpdateAvailableCallback(UpdateAvailableCallback callback)
- {
- engine.updateAvailableCallback = callback;
- return this;
- }
-
- public Builder setUpdateCheckDoneCallback(UpdateCheckDoneCallback callback)
- {
- engine.updateCheckDoneCallback = callback;
- return this;
- }
-
public Builder setShowNotificationCallback(ShowNotificationCallback callback)
{
engine.showNotificationCallback = callback;
@@ -230,11 +214,6 @@ public final class AdblockEngine
private void initCallbacks()
{
- if (engine.updateAvailableCallback != null)
- {
- engine.filterEngine.setUpdateAvailableCallback(engine.updateAvailableCallback);
- }
-
if (engine.showNotificationCallback != null)
{
engine.filterEngine.setShowNotificationCallback(engine.showNotificationCallback);
@@ -292,10 +271,6 @@ public final class AdblockEngine
// engines first
if (this.filterEngine != null)
{
- if (this.updateAvailableCallback != null)
- {
- this.filterEngine.removeUpdateAvailableCallback();
- }
if (this.filterChangeCallback != null)
{
@@ -312,12 +287,6 @@ public final class AdblockEngine
}
// callbacks then
- if (this.updateAvailableCallback != null)
- {
- this.updateAvailableCallback.dispose();
- this.updateAvailableCallback = null;
- }
-
if (this.filterChangeCallback != null)
{
this.filterChangeCallback.dispose();
@@ -626,11 +595,6 @@ public final class AdblockEngine
return this.filterEngine.getElementHidingSelectors(domain);
}
- public void checkForUpdates()
- {
- this.filterEngine.forceUpdateCheck(this.updateCheckDoneCallback);
- }
-
public FilterEngine getFilterEngine()
{
return this.filterEngine;
« no previous file with comments | « adblock-android/src/org/adblockplus/libadblockplus/UpdateCheckDoneCallback.java ('k') | dependencies » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld