Issue 6454 - IllegalStateException crash

adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/MoreBlockingPreferenceCategory.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 108 matching lines @@
         {
           sb.append(DateUtils.formatDateTime(this.getContext(), timestamp,
               DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME));
         }
         else
         {
           sb.append(this.getContext().getString(R.string.last_update_never));
         }
         cbp.setSummary(sb.toString());
       }
-      else if (sub.getType() == SubscriptionInfo.Type.CUSTOM && engine != null)

[René Jeschke, 2018/03/09 10:11:03]

NIT: Unrelated change, but I don't mind. It's up to you.

-      {
-        engine.removeSubscriptionById(sub.getId());
+      else if (sub.getType() == SubscriptionInfo.Type.CUSTOM)
+      {
+        if (engine != null)
+        {
+          engine.removeSubscriptionById(sub.getId());
+        }
         continue;
       }
 
       cbp.setTitle(resInt == null ? sub.getTitle() : getContext().getString(resInt));
       cbp.setChecked(sub.isEnabled());
       cbp.setPersistent(false);
       cbp.setKey(sub.getId());
       cbp.setOnPreferenceChangeListener(this);
       this.addPreference(cbp);
     }
@@ skipping 104 matching lines @@
     }
     return true;
   }
 
   @Override
   public void subscriptionAdded()
   {
     refreshEntries();
   }
 }