up ver

Author: PowerExplorer

app/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 24
         versionCode 10
-        versionName "1.6.7"
+        versionName "1.6.8"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         resValue "string", "app_name", "SWeb"
     }

common/src/main/java/net/gnu/common/CustomWebView.java

@@ -5,10 +5,7 @@
 
 public class CustomWebView extends WebView {
 
-	private VideoEnabledWebChromeClient videoEnabledWebChromeClient;
-    private boolean addedJavascriptInterface;
-
-    public CustomWebView(final Context context) {
+	public CustomWebView(final Context context) {
 		super(context);
 	}
 
@@ -23,97 +20,5 @@ public int computeVerticalScrollRangeMethod() {
 	public int computeVerticalScrollExtentMethod() {
 		return computeVerticalScrollExtent();
 	}
-
-    public class JavascriptInterface {
-        @android.webkit.JavascriptInterface
-		@SuppressWarnings("unused")
-        public void notifyVideoEnd() {// Must match Javascript interface method of VideoEnabledWebChromeClient
-            Log.d("___", "GOT IT");
-            // This code is not executed in the UI thread, so we must force that to happen
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
-					@Override
-					public void run() {
-						if (videoEnabledWebChromeClient != null) {
-							videoEnabledWebChromeClient.onHideCustomView();
-						}
-					}
-				});
-        }
-    }
-
-    @SuppressWarnings("unused")
-    public VideoEnabledWebView(Context context) {
-        super(context);
-        addedJavascriptInterface = false;
-    }
-
-    @SuppressWarnings("unused")
-    public VideoEnabledWebView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        addedJavascriptInterface = false;
-    }
-
-    @SuppressWarnings("unused")
-    public VideoEnabledWebView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        addedJavascriptInterface = false;
-    }
-
-    /**
-     * Indicates if the video is being displayed using a custom view (typically full-screen)
-     * @return true it the video is being displayed using a custom view (typically full-screen)
-     */
-    @SuppressWarnings("unused")
-    public boolean isVideoFullscreen() {
-        return videoEnabledWebChromeClient != null && videoEnabledWebChromeClient.isVideoFullscreen();
-    }
-
-    /**
-     * Pass only a VideoEnabledWebChromeClient instance.
-     */
-    @Override @SuppressLint("SetJavaScriptEnabled")
-    public void setWebChromeClient(WebChromeClient client) {
-        getSettings().setJavaScriptEnabled(true);
-
-        if (client instanceof VideoEnabledWebChromeClient) {
-            this.videoEnabledWebChromeClient = (VideoEnabledWebChromeClient) client;
-        }
-
-        super.setWebChromeClient(client);
-    }
-
-    @Override
-    public void loadData(String data, String mimeType, String encoding) {
-        addJavascriptInterface();
-        super.loadData(data, mimeType, encoding);
-    }
-
-    @Override
-    public void loadDataWithBaseURL(String baseUrl, String data, String mimeType, String encoding, String historyUrl) {
-        addJavascriptInterface();
-        super.loadDataWithBaseURL(baseUrl, data, mimeType, encoding, historyUrl);
-    }
-
-    @Override
-    public void loadUrl(String url) {
-        addJavascriptInterface();
-        super.loadUrl(url);
-    }
-
-    @Override
-    public void loadUrl(String url, Map<String, String> additionalHttpHeaders) {
-        addJavascriptInterface();
-        super.loadUrl(url, additionalHttpHeaders);
-    }
-
-    private void addJavascriptInterface() {
-        if (!addedJavascriptInterface) {
-            // Add javascript interface to be called when the video ends (must be done before page load)
-            //noinspection all
-            addJavascriptInterface(new JavascriptInterface(), "_VideoEnabledWebView"); // Must match Javascript interface name of VideoEnabledWebChromeClient
-
-            addedJavascriptInterface = true;
-        }
-    }
-	
+    
 }