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

Unified Diff: libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/IsAllowedConnectionCallbackImpl.java

Issue 29671734: Issue 6265 - Create shared AdblockEngine instance in AdblockWebView in background (Closed)
Patch Set: Sergey's comments Created Jan. 22, 2018, 6:19 a.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
Index: libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/IsAllowedConnectionCallbackImpl.java
diff --git a/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/IsAllowedConnectionCallbackImpl.java b/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/IsAllowedConnectionCallbackImpl.java
deleted file mode 100644
index 33b70f0ef4b84e6582426a1217998de06528ac3e..0000000000000000000000000000000000000000
--- a/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/IsAllowedConnectionCallbackImpl.java
+++ /dev/null
@@ -1,72 +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.settings;
-
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.util.Log;
-
-import org.adblockplus.libadblockplus.IsAllowedConnectionCallback;
-import org.adblockplus.libadblockplus.android.Utils;
-
-public class IsAllowedConnectionCallbackImpl implements IsAllowedConnectionCallback
-{
- private static final String TAG = Utils.getTag(IsAllowedConnectionCallbackImpl.class);
-
- private ConnectivityManager manager;
-
- public IsAllowedConnectionCallbackImpl(ConnectivityManager manager)
- {
- super();
- this.manager = manager;
- }
-
- @Override
- public boolean isConnectionAllowed(String connection)
- {
- Log.d(TAG, "Checking connection: " + connection);
-
- if (connection == null)
- {
- // required connection type is not specified - any works
- return true;
- }
-
- NetworkInfo info = manager.getActiveNetworkInfo();
- if (info == null || !info.isConnected())
- {
- // not connected
- return false;
- }
-
- ConnectionType connectionType = ConnectionType.findByValue(connection);
- if (connectionType == null)
- {
- Log.e(TAG, "Unknown connection type: " + connection);
- return false;
- }
-
- if (!connectionType.isRequiredConnection(manager))
- {
- Log.w(TAG, "Current connection type is not allowed for web requests");
- return false;
- }
-
- return true;
- }
-}

Powered by Google App Engine
This is Rietveld