From 10523168bcd90541875ffc0169d35893b45334b5 Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Fri, 27 Mar 2020 11:25:39 +0000 Subject: [PATCH] moved blockExternalLink outside of taskbar - `setBlockExternalLinks()` on server - zero-dependency JS code - JS script added in `inject_externallinks_blocker()` - changed URL to `/catch/external?source=` --- src/wrapper/java/kiwixserver.cpp | 4 ++-- src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixServer.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/wrapper/java/kiwixserver.cpp b/src/wrapper/java/kiwixserver.cpp index 1fb2f36..b64f618 100644 --- a/src/wrapper/java/kiwixserver.cpp +++ b/src/wrapper/java/kiwixserver.cpp @@ -86,9 +86,9 @@ Java_org_kiwix_kiwixlib_JNIKiwixServer_setTaskbar(JNIEnv* env, jobject obj, jboo } JNIEXPORT void JNICALL -Java_org_kiwix_kiwixlib_JNIKiwixServer_setTaskbar(JNIEnv* env, jobject obj, jboolean withTaskbar, jboolean withLibraryButton, jboolean blockExternalLinks) +Java_org_kiwix_kiwixlib_JNIKiwixServer_setBlockExternalLinks(JNIEnv* env, jobject obj, jboolean blockExternalLinks) { - SERVER->setTaskbar(withTaskbar, withLibraryButton, blockExternalLinks); + SERVER->setBlockExternalLinks(blockExternalLinks); } JNIEXPORT jboolean JNICALL diff --git a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixServer.java b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixServer.java index 2fc49e4..11c5f0d 100644 --- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixServer.java +++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixServer.java @@ -33,7 +33,8 @@ public class JNIKiwixServer public native void setNbThreads(int nbTreads); public native void setTaskbar(boolean withTaskBar, boolean witLibraryButton); - public native void setTaskbar(boolean withTaskBar, boolean witLibraryButton, boolean blockExternalLinks); + + public native void setBlockExternalLinks(boolean blockExternalLinks); public native boolean start();