rhodes 3.3.3.beta.3 → 3.3.3.beta.4

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

@@ -1,6 +1,8 @@
 package com.rhomobile.rhodes.extmanager;
 
+import android.view.View;
+
 public interface IRhoExtData {
-	
+	View getWebView();
 	int getTabIndex();
 }

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

@@ -5,23 +5,37 @@ import android.view.View;
 public interface IRhoExtManager {
 
     void registerExtension(String strName, IRhoExtension ext);
-
     IRhoExtension getExtByName(String strName);
 
+    /**
+     * Web view getter. In case of Motorola WebKit is used it returns object which may be directly casted to NeonEkihView
+     * @return Current web view instance from MainView
+     */
     View getWebView();
+    
+    /**
+     * RhodesActivity top level View getter
+     * @return RhodesActivity top level View
+     */
     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);
+    
+    /**
+     * 
+     * @param name - build configuration item name
+     * @return build configuration item value
+     */
+    String getBuildConfigItem(String name);
+
+    void onUnhandledProperty(String moduleName,String name,String value, IRhoExtData ext);
+    void executeRubyCallback(String callback,String callbackBody,String callbackData, boolean waitForResponse);
+    void executeRubyCallbackWithJsonBody(String szCallback, String callbackBody, String callbackData, 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);
+    //void rhoLog(int nSeverity,String szModule,String szMsg,String szFile, int nLine);
     String getCurrentUrl();
     void stopNavigate();
     void historyForward();

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

@@ -2,17 +2,26 @@ 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);
+    void onSetPropertiesData(IRhoExtManager extManager, String propId, String data, int pos, int total, IRhoExtData ext);
+    void onSetPropertiesDataEnd(IRhoExtManager extManager, IRhoExtData ext);
+    void onSetProperty(IRhoExtManager extManager, String name, String value, IRhoExtData ext);
+    void onBeforeNavigate(IRhoExtManager extManager, String url, IRhoExtData ext);
+    void onNavigateProgress(IRhoExtManager extManager, String url, int pos, int total, IRhoExtData ext);
+    void onNavigateComplete(IRhoExtManager extManager, String url, IRhoExtData ext);
+    void onDocumentComplete(IRhoExtManager extManager, 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);
+    //long onNavigateTimeout(IRhoExtManager extManager, String urlBeingNavigatedTo, IRhoExtData ext);
+    //long onSIPState(IRhoExtManager extManager, boolean bSIPState, IRhoExtData ext);
+    void onAlert(IRhoExtManager extManager, String message, IRhoExtData ext);
+    void onConfirm(IRhoExtManager extManager, String message, IRhoExtData ext);
+    void onSelect(IRhoExtManager extManager, String[] items, int selected, IRhoExtData ext);
+    void onStatus(IRhoExtManager extManager, String status, IRhoExtData ext);
+    void onTitle(IRhoExtManager extManager, String title, IRhoExtData ext);
+    void onConsole(IRhoExtManager extManager, String message, IRhoExtData ext);
+    void onInputMethod(IRhoExtManager extManager, boolean enabled, IRhoExtData ext);
+    void onNavigateError(IRhoExtManager extManager, String url, IRhoExtData ext);
+
+    void onAppActivate(IRhoExtManager extManager, boolean bActivate);
 
 }
 

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

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

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

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

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

@@ -4,16 +4,18 @@ import java.util.Hashtable;
 
 import android.view.View;
 
+import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.WebView;
 
