rhodes 3.3.3.beta.1 → 3.3.3.beta.2

data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java

@@ -35,10 +35,8 @@ public class WebView {
 	
 	private static final String TAG = "WebView";
 	
-	private static void reportFail(String name, Exception e) {
-		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
-	}
-	
+	///*** NavigateTask ***
+	///
 	private static class NavigateTask implements Runnable {
 		private String url;
 		private int index;
@@ -54,6 +52,8 @@ public class WebView {
 		}
 	};
 	
+	///*** NavigateBackTask ***
+	///
 	private static class NavigateBackTask implements Runnable {
 		public NavigateBackTask(int index) {
 			mIndex = index;
@@ -65,6 +65,21 @@ public class WebView {
 		private int mIndex;
 	};
 	
+    ///*** NavigateForwardTask ***
+    ///
+    private static class NavigateForwardTask implements Runnable {
+        public NavigateForwardTask(int index) {
+            mIndex = index;
+        }
+        public void run() {
+            RhodesService r = RhodesService.getInstance();
+            r.getMainView().forward(mIndex);
+        }
+        private int mIndex;
+    };
+    
+	///*** RefreshTask ***
+	///
 	private static class RefreshTask implements Runnable {
 		private int index;
 		
@@ -78,6 +93,8 @@ public class WebView {
 		}
 	};
 	
+	///*** SetCookieTask ***
+	///
 	private static class SetCookieTask implements Runnable {
 		private String url;
 		private String cookie;
@@ -94,12 +111,28 @@ public class WebView {
 		}
 	};
 
+    ///*** StopNavigateTask ***
+    ///
+    private static class StopNavigateTask implements Runnable {
+        private int index;
+        
+        public StopNavigateTask(int i) {
+            index = i;
+        }
+        
+        public void run() {
+            RhodesService r = RhodesService.getInstance();
+            r.getMainView().stopNavigate(index);
+        }
+    };
+    
+	
 	public static void navigate(String url, int index) {
 		try {
 			PerformOnUiThread.exec(new NavigateTask(url, index));
 		}
 		catch (Exception e) {
-			reportFail("navigate", e);
+            Logger.E(TAG, e);
 		}
 	}
 	
@@ -108,16 +141,25 @@ public class WebView {
 			PerformOnUiThread.exec(new NavigateBackTask(activeTab()));
 		}
 		catch (Exception e) {
-			reportFail("navigateBack", e);
+            Logger.E(TAG, e);
 		}
 	}
 	
+    public static void navigateForward() {
+        try {
+            PerformOnUiThread.exec(new NavigateForwardTask(activeTab()));
+        }
+        catch (Exception e) {
+            Logger.E(TAG, e);
+        }
+    }
+    
 	public static void refresh(int index) {
 		try {
 			PerformOnUiThread.exec(new RefreshTask(index));
 		}
 		catch (Exception e) {
-			reportFail("refresh", e);
+            Logger.E(TAG, e);
 		}
 	}
 	
@@ -127,7 +169,7 @@ public class WebView {
 			return r.getMainView().activeTab();
 		}
 		catch (Exception e) {
-			reportFail("activeTab", e);
+            Logger.E(TAG, e);
 		}
 		
 		return 0;
@@ -138,7 +180,7 @@ public class WebView {
 			PerformOnUiThread.exec(new NavigateTask("javascript:" + js, index));
 		}
 		catch (Exception e) {
-			reportFail("executeJs", e);
+            Logger.E(TAG, e);
 		}
 	}
 	
@@ -147,7 +189,16 @@ public class WebView {
 			PerformOnUiThread.exec(new SetCookieTask(url, cookie));
 		}
 		catch (Exception e) {
-			reportFail("setCookie", e);
+            Logger.E(TAG, e);
 		}
 	}
+
+    public static void stopNavigate() {
+        try {
+            PerformOnUiThread.exec(new StopNavigateTask(activeTab()));
+        }
+        catch (Exception e) {
+            Logger.E(TAG, e);
+        }
+    }
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtData.java

