Issue 5030 - Fix the disposing order

libadblockplus-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 139 matching lines @@
   public static AdblockEngine create(final AppInfo appInfo,
                                      final String basePath, boolean elemhideEnabled)
   {
     return create(appInfo, basePath, elemhideEnabled, null, null, null, null);
   }
 
   public void dispose()
   {
     Log.w(TAG, "Dispose");
 
+    // engines first
+    if (this.filterEngine != null)
+    {
+      if (this.updateAvailableCallback != null)
+      {
+        this.filterEngine.removeUpdateAvailableCallback();
+      }
+
+      if (this.filterChangeCallback != null)
+      {
+        this.filterEngine.removeFilterChangeCallback();
+      }
+
+      if (this.showNotificationCallback != null)
+      {
+        this.filterEngine.removeShowNotificationCallback();
+      }
+
+      this.filterEngine.dispose();
+      this.filterEngine = null;
+    }
+
+    if (this.jsEngine != null)
+    {
+      this.jsEngine.dispose();
+      this.jsEngine = null;
+    }
+
+    // callbacks then
+    if (this.updateAvailableCallback != null)
+    {
+      this.updateAvailableCallback.dispose();
+      this.updateAvailableCallback = null;
+    }
+
+    if (this.filterChangeCallback != null)
+    {
+      this.filterChangeCallback.dispose();
+      this.filterChangeCallback = null;
+    }
+
+    if (this.showNotificationCallback != null)
+    {
+      this.showNotificationCallback.dispose();
+      this.showNotificationCallback = null;
+    }
+
     if (this.logSystem != null)
     {
       this.logSystem.dispose();
       this.logSystem = null;
     }
 
     if (this.webRequest != null)
     {
       this.webRequest.dispose();
       this.webRequest = null;
     }
-
-    if (this.updateAvailableCallback != null)
-    {
-      if (this.filterEngine != null)
-      {
-        this.filterEngine.removeUpdateAvailableCallback();
-      }
-
-      this.updateAvailableCallback.dispose();
-      this.updateAvailableCallback = null;
-    }
-
-    if (this.updateCheckDoneCallback != null)
-    {
-      this.updateCheckDoneCallback.dispose();
-      this.updateCheckDoneCallback = null;
-    }
-
-    if (this.filterChangeCallback != null)
-    {
-      if (this.filterEngine != null)
-      {
-        this.filterEngine.removeFilterChangeCallback();
-      }
-
-      this.filterChangeCallback.dispose();
-      this.filterChangeCallback = null;
-    }
-
-    if (this.showNotificationCallback != null)
-    {
-      if (this.filterEngine != null)
-      {
-        this.filterEngine.removeShowNotificationCallback();
-      }
-
-      this.showNotificationCallback.dispose();
-      this.showNotificationCallback = null;
-    }
-
-    // Safe disposing (just in case)
-    if (this.filterEngine != null)
-    {
-      this.filterEngine.dispose();
-      this.filterEngine = null;
-    }
-
-    if (this.jsEngine != null)
-    {
-      this.jsEngine.dispose();
-      this.jsEngine = null;
-    }
   }
 
   public boolean isFirstRun()
   {
     return this.filterEngine.isFirstRun();
   }
 
   public boolean isElemhideEnabled()
   {
     return this.elemhideEnabled;
@@ skipping 231 matching lines @@
   public void setWhitelistedDomains(List<String> domains)
   {
     this.whitelistedDomains = domains;
   }
 
   public List<String> getWhitelistedDomains()
   {
     return whitelistedDomains;
   }
 }