[[ Bug 16694 ]] Send OnNavigationRequestUnhandled on Android

livecodeian · livecodeian · commit fc6a26b20446 · 2016-01-28T13:54:07.000Z
diff --git a/engine/src/java/com/runrev/android/libraries/LibBrowser.java b/engine/src/java/com/runrev/android/libraries/LibBrowser.java
@@ -196,7 +196,10 @@ public void onPageFinished(WebView view, String url)
 			public void onReceivedError(WebView view, int errorCode, String description, String failingUrl)
 			{
 				//doLoadingError(toAPKPath(failingUrl), description);
-				doLoadingError(failingUrl, description);
+				if (errorCode == ERROR_UNSUPPORTED_SCHEME)
+					doUnsupportedScheme(failingUrl);
+				else
+					doLoadingError(failingUrl, description);
 				wakeEngineThread();
 			}
 		});
@@ -598,4 +601,5 @@ public static String escapeJSString(String p_string)
 	public native void doStartedLoading(String url);
 	public native void doFinishedLoading(String url);
 	public native void doLoadingError(String url, String error);
+	public native void doUnsupportedScheme(String url);
 }
diff --git a/libbrowser/src/libbrowser_android.cpp b/libbrowser/src/libbrowser_android.cpp
@@ -976,6 +976,25 @@ JNIEXPORT void JNICALL Java_com_runrev_android_libraries_LibBrowserWebView_doLoa
 	MCCStringFree(t_error);
 }
 
+extern "C" JNIEXPORT void JNICALL Java_com_runrev_android_libraries_LibBrowserWebView_doUnsupportedScheme(JNIEnv *env, jobject object, jstring url) __attribute__((visibility("default")));
+JNIEXPORT void JNICALL Java_com_runrev_android_libraries_LibBrowserWebView_doUnsupportedScheme(JNIEnv *env, jobject object, jstring url)
+{
+	char *t_url;
+	t_url = nil;
+	/* UNCHECKED */ MCBrowserJavaStringToUtf8String(env, url, t_url);
+	
+	if (!MCCStringBeginsWith(t_url, LIBBROWSER_DUMMY_URL))
+	{
+		MCBrowser *t_browser;
+		if (MCBrowserFindWithJavaView(env, object, t_browser))
+		{
+			((MCAndroidWebViewBrowser*)t_browser)->OnNavigationRequestUnhandled(false, t_url);
+		}
+	}
+	
+	MCCStringFree(t_url);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 class MCAndroidWebViewBrowserFactory : public MCBrowserFactory

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,10 @@ public void onPageFinished(WebView view, String url)`
`196`	`196`	`public void onReceivedError(WebView view, int errorCode, String description, String failingUrl)`
`197`	`197`	`{`
`198`	`198`	`//doLoadingError(toAPKPath(failingUrl), description);`
`199`		`- doLoadingError(failingUrl, description);`
	`199`	`+ if (errorCode == ERROR_UNSUPPORTED_SCHEME)`
	`200`	`+ doUnsupportedScheme(failingUrl);`
	`201`	`+ else`
	`202`	`+ doLoadingError(failingUrl, description);`
`200`	`203`	`wakeEngineThread();`
`201`	`204`	`}`
`202`	`205`	`});`
`@@ -598,4 +601,5 @@ public static String escapeJSString(String p_string)`
`598`	`601`	`public native void doStartedLoading(String url);`
`599`	`602`	`public native void doFinishedLoading(String url);`
`600`	`603`	`public native void doLoadingError(String url, String error);`
	`604`	`+ public native void doUnsupportedScheme(String url);`
`601`	`605`	`}`