@@ -0,0 +1,6 @@
+package com.rhomobile.rhodes.extmanager;
+
+public interface IRhoExtData {
+	
+	int getTabIndex();
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtManager.java

@@ -0,0 +1,39 @@
+package com.rhomobile.rhodes.extmanager;
+
+import android.view.View;
+
+public interface IRhoExtManager {
+
+    void registerExtension(String strName, IRhoExtension ext);
+
+    IRhoExtension getExtByName(String strName);
+
+    View getWebView();
+    View getTopView();
+
+    void onBeforeNavigate(String url);
+
+    void onUnhandledProperty(String pModuleName,String pName,String pValue, IRhoExtData ext);
+    void executeRubyCallback(String szCallback,String szCallbackBody,String szCallbackData, boolean waitForResponse);
+    void requireRubyFile(String szFilePath);
+
+    void navigate(String url);
+    //boolean existsJavascript(String jsFunction);
+    void executeJavascript(String jsFunction);
+
+    void rhoLog(int nSeverity,String szModule,String szMsg,String szFile, int nLine);
+    String getCurrentUrl();
+    void stopNavigate();
+    void historyForward();
+    void historyBack();
+    void refreshPage(boolean bFromCache);
+    void quitApp();
+    void minimizeApp();
+    void restoreApp();
+    //void resizeBrowserWindow(RECT rc);
+    void zoomPage(float fZoom);
+    void zoomText(int nZoom);
+
+}
+
+

data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtension.java

@@ -0,0 +1,18 @@
+package com.rhomobile.rhodes.extmanager;
+
+public interface IRhoExtension {
+
+    void onSetPropertiesData(String propId, String data, IRhoExtData ext);
+    void onSetProperty(String name, String value, IRhoExtData ext);
+    void onBeforeNavigate(String urlBeingNavigatedTo, IRhoExtData ext);
+    void onNavigateComplete(String urlBeingNavigatedTo, IRhoExtData ext);
+    void onDocumentComplete(String urlOfDocument, IRhoExtData ext);
+    //bool onWndMsg(MSG& oMsg){return false;}
+    long onNavigateTimeout(String urlBeingNavigatedTo, IRhoExtData ext);
+    long onSIPState(boolean bSIPState, IRhoExtData ext);
+    //long onAlertPopup(int nEnum, void pData, IRhoExtData ext);
+    long onNavigateError(String urlBeingNavigatedTo, IRhoExtData ext);
+    void onAppActivate(boolean bActivate, IRhoExtData ext);
+
+}
+

data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtDataImpl.java

@@ -0,0 +1,18 @@
+package com.rhomobile.rhodes.extmanager;
+
+class RhoExtDataImpl implements IRhoExtData {
+	
+	private int mTabIndex;
+	
+	public RhoExtDataImpl(int tabIndex) {
+		mTabIndex = tabIndex;
+	}
+	
+	public int getTabIndex() {
+		return mTabIndex;
+	}
+	
+	public void setTabIndex(int tab_index) {
+		mTabIndex = tab_index;
+	}
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerImpl.java

@@ -0,0 +1,142 @@
+package com.rhomobile.rhodes.extmanager;
+
+import java.util.Hashtable;
+
+import android.view.View;
+
+import com.rhomobile.rhodes.RhodesActivity;
+import com.rhomobile.rhodes.RhodesService;
+import com.rhomobile.rhodes.WebView;
+
+class RhoExtManagerImpl extends Object implements IRhoExtManager {
+
+	private Hashtable<String, IRhoExtension> mExtensions;
+
+    private IRhoExtData makeDefExtData() {
+        return new RhoExtDataImpl(RhodesActivity.safeGetInstance().getMainView().activeTab());
+    }
+    
+    private static native void nativeRequireRubyFile(String path);
+
+	public RhoExtManagerImpl() {
+		mExtensions = new Hashtable<String, IRhoExtension>();
+	}
+	
+	public IRhoExtension getExtByName(String strName) {
+		return mExtensions.get(strName);
+	}
+
+	public void registerExtension(String strName, IRhoExtension ext) {
+		if (mExtensions.containsKey(strName)) {
+			mExtensions.remove(strName);
+		}
+		mExtensions.put(strName, ext);
+	}
+
+    @Override
+	public View getWebView() {
+        return RhodesActivity.safeGetInstance().getMainView().getWebView(WebView.activeTab()).getView();
+    }
+
+    @Override
+    public View getTopView() {
+        return RhodesActivity.safeGetInstance().getMainView().getView();
+    }
+    
+    public void onSetPropertiesData(String propId, String data) {
+        for (IRhoExtension ext : mExtensions.values()) {
+            ext.onSetPropertiesData(propId, data, makeDefExtData());
+        }
+    }
+
+    @Override
+    public void onUnhandledProperty(String extName, String name, String value, IRhoExtData extData) {
+        IRhoExtension ext = mExtensions.get(extName);
+        if (ext != null) {
+            ext.onSetProperty(name, value, extData);
+        }
+    }
+
+    public void onBeforeNavigate(String url) {
+        int tabIndex = WebView.activeTab();
+        for (IRhoExtension ext : mExtensions.values()) {
+            RhoExtDataImpl data = new RhoExtDataImpl(tabIndex);
+            ext.onBeforeNavigate(url, data);
+        }
+    }
+
+    @Override
+    public void executeRubyCallback(String url, String body, String data, boolean waitForResponse) {
+        RhodesService.doRequestEx(url, body, data, waitForResponse);
+    }
+
+    @Override
+    public void requireRubyFile(String filePath) {
+        nativeRequireRubyFile(filePath);
+    }
+
+    @Override
+    public void navigate(String url) {
+        WebView.navigate(url, WebView.activeTab());
+    }
+
+    @Override
+    public void executeJavascript(String jsFunction) {
+        WebView.executeJs(jsFunction, WebView.activeTab());
+    }
+
+    @Override
+    public void rhoLog(int nSeverity, String szModule, String szMsg, String szFile, int nLine) {
+    }
+
+    @Override
+    public String getCurrentUrl() {
+        return RhodesActivity.safeGetInstance().getMainView().currentLocation(RhodesActivity.safeGetInstance().getMainView().activeTab());
+    }
+
+    @Override
+    public void stopNavigate() {
+        WebView.stopNavigate();
+    }
+
+    @Override
+    public void historyForward() {
+        WebView.navigateForward();
+    }
+
+    @Override
+    public void historyBack() {
+        WebView.navigateBack();
+    }
+
+    @Override
+    public void refreshPage(boolean bFromCache) {
+        WebView.refresh(WebView.activeTab());
+    }
+
+    @Override
+    public void quitApp() {
+        RhodesService.exit();
+    }
+
+    @Override
+    public void minimizeApp() {
+        // TODO Auto-generated method stub
+    }
+
+    @Override
+    public void restoreApp() {
+        // TODO Auto-generated method stub
+    }
+
+    @Override
+    public void zoomPage(float fZoom) {
+        // TODO Auto-generated method stub
+    }
+
+    @Override
+    public void zoomText(int nZoom) {
+        // TODO Auto-generated method stub
+    }
+
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerSingleton.java

@@ -0,0 +1,15 @@
+package com.rhomobile.rhodes.extmanager;
+
+public class RhoExtManagerSingleton extends Object {
+	
+	private static RhoExtManagerImpl ourRhoExtManager = null;
+	
+	
+	public static IRhoExtManager getRhoExtManagerInstance() {
+		if (ourRhoExtManager == null) {
+			ourRhoExtManager = new RhoExtManagerImpl();
+		}
+		return ourRhoExtManager;
+	}
+	
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java

@@ -28,7 +28,7 @@ package com.rhomobile.rhodes.mainview;
 
 import java.util.Map;
 
-import com.rhomobile.rhodes.webview.WebView;
+import com.rhomobile.rhodes.webview.IRhoWebView;
 
 import android.view.View;
 
@@ -36,9 +36,9 @@ public interface MainView {
 
 	public View getView();
 
-	public WebView getWebView(int tab_index);
+	public IRhoWebView getWebView(int tab_index);
 	
-	public WebView detachWebView();
+	public IRhoWebView detachWebView();
 	
 	public void back(int index);
 	public void forward(int index);
@@ -47,7 +47,10 @@ public interface MainView {
 	public void goBack();
 	
 	public void navigate(String url, int index);
+	public void executeJS(String js, int index);
+	//public boolean existsJS(String js, int index);
 	public void reload(int index);
+	public void stopNavigate(int index);
 	
 	public String currentLocation(int index);
 	

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java

@@ -43,7 +43,7 @@ import com.rhomobile.rhodes.nativeview.RhoNativeViewManager;
 import com.rhomobile.rhodes.util.ContextFactory;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 import com.rhomobile.rhodes.util.Utils;
-import com.rhomobile.rhodes.webview.WebView;
+import com.rhomobile.rhodes.webview.IRhoWebView;
 import com.rhomobile.rhodes.webview.GoogleWebView;
 
 import android.app.Activity;
@@ -145,7 +145,7 @@ public class SimpleMainView implements MainView {
 	};
 	
 	private LinearLayout view;
-	private WebView webView;
+	private IRhoWebView webView;
 	private RhoNativeViewManager.RhoNativeView mNativeView = null;
 	private View mNativeViewView = null;
 	private LinearLayout navBar = null;
@@ -159,7 +159,7 @@ public class SimpleMainView implements MainView {
 	}
 
 	@Override
-	public WebView getWebView(int tab_index) {
+	public IRhoWebView getWebView(int tab_index) {
 		return webView;
 	}
 
@@ -300,9 +300,9 @@ public class SimpleMainView implements MainView {
     }
 	
 	
-	public WebView detachWebView() {
+	public IRhoWebView detachWebView() {
 		restoreWebView();
-		WebView v = null;
+		IRhoWebView v = null;
 		if (webView != null) {
 			view.removeView(webView.getView());
 			v = webView;
@@ -516,7 +516,7 @@ public class SimpleMainView implements MainView {
 		}
 	}
 	
-	private void init(WebView v, Object params) {
+	private void init(IRhoWebView v, Object params) {
 		RhodesActivity activity = RhodesActivity.safeGetInstance();
 		
 		view = new MyView(activity);
@@ -530,8 +530,8 @@ public class SimpleMainView implements MainView {
 		if (webView == null) {
 	        if (Capabilities.WEBKIT_BROWSER_ENABLED) {
 	            try {
-	                Class<? extends WebView> viewClass = (Class<? extends WebView>)Class.forName("com.rhomobile.rhodes.webview.EkiohWebView");
-	                Constructor<? extends WebView> viewCtor = viewClass.getConstructor(Activity.class);
+	                Class<? extends IRhoWebView> viewClass = (Class<? extends IRhoWebView>)Class.forName("com.rhomobile.rhodes.webview.EkiohWebView");
+	                Constructor<? extends IRhoWebView> viewCtor = viewClass.getConstructor(Activity.class);
 	                webView = viewCtor.newInstance(activity);
 	            } catch (Throwable e) {
 	                Logger.E(TAG, e);
@@ -561,11 +561,11 @@ public class SimpleMainView implements MainView {
 		init(null, null);
 	}
 	
-	public SimpleMainView(WebView v) {
+	public SimpleMainView(IRhoWebView v) {
 		init(v, null);
 	}
 	
-	public SimpleMainView(WebView v, Object params) {
+	public SimpleMainView(IRhoWebView v, Object params) {
 		init(v, params);
 	}
 	
@@ -579,14 +579,15 @@ public class SimpleMainView implements MainView {
         
         boolean bStartPage = RhodesService.isOnStartPage();
 
-        if ( !bStartPage && webView.canGoBack() )
+        if ( !bStartPage && webView.canGoBack() ) {
             webView.goBack();
+        }
         else
         {    
 	        RhodesActivity ra = RhodesActivity.getInstance();
 	        if ( ra != null )
 	            ra.moveTaskToBack(true);
-        }		
+        }
 	}
 	
 	public void goBack() 
@@ -609,7 +610,12 @@ public class SimpleMainView implements MainView {
 			}
 		}
 	}
-	
+
+    @Override
+    public void executeJS(String js, int index) {
+        com.rhomobile.rhodes.WebView.executeJs(js, index);
+    }
+    
 	public void reload(int index) {
 		if (mNativeViewView != null) {
 			mNativeViewView.invalidate();
@@ -619,6 +625,12 @@ public class SimpleMainView implements MainView {
 		}
 	}
 	
+	public void stopNavigate(int index) {
+	    if (mNativeViewView == null) {
+	        webView.stopLoad();
+	    }
+	}
+	
 	public String currentLocation(int index) {
 		return webView.getUrl();
 	}