-class RhoExtManagerImpl extends Object implements IRhoExtManager {
+public class RhoExtManagerImpl implements IRhoExtManager {
+    private static final String TAG = RhoExtManagerImpl.class.getSimpleName();
 
 	private Hashtable<String, IRhoExtension> mExtensions;
 
-    private IRhoExtData makeDefExtData() {
-        return new RhoExtDataImpl(RhodesActivity.safeGetInstance().getMainView().activeTab());
+    private IRhoExtData makeDefExtData(View view) {
+        return new RhoExtDataImpl(view, RhodesActivity.safeGetInstance().getMainView().activeTab());
     }
     
     private static native void nativeRequireRubyFile(String path);
@@ -22,16 +24,23 @@ class RhoExtManagerImpl extends Object implements IRhoExtManager {
 		mExtensions = new Hashtable<String, IRhoExtension>();
 	}
 	
+	@Override
 	public IRhoExtension getExtByName(String strName) {
-		return mExtensions.get(strName);
+	    synchronized (mExtensions) {
+	        return mExtensions.get(strName);
+	    }
 	}
 
-	public void registerExtension(String strName, IRhoExtension ext) {
-		if (mExtensions.containsKey(strName)) {
-			mExtensions.remove(strName);
-		}
-		mExtensions.put(strName, ext);
-	}
+    public void registerExtension(String strName, IRhoExtension ext) {
+        Logger.T(TAG, "Registering extension: " + strName);
+        synchronized (mExtensions) {
+            if (mExtensions.containsKey(strName)) {
+                mExtensions.remove(strName);
+            }
+
+            mExtensions.put(strName, ext);
+        }
+    }
 
     @Override
 	public View getWebView() {
@@ -42,26 +51,15 @@ class RhoExtManagerImpl extends Object implements IRhoExtManager {
     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);
+        IRhoExtension ext = null;
+        synchronized (mExtensions) {
+            ext = mExtensions.get(extName);
         }
-    }
-
-    public void onBeforeNavigate(String url) {
-        int tabIndex = WebView.activeTab();
-        for (IRhoExtension ext : mExtensions.values()) {
-            RhoExtDataImpl data = new RhoExtDataImpl(tabIndex);
-            ext.onBeforeNavigate(url, data);
+        if (ext != null) {
+            ext.onSetProperty(this, name, value, extData);
         }
     }
 
@@ -70,8 +68,14 @@ class RhoExtManagerImpl extends Object implements IRhoExtManager {
         RhodesService.doRequestEx(url, body, data, waitForResponse);
     }
 
+    @Override
+    public void executeRubyCallbackWithJsonBody(String url, String json, String data, boolean waitForResponse) {
+        RhodesService.doRequestJson(url, json, data, waitForResponse);
+    }
+
     @Override
     public void requireRubyFile(String filePath) {
+        Logger.I(TAG, "Require ruby file: " + filePath);
         nativeRequireRubyFile(filePath);
     }
 
@@ -85,10 +89,6 @@ class RhoExtManagerImpl extends Object implements IRhoExtManager {
         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());
@@ -139,4 +139,141 @@ class RhoExtManagerImpl extends Object implements IRhoExtManager {
         // TODO Auto-generated method stub
     }
 
-}
+    @Override
+    public String getBuildConfigItem(String name) {
+        return RhodesService.getBuildConfig(name);
+    }
+
+
+    //-----------------------------------------------------------------------------------------------------------------
+    // Rhodes implementation related methods are below
+
+    public void onSetPropertiesData(View view,String propId, String data, int position, int total) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onSetPropertiesData(this, propId, data, position, total, makeDefExtData(view));
+            }
+        }
+    }
+
+    public void onBeforeNavigate(View view, String url) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onBeforeNavigate(this, url, makeDefExtData(view));
+            }
+        }
+    }
+
+    public void onNavigateComplete(View view, String url) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onNavigateComplete(this, url, makeDefExtData(view));
+            }
+        }
+    }
+
+    public void onAppActivate(boolean isActivate) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onAppActivate(this, isActivate);
+            }
+        }
+    }
+
+    public void onAlert(View view, String msg) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onAlert(this, msg, makeDefExtData(view));
+            }
+        }
+    }
+
+    public void onConfirm(View view, String msg) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onConfirm(this, msg, makeDefExtData(view));
+            }
+        }
+    }
+
+    public void onConsole(View view, String msg) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onConsole(this, msg, makeDefExtData(view));
+            }
+        }
+    }
+
+    public void onInputMethod(View view, boolean enabled) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onInputMethod(this, enabled, makeDefExtData(view));
+            }
+        }
+    }
+
+    public void onLoadEnd(View view, String url, long arg2, long arg3) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onNavigateComplete(this, url, makeDefExtData(view));
+            }
+        }
+    }
+
+    public void onLoadError(View view) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onNavigateError(this, "", makeDefExtData(view));
+            }
+        }
+    }
+
+    public void onLoadProgress(View view, int val, int total) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onNavigateProgress(this, "", val, total, makeDefExtData(view));
+            }
+        }
+    }
+
+    public void onMetaEnd(View view) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onSetPropertiesDataEnd(this, makeDefExtData(view));
+            }
+        }
+    }
+
+    public void onPrompt(View view, String prompt, String arg2) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onConfirm(this, prompt, makeDefExtData(view));
+            }
+        }
+    }
+
+    public void onSelect(View view, String[] lines, int pos) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onSelect(this, lines, pos, makeDefExtData(view));
+            }
+        }
+    }
+
+    public void onStatus(View view, String msg) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onStatus(this, msg, makeDefExtData(view));
+            }
+        }
+    }
+
+    public void onTitle(View view, String title) {
+        synchronized (mExtensions) {
+            for (IRhoExtension ext : mExtensions.values()) {
+                ext.onStatus(this, title, makeDefExtData(view));
+            }
+        }
+    }
+}
+

