Index: libadblockplus-android-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/SettingsActivity.java
diff --git a/libadblockplus-android-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/SettingsActivity.java b/libadblockplus-android-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/SettingsActivity.java
deleted file mode 100644
index 201830dcdb54a80cf4eda1436d3b2f33bd102460..0000000000000000000000000000000000000000
--- a/libadblockplus-android-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/SettingsActivity.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.adblockplus.libadblockplus.android.webviewapp;
-
-import android.os.Bundle;
-import android.preference.PreferenceActivity;
-import android.util.Log;
-
-import org.adblockplus.libadblockplus.android.AdblockEngine;
-import org.adblockplus.libadblockplus.android.settings.AdblockHelper;
-import org.adblockplus.libadblockplus.android.Utils;
-import org.adblockplus.libadblockplus.android.settings.GeneralSettingsFragment;
-import org.adblockplus.libadblockplus.android.settings.AdblockSettings;
-import org.adblockplus.libadblockplus.android.settings.BaseSettingsFragment;
-import org.adblockplus.libadblockplus.android.settings.AdblockSettingsStorage;
-import org.adblockplus.libadblockplus.android.settings.WhitelistedDomainsSettingsFragment;
-
-public class SettingsActivity
-  extends PreferenceActivity
-  implements
-    BaseSettingsFragment.Provider,
-    GeneralSettingsFragment.Listener,
-    WhitelistedDomainsSettingsFragment.Listener
-{
-  private static final String TAG = Utils.getTag(SettingsActivity.class);
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState)
-  {
-    super.onCreate(savedInstanceState);
-
-    // retaining AdblockEngine asynchronously
-    AdblockHelper.get().getProvider().retain(true);
-
-    insertGeneralFragment();
-  }
-
-  private void insertGeneralFragment()
-  {
-    getFragmentManager()
-      .beginTransaction()
-      .replace(
-        android.R.id.content,
-        GeneralSettingsFragment.newInstance())
-      .commit();
-  }
-
-  private void insertWhitelistedFragment()
-  {
-    getFragmentManager()
-      .beginTransaction()
-      .replace(
-        android.R.id.content,
-        WhitelistedDomainsSettingsFragment.newInstance())
-      .addToBackStack(WhitelistedDomainsSettingsFragment.class.getSimpleName())
-      .commit();
-  }
-
-  // provider
-
-  @Override
-  public AdblockEngine getAdblockEngine()
-  {
-    // if it's retained asynchronously we have to wait until it's ready
-    AdblockHelper.get().getProvider().waitForReady();
-    return AdblockHelper.get().getProvider().getEngine();
-  }
-
-  @Override
-  public AdblockSettingsStorage getAdblockSettingsStorage()
-  {
-    return AdblockHelper.get().getStorage();
-  }
-
-  // listener
-
-  @Override
-  public void onAdblockSettingsChanged(BaseSettingsFragment fragment)
-  {
-    Log.d(TAG, "AdblockHelper setting changed:\n" + fragment.getSettings().toString());
-  }
-
-  @Override
-  public void onWhitelistedDomainsClicked(GeneralSettingsFragment fragment)
-  {
-    insertWhitelistedFragment();
-  }
-
-  @Override
-  public boolean isValidDomain(WhitelistedDomainsSettingsFragment fragment,
-                               String domain,
-                               AdblockSettings settings)
-  {
-    // show error here if domain is invalid
-    return domain != null && domain.length() > 0;
-  }
-
-  @Override
-  protected void onDestroy()
-  {
-    super.onDestroy();
-    AdblockHelper.get().getProvider().release();
-  }
-}