Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Apply blocking

This commit is contained in:
stom79 2019-02-14 18:14:20 +01:00
parent 7bb586225c
commit 17e029ae70
2 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewActivity.java
View File

@ -20,10 +20,12 @@ import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.view.Menu;
@ -37,6 +39,7 @@ import android.widget.FrameLayout;
import android.widget.Toast;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;
import es.dmoral.toasty.Toasty;
@ -44,6 +47,8 @@ import fr.gouv.etalab.mastodon.R;
import fr.gouv.etalab.mastodon.client.API;
import fr.gouv.etalab.mastodon.client.Entities.Results;
import fr.gouv.etalab.mastodon.helper.Helper;
import fr.gouv.etalab.mastodon.sqlite.DomainBlockDAO;
import fr.gouv.etalab.mastodon.sqlite.Sqlite;
import fr.gouv.etalab.mastodon.webview.MastalabWebChromeClient;
import fr.gouv.etalab.mastodon.webview.MastalabWebViewClient;
@ -63,6 +68,7 @@ public class WebviewActivity extends BaseActivity {
private String peertubeLinkToFetch;
private boolean peertubeLink;
private WebView webView;
public static List<String> trackingDomains;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -83,6 +89,7 @@ public class WebviewActivity extends BaseActivity {
setTheme(R.style.AppThemeDark);
}
setContentView(R.layout.activity_webview);
Bundle b = getIntent().getExtras();
if(b != null) {
@ -141,7 +148,28 @@ public class WebviewActivity extends BaseActivity {
});
if( !url.startsWith("http://") && !url.startsWith("https://"))
url = "http://" + url;
webView.loadUrl(url);
if( trackingDomains == null){
AsyncTask.execute(new Runnable() {
@Override
public void run() {
SQLiteDatabase db = Sqlite.getInstance(WebviewActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
trackingDomains = new DomainBlockDAO(WebviewActivity.this, db).getAll();
if( trackingDomains == null)
trackingDomains = new ArrayList<>();
// Get a handler that can be used to post to the main thread
Handler mainHandler = new Handler(getMainLooper());
Runnable myRunnable = new Runnable() {
@Override
public void run() {
webView.loadUrl(url);
}
};
mainHandler.post(myRunnable);
}
});
}else
webView.loadUrl(url);
}
@Override

23
app/src/main/java/fr/gouv/etalab/mastodon/webview/MastalabWebViewClient.java
View File

@ -13,6 +13,7 @@ package fr.gouv.etalab.mastodon.webview;
*
* You should have received a copy of the GNU General Public License along with Mastalab; if not,
* see <http://www.gnu.org/licenses>. */
import android.annotation.SuppressLint;
import android.app.Activity;
import android.graphics.Bitmap;
@ -20,12 +21,16 @@ import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.view.LayoutInflater;
import android.view.View;
import android.webkit.WebResourceResponse;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.TextView;
import fr.gouv.etalab.mastodon.activities.WebviewActivity;
import java.net.URI;
import java.net.URISyntaxException;
import fr.gouv.etalab.mastodon.R;
import fr.gouv.etalab.mastodon.activities.WebviewActivity;
/**
* Created by Thomas on 25/06/2017.
@ -46,6 +51,22 @@ public class MastalabWebViewClient extends WebViewClient {
}
@Override
public WebResourceResponse shouldInterceptRequest (final WebView view, String url) {
URI uri = null;
try {
uri = new URI(url);
String domain = uri.getHost();
domain = domain.startsWith("www.") ? domain.substring(4) : domain;
if (WebviewActivity.trackingDomains.contains(domain)) {
return null;
}
} catch (URISyntaxException e) {
e.printStackTrace();
}
return super.shouldInterceptRequest(view, url);
}
@Override
public void onPageStarted (WebView view, String url, Bitmap favicon) {
super.onPageStarted(view, url, favicon);