Issue 6454 - IllegalStateException crash

adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/WhitelistedWebsitesPreferenceCategory.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 10 matching lines @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.preference.DialogPreference;
 import android.preference.PreferenceCategory;
 import android.text.Html;
 import android.util.AttributeSet;
 import android.view.View;
 
 import org.adblockplus.adblockplussbrowser.R;
 import org.adblockplus.sbrowser.contentblocker.engine.Engine;
-import org.adblockplus.sbrowser.contentblocker.engine.EngineService;
+import org.adblockplus.sbrowser.contentblocker.engine.EngineManager;
 import org.adblockplus.sbrowser.contentblocker.util.SharedPrefsUtils;
 
 import java.util.Collections;
 import java.util.Set;
 import java.util.TreeSet;
 
-public class WhitelistedWebsitesPreferenceCategory extends PreferenceCategory
+public class WhitelistedWebsitesPreferenceCategory extends PreferenceCategory implements
+    EngineManager.OnEngineCreatedCallback
 {
   private final Set<String> whitelistedWebsites = new TreeSet<>();
   private Engine engine;
 
   public WhitelistedWebsitesPreferenceCategory(Context context, AttributeSet attrs)
   {
     super(context, attrs);
     // This is required to remove the title TextView of the PreferenceCategory
     this.setLayoutResource(R.layout.empty_view);
   }
 
   @Override
   protected void onAttachedToActivity()
   {
     super.onAttachedToActivity();
-    EngineService.startService(this.getContext().getApplicationContext(),
-        new EngineService.OnEngineCreatedCallback()
-        {
-          @Override
-          public void onEngineCreated(Engine engine, boolean success)
-          {
-            if (!success)
-            {
-              return;
-            }
-            WhitelistedWebsitesPreferenceCategory.this.engine = engine;
-            WhitelistedWebsitesPreferenceCategory.this.initEntries();
-          }
-        });
+    EngineManager.getInstance().retrieveEngine(getContext(), this);
+  }
+
+  @Override
+  public void onEngineCreated(Engine engine)
+  {
+    this.engine = engine;
+    if (this.engine != null)
+    {
+      initEntries();
+    }
   }
 
   private void initEntries()
   {
     final Set<String> whitelistedWebsites = SharedPrefsUtils.getStringSet(
         this.getContext(), R.string.key_whitelisted_websites, Collections.<String>emptySet());
 
     this.whitelistedWebsites.clear();
     this.whitelistedWebsites.addAll(whitelistedWebsites);
     this.refreshEntries();
@@ skipping 38 matching lines @@
     this.whitelistedWebsites.add(url);
     this.storeWhitelistedWebsites();
   }
 
   private void removeWhitelistedWebsite(String url)
   {
     this.whitelistedWebsites.remove(url);
     this.storeWhitelistedWebsites();
   }
 
-  private void storeWhitelistedWebsites() {
+  private void storeWhitelistedWebsites()
+  {
     SharedPrefsUtils.putStringSet(
         this.getContext(), R.string.key_whitelisted_websites, this.whitelistedWebsites);
     this.refreshEntries();
-    this.engine.requestUpdateBroadcast();
+    if (engine != null)
+    {
+      this.engine.requestUpdateBroadcast();
+    }
   }
 
   private static class WhitelistedWebsitePreference extends DialogPreference
   {
     private final DialogInterface.OnClickListener onDeleteClickListener;
 
     WhitelistedWebsitePreference(Context context, String url,
         DialogInterface.OnClickListener onDeleteClickListener)
     {
       super(context);
@@ skipping 41 matching lines @@
         {
           if (WhitelistedWebsitePreference.this.onDeleteClickListener != null)
           {
             WhitelistedWebsitePreference.this.onDeleteClickListener.onClick(dialog, which);
           }
         }
       });
     }
   }
 }