data/platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java

@@ -40,6 +40,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.util.Utils;
 
 import android.content.Context;
 import android.content.res.AssetManager;
@@ -52,6 +53,8 @@ public class RhoFileApi {
 	
 	private static final int MAX_SIZE = 2*1024*1024;
 	
+	private static final String STAT_TABLE_FILENAME = "rho.dat";
+	
 	private static AssetManager am;
 	private static String root;
     private static final String DB_FILES_FOLDER = "db/db-files";
@@ -66,13 +69,21 @@ public class RhoFileApi {
 	
 	private static native boolean needEmulate(String path);
 	private static native String makeRelativePath(String path);
-	
-	private static void fillStatTable() throws IOException
-	{
-		InputStream is = null;
-		try {
-			is = am.open("rho.dat");
-			BufferedReader in = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+
+    private static void fillStatTable() throws IOException {
+        InputStream is = null;
+        try {
+
+            File statFile = new File(getRootPath(), STAT_TABLE_FILENAME);
+            if (statFile.exists() && statFile.isFile()) {
+                Log.i(TAG, "Opening stat table from FS: " + statFile.getCanonicalPath());
+                is = new FileInputStream(statFile);
+            } else {
+                Log.i(TAG, "Opening stat table from package assets");
+                is = am.open("rho.dat");
+            }
+
+            BufferedReader in = new BufferedReader(new InputStreamReader(is, "UTF-8"));
 			for (;;) {
 				String line = in.readLine();
 				if (line == null)
@@ -102,7 +113,11 @@ public class RhoFileApi {
 				is.close();
 		}
 	}
-	
+
+    static void patchStatTable(String path) {
+        //TODO: Implement rho.dat patching from bundle filelist.txt
+    }
+
 	private static void copyAssets(String assets[])
 	{
 		for(String asset: assets)
@@ -325,5 +340,27 @@ public class RhoFileApi {
 			return null;
 		}
 	}
-	
+
+    public static int copyRecursively(String srcPath, String trgPath) {
+        try {
+            File source = new File(srcPath);
+            File target = new File(trgPath);
+            Utils.copyRecursively(new Utils.FileSource(), source, target, true);
+            return 0;
+        } catch (Throwable ex) {
+            Logger.E(TAG, ex.getMessage());
+            return -1;
+        }
+    }
+
+    public static int deleteRecursively(String path) {
+        try {
+            Utils.deleteRecursively(new File(path));
+            return 0;
+        } catch (Throwable ex) {
+            Logger.E(TAG, ex.getMessage());
+            return -1;
+        }
+    }
+    
 }