[[ BrowserWidget ]] Implement browser "htmltext" property on Android

livecodeian · livecodeian · commit 91fc8ad66b9b · 2015-10-29T10:05:52.000Z
diff --git a/libbrowser/src/libbrowser_android.cpp b/libbrowser/src/libbrowser_android.cpp
@@ -21,6 +21,10 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
+#define LIBBROWSER_DUMMY_URL "http://libbrowser_dummy_url/"
+
+////////////////////////////////////////////////////////////////////////////////
+
 bool MCAndroidWebViewBrowserFactoryCreate(MCBrowserFactoryRef &r_factory);
 
 MCBrowserFactoryMap s_factory_list[] =
@@ -643,6 +647,9 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 			case kMCBrowserJavaScriptHandlers:
 				return GetJavaScriptHandlers(r_utf8_string);
 				
+			case kMCBrowserHTMLText:
+				return GetHTMLText(r_utf8_string);
+				
 			default:
 				break;
 		}
@@ -660,6 +667,9 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 			case kMCBrowserJavaScriptHandlers:
 				return SetJavaScriptHandlers(p_utf8_string);
 				
+			case kMCBrowserHTMLText:
+				return SetHTMLText(p_utf8_string);
+				
 			default:
 				break;
 		}
@@ -754,6 +764,17 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 		return true;
 	}
 	
+	bool GetHTMLText(char *&r_htmltext)
+	{
+		return EvaluateJavaScript("document.documentElement.outerHTML", r_htmltext);
+	}
+	
+	bool SetHTMLText(const char *p_utf8_string)
+	{
+		MCAndroidObjectRemoteCall(m_view, "loadHtml", "vss", nil, LIBBROWSER_DUMMY_URL, p_utf8_string);
+		return true;
+	}
+	
 	bool GetUserAgent(char *&r_useragent)
 	{
 		char *t_useragent;
@@ -875,11 +896,14 @@ JNIEXPORT void JNICALL Java_com_runrev_android_libraries_LibBrowserWebView_doSta
     t_url = nil;
     /* UNCHECKED */ MCBrowserJavaStringToUtf8String(env, url, t_url);
     
-	MCBrowser *t_browser;
-	if (MCBrowserFindWithJavaView(env, object, t_browser))
+	if (!MCCStringBeginsWith(t_url, LIBBROWSER_DUMMY_URL))
 	{
-		((MCAndroidWebViewBrowser*)t_browser)->OnNavigationBegin(false, t_url);
-		((MCAndroidWebViewBrowser*)t_browser)->OnDocumentLoadBegin(false, t_url);
+		MCBrowser *t_browser;
+		if (MCBrowserFindWithJavaView(env, object, t_browser))
+		{
+			((MCAndroidWebViewBrowser*)t_browser)->OnNavigationBegin(false, t_url);
+			((MCAndroidWebViewBrowser*)t_browser)->OnDocumentLoadBegin(false, t_url);
+		}
 	}
 
 	MCCStringFree(t_url);
@@ -892,11 +916,14 @@ JNIEXPORT void JNICALL Java_com_runrev_android_libraries_LibBrowserWebView_doFin
     t_url = nil;
     /* UNCHECKED */ MCBrowserJavaStringToUtf8String(env, url, t_url);
     
-	MCBrowser *t_browser;
-	if (MCBrowserFindWithJavaView(env, object, t_browser))
+	if (!MCCStringBeginsWith(t_url, LIBBROWSER_DUMMY_URL))
 	{
-		((MCAndroidWebViewBrowser*)t_browser)->OnDocumentLoadComplete(false, t_url);
-		((MCAndroidWebViewBrowser*)t_browser)->OnNavigationComplete(false, t_url);
+		MCBrowser *t_browser;
+		if (MCBrowserFindWithJavaView(env, object, t_browser))
+		{
+			((MCAndroidWebViewBrowser*)t_browser)->OnDocumentLoadComplete(false, t_url);
+			((MCAndroidWebViewBrowser*)t_browser)->OnNavigationComplete(false, t_url);
+		}
 	}
 
 	MCCStringFree(t_url);
@@ -913,11 +940,14 @@ JNIEXPORT void JNICALL Java_com_runrev_android_libraries_LibBrowserWebView_doLoa
     t_error = nil;
     /* UNCHECKED */ MCBrowserJavaStringToUtf8String(env, error, t_error);
     
-	MCBrowser *t_browser;
-	if (MCBrowserFindWithJavaView(env, object, t_browser))
+	if (!MCCStringBeginsWith(t_url, LIBBROWSER_DUMMY_URL))
 	{
-		((MCAndroidWebViewBrowser*)t_browser)->OnDocumentLoadFailed(false, t_url, t_error);
-		((MCAndroidWebViewBrowser*)t_browser)->OnNavigationFailed(false, t_url, t_error);
+		MCBrowser *t_browser;
+		if (MCBrowserFindWithJavaView(env, object, t_browser))
+		{
+			((MCAndroidWebViewBrowser*)t_browser)->OnDocumentLoadFailed(false, t_url, t_error);
+			((MCAndroidWebViewBrowser*)t_browser)->OnNavigationFailed(false, t_url, t_error);
+		}
 	}
 
 	MCCStringFree(t_url);
