[[ BrowserWidget ]] Implement scrollbars & useragent properties on Android

livecodeian · livecodeian · commit f228f4e0ca4e · 2015-08-18T15:02:46.000+01:00
diff --git a/engine/src/java/com/runrev/android/libraries/LibBrowser.java b/engine/src/java/com/runrev/android/libraries/LibBrowser.java
@@ -394,6 +394,16 @@ public boolean onTouch(View v, MotionEvent event) {
 			setOnTouchListener(null);
 	}
 	
+	public String getUserAgent()
+	{
+		return getSettings().getUserAgentString();
+	}
+	
+	public void setUserAgent(String p_useragent)
+	{
+		getSettings().setUserAgentString(p_useragent);
+	}
+	
 	/* ACTIONS */
 
 	public void goBack(int p_steps)
diff --git a/libbrowser/src/libbrowser_android.cpp b/libbrowser/src/libbrowser_android.cpp
@@ -120,13 +120,13 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 	
 	virtual bool GetRect(MCBrowserRect &r_rect)
 	{
-		// TODO - implement
+		// TODO - implement (not needed when used with native layers)
 		return false;
 	}
 	
 	virtual bool SetRect(const MCBrowserRect &p_rect)
 	{
-		// TODO - implement
+		// TODO - implement (not needed when used with native layers)
 		return false;
 	}
 	
@@ -165,6 +165,9 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 			case kMCBrowserURL:
 				return GetUrl(r_utf8_string);
 			
+			case kMCBrowserUserAgent:
+				return GetUserAgent(r_utf8_string);
+				
 			default:
 				break;
 		}
@@ -174,7 +177,15 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 	
 	virtual bool SetStringProperty(MCBrowserProperty p_property, const char *p_utf8_string)
 	{
-		// TODO - implement
+		switch (p_property)
+		{
+			case kMCBrowserUserAgent:
+				return SetUserAgent(p_utf8_string);
+			
+			default:
+				break;
+		}
+		
 		return false;
 	}
 	
@@ -242,20 +253,46 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 private:
 	bool GetScrollbarsEnabled(bool &r_value)
 	{
-		// TODO - implement
-		return false;
+		MCAndroidObjectRemoteCall(m_view, "getScrollingEnabled", "b", &r_value);
+		return true;
 	}
 	
 	bool SetScrollbarsEnabled(bool p_value)
 	{
-		// TODO - implement
-		return false;
+		MCAndroidObjectRemoteCall(m_view, "setScrollingEnabled", "vb", nil, p_value);
+		return true;
 	}
 	
 	bool GetUrl(char *&r_utf8_string)
 	{
-		// TODO - implement
-		return false;
+		char *t_url;
+		t_url = nil;
+		
+		MCAndroidObjectRemoteCall(m_view, "getUrl", "s", &t_url);
+		if (t_url == nil)
+			return false;
+			
+		r_utf8_string = t_url;
+		return true;
+	}
+	
+	bool GetUserAgent(char *&r_useragent)
+	{
+		char *t_useragent;
+		t_useragent = nil;
+		MCAndroidObjectRemoteCall(m_view, "getUserAgent", "s", &t_useragent);
+
+		if (t_useragent == nil)
+			return false;
+			
+		r_useragent = t_useragent;
+		return true;
+	}
+	
+	bool SetUserAgent(const char *p_useragent)
+	{
+		MCAndroidObjectRemoteCall(m_view, "setUserAgent", "vs", nil, p_useragent);
+		return true;
 	}
 };
 
