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

data/platform/android/Rhodes/jni/src/extmanager.cpp

@@ -29,8 +29,11 @@
 
 #include <ruby/ext/rho/rhoruby.h>
 
+#include <string>
+
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_extmanager_RhoExtManagerImpl_nativeRequireRubyFile
   (JNIEnv * env, jclass, jstring jPath)
 {
-
+    std::string path = rho_cast<std::string>(env, jPath);
+    rb_require(path.c_str());
 }

data/platform/android/Rhodes/jni/src/fileapi.cpp

@@ -33,6 +33,7 @@
 
 #include <hash_map>
 
+#include "rhodes/fileapi.h"
 #include "rhodes/jni/com_rhomobile_rhodes_file_RhoFileApi.h"
 
 #ifdef RHO_NOT_IMPLEMENTED
@@ -106,6 +107,8 @@ rho_dir_map_t rho_dir_map;
 static std::vector<DIR*> rho_dir_free;
 static int rho_dir_counter = -1;
 
+static volatile RhoFsMode rho_fs_mode = RHO_FS_DISK_ONLY;
+
 static jclass clsFileApi;
 static jmethodID midCopy;
 static jmethodID midOpen;
@@ -202,6 +205,8 @@ struct stat librhodes_st;
 
 static std::string g_apk_path;
 
+RHO_GLOBAL void rho_file_set_fs_mode(int mode);
+
 std::string const &rho_apk_path()
 {
     return g_apk_path;
@@ -334,6 +339,8 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_nativeInit
     librhodes_st.st_uid = getuid();
     librhodes_st.st_gid = getgid();
 
+    rho_file_set_fs_mode(RHO_FS_TRANSPARRENT);
+
     RHO_LOG("Library stat (mode: %d, uid: %d, gid: %d)", librhodes_st.st_mode, librhodes_st.st_uid, librhodes_st.st_gid);
 }
 
@@ -481,8 +488,10 @@ static void dump_stat(struct stat const &st)
 }
 #endif
 
-static bool need_emulate_dir(std::string const &path)
+inline bool need_emulate_dir(std::string const &path)
 {
+    if (rho_fs_mode != RHO_FS_TRANSPARRENT) return false;
+
     std::string fpath = make_full_path(path);
     std::string const &root_path = rho_root_path();
     if (fpath.size() < root_path.size())
@@ -490,27 +499,24 @@ static bool need_emulate_dir(std::string const &path)
     return ::strncmp(fpath.c_str(), root_path.c_str(), root_path.size()) == 0;
 }
 
-static bool need_emulate_dir(const char *path)
+inline bool need_emulate_dir(const char *path)
 {
     return path ? need_emulate_dir(std::string(path)) : false;
 }
 
 static bool need_emulate(std::string const &path)
 {
-    //RHO_LOG("need_emulate: %s", path.c_str());
+    if (rho_fs_mode != RHO_FS_TRANSPARRENT) return false;
+
     std::string fpath = make_full_path(path);
-    //RHO_LOG("need_emulate: (1): %s", fpath.c_str());
     std::string const &root_path = rho_root_path();
     if (::strncmp(fpath.c_str(), root_path.c_str(), root_path.size()) == 0)
     {
-        //RHO_LOG("need_emulate: (2)");
         struct stat st;
         if (real_stat(fpath.c_str(), &st) == -1)
         {
-            //RHO_LOG("need_emulate: (3)");
             if (errno == ENOENT)
             {
-                //RHO_LOG("No such file or directory: %s, need to read it from Android package", fpath.substr(root_path.size()).c_str());
                 rho_stat_t *rst = rho_stat(fpath);
                 return rst != NULL;
             }
@@ -518,25 +524,19 @@ static bool need_emulate(std::string const &path)
         }
         else if (S_ISREG(st.st_mode))
         {
-            //RHO_LOG("need_emulate: (4)");
             rho_stat_t *rst = rho_stat(fpath);
-            //RHO_LOG("need_emulate: (5)");
             if (rst && rst->mtime > st.st_mtime)
             {
-                //RHO_LOG("need_emulate: %s, st.st_mtime: %lu", fpath.c_str(), st.st_mtime);
-                //RHO_LOG("need_emulate: %s, rst->mtime: %lu", fpath.c_str(), rst ? rst->mtime : -1);
-                //RHO_LOG("need_emulate: file %s in Android package is newer than one located on FS, unlink FS one", fpath.c_str());
                 real_unlink(fpath.c_str());
                 return true;
             }
         }
     }
 
-    //RHO_LOG("need_emulate: return false");
     return false;
 }
 
-static bool need_emulate(const char *path)
+inline bool need_emulate(const char *path)
 {
     return path ? need_emulate(std::string(path)) : false;
 }
@@ -1673,3 +1673,27 @@ RHO_GLOBAL int scandir(const char *dir, struct dirent ***namelist, int (*filter)
 
     RHO_NOT_IMPLEMENTED;
 }
+
+RHO_GLOBAL void rho_file_set_fs_mode(int mode)
+{
+    switch (mode)
+    {
+    case RHO_FS_TRANSPARRENT:
+    case RHO_FS_DISK_ONLY:
+        rho_fs_mode = static_cast<RhoFsMode>(mode);
+        LOG(TRACE) + "New FS mode: " + mode;
+        break;
+    default:
+        LOG(ERROR) + "Wrong FS mode: " + mode;
+    }
+}
+
+RHO_GLOBAL void rho_file_patch_stat_table(const rho::String& path)
+{
+    JNIEnv* env = jnienv();
+    static jmethodID mid = getJNIClassStaticMethod(env, clsFileApi, "patchStatTable", "(Ljava/lang/String;)Z");
+
+    jhstring jhPath = rho_cast<jhstring>(env, path);
+
+    env->CallStaticVoidMethod(clsFileApi, mid, jhPath.get());
+}

data/platform/android/Rhodes/jni/src/mapview.cpp

@@ -24,6 +24,7 @@
 * http://rhomobile.com
 *------------------------------------------------------------------------*/
 
+#include <genconfig.h>
 #include "rhodes/JNIRhodes.h"
 
 #include "rhodes/JNIRhoRuby.h"
@@ -31,8 +32,6 @@
 #include <common/rhoparams.h>
 #include <common/map/MapEngine.h>
 
-#include <genconfig.h>
-
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "AndroidMapEngine"
 

data/platform/android/Rhodes/jni/src/rhodesapp.cpp

@@ -200,6 +200,16 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doRequestEx
     RHODESAPP().callCallbackWithData(url, body, data, waitForResponse);
 }
 
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doRequestJson
+  (JNIEnv *env, jclass, jstring jUrl, jstring jBody, jstring jData, jboolean waitForResponse)
+{
+    std::string url = rho_cast<std::string>(jUrl);
+    std::string body = rho_cast<std::string>(jBody);
+    std::string data = rho_cast<std::string>(jData);
+
+    RHODESAPP().callCallbackWithJsonBody(url.c_str(), body.c_str(), data.c_str(), waitForResponse);
+}
+
 RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_normalizeUrl
   (JNIEnv *env, jobject, jstring strUrl)
 {

data/platform/android/Rhodes/jni/src/rhodessystem.cpp

@@ -166,7 +166,7 @@ RHO_GLOBAL void android_setup(JNIEnv *env)
     sqlite3_temp_directory = (char*)s_sqlite_path.c_str();
 
     // Init logconf
-    rho_logconf_Init(rho_native_rhopath(), "");
+    rho_logconf_Init(rho_native_rhopath(), rho_native_rhopath(), "");
 
     // Disable log to stdout as on android all stdout redirects to /dev/null
     RHOCONF().setBool("LogToOutput", false, true);

data/platform/android/Rhodes/jni/src/signature.cpp

@@ -77,7 +77,7 @@ RHO_GLOBAL void rho_signature_take(char* callback_url, rho_param* p)
     
 }
 
-RHO_GLOBAL void rho_signature_visible(bool b, rho_param* p)
+RHO_GLOBAL void rho_signature_visible(bool visible, rho_param* p)
 {
     JNIEnv *env = jnienv();
     jclass cls = getJNIClass(RHODES_JAVA_CLASS_SIGNATURE);
@@ -85,9 +85,6 @@ RHO_GLOBAL void rho_signature_visible(bool b, rho_param* p)
     jmethodID mid = getJNIClassStaticMethod(env, cls, "inline_signature_visible", "(ILjava/lang/Object;)V");
     if (!mid) return;
 
-    int visible = 0;
-    if (b) visible = 1;
-    
     jobject paramsObj = RhoValueConverter(env).createObject(p);
     env->CallStaticVoidMethod(cls, mid, visible, paramsObj);
     env->DeleteLocalRef(paramsObj);

data/platform/android/Rhodes/rhobundle.xml

@@ -4,7 +4,7 @@
 
   <target name="all">
     <exec executable="rake" failOnError="true" >
-      <arg value="build:android:rhobundle" />
+      <arg value="build:android:eclipsebundle" />
     </exec>
   </target>
 

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

@@ -246,6 +246,10 @@ public class RhodesActivity extends BaseActivity {
         mIsInsideStartStop = true;
         
         RhodesApplication.stateChanged(RhodesApplication.UiState.MainActivityStarted);
+        
+        for(RhodesActivityListener listener: mListeners) {
+            listener.onStart(this);
+        }
 	}
 	
 	@Override
@@ -283,14 +287,20 @@ public class RhodesActivity extends BaseActivity {
 	{
 		super.onStop();
         Logger.D(TAG, "onStop");
+        for(RhodesActivityListener listener: mListeners) {
+            listener.onStop(this);
+        }
         mIsInsideStartStop = false;
 	}
 	
 	@Override
 	public void onDestroy() {
         Logger.D(TAG, "onDestroy");
+
+        for(RhodesActivityListener listener: mListeners) {
+            listener.onDestroy(this);
+        }
         
-        //TODO: Check is it really correct in case activity killed immediately after onPause()
         sInstance = null;
 		super.onDestroy();
 	}

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

@@ -28,14 +28,15 @@ package com.rhomobile.rhodes;
 
 import android.content.Intent;
 
-
 public interface RhodesActivityListener {
 	
 	void onCreate(RhodesActivity activity, Intent intent);
-	void onPause(RhodesActivity activity);
+	void onStart(RhodesActivity activity);
 	void onResume(RhodesActivity activity);
+	void onPause(RhodesActivity activity);
+	void onStop(RhodesActivity activity);
+	void onDestroy(RhodesActivity activity);
 	void onNewIntent(RhodesActivity activity, Intent intent);
 	
 	void onRhodesActivityStartup(RhodesActivity activity);
-	
 }

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

@@ -31,6 +31,7 @@ import java.io.IOException;
 import java.util.Collection;
 import java.util.Vector;
 
+import com.rhomobile.rhodes.extmanager.RhoExtManager;
 import com.rhomobile.rhodes.file.RhoFileApi;
 import com.rhomobile.rhodes.util.Utils;
 import com.rhomobile.rhodes.util.Utils.AssetsSource;
@@ -111,6 +112,22 @@ public class RhodesApplication extends Application{
                         }
                     }
                 });
+        RhodesApplication.runWhen(
+                AppState.AppActivated,
+                new StateHandler(false) {
+                    @Override
+                    public void run() {
+                        RhoExtManager.getImplementationInstance().onAppActivate(true);
+                    }
+                });
+        RhodesApplication.runWhen(
+                AppState.AppDeactivated,
+                new StateHandler(false) {
+                    @Override
+                    public void run() {
+                        RhoExtManager.getImplementationInstance().onAppActivate(false);
+                    }
+                });
 
         initClassLoader(getClassLoader());
 
@@ -154,7 +171,7 @@ public class RhodesApplication extends Application{
         }
         
         setupRhodesApp();
-        Log.i(TAG, "Initialized");
+        Logger.I(TAG, "Initialized");
     }
     private static boolean sRhodesActivityStarted = false;
 
@@ -337,14 +354,17 @@ public class RhodesApplication extends Application{
                     doneHandlers.add(handler);
                 }
             }
+            Logger.T(TAG, "Handlers gone: " + doneHandlers.size());
             mHandlers.removeAll(doneHandlers);
             return handlers;
         }
 
         public void commitObservers() {
+            Logger.T(TAG, "Commit observers");
             Vector<EventObserver> observers = new Vector<EventObserver>();
             for (EventObserver o: mObservers) {
                 if (o.isCheckOnce()) {
+                    Logger.T(TAG, o.mTag + " is gone");
                     observers.add(o);
                 }
             }
@@ -374,7 +394,6 @@ public class RhodesApplication extends Application{
         
         private static boolean appActivatedFlag = false;
         
-        private Vector<StateHandler> mHandlers = new Vector<StateHandler>();
         private String TAG;
         private StateImpl<AppEventObserver> mImpl;
         
@@ -405,7 +424,7 @@ public class RhodesApplication extends Application{
             return handlers;
         }
         
-        public synchronized void addHandler(StateHandler handler) { mHandlers.add(handler); }
+        public synchronized void addHandler(StateHandler handler) { mImpl.addHandler(handler); }
         public synchronized AppEventObserver addObserver(String tag, boolean once) {
             AppEventObserver observer = new AppEventObserver(tag, this, once);
             mImpl.addObserver(observer);
@@ -415,10 +434,10 @@ public class RhodesApplication extends Application{
 
         static public void handleState(AppState state) {
             int cnt = runHandlers(state.commit());
-            Logger.I(sAppState.TAG, "Handlers have completed: " + cnt);
+            Logger.T(sAppState.TAG, "Handlers have completed: " + cnt);
             if((state == AppStarted) && appActivatedFlag) {
                 cnt = runHandlers(AppActivated.commit());
-                Logger.I(sAppState.TAG, "Handlers have completed: " + cnt);
+                Logger.T(sAppState.TAG, "Handlers have completed: " + cnt);
             }
             return;
         }
@@ -478,7 +497,7 @@ public class RhodesApplication extends Application{
 
         static public void handleState(UiState state) {
             int cnt = runHandlers(state.commit());
-            Logger.I(sAppState.TAG, "Handlers have completed: " + cnt);
+            Logger.T(sAppState.TAG, "Handlers have completed: " + cnt);
         }
     }
 
@@ -498,6 +517,7 @@ public class RhodesApplication extends Application{
         }
         state.addHandler(handler);
         Logger.T(TAG, "AppState handler added: " + state.TAG);
+        Logger.T(TAG, "Overall handlers: " + state.mImpl.mHandlers.size());
     }
 
     public static void runWhen(UiState state, StateHandler handler) {

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

@@ -230,6 +230,7 @@ public class RhodesService extends Service {
 	public static native void doRequest(String url);
 	public static native void doRequestAsync(String url);
 	public static native void doRequestEx(String url, String body, String data, boolean waitForResponse);
+    public static native void doRequestJson(String url, String body, String data, boolean waitForResponse);
 	
 	public static native void loadUrl(String url);
 	
@@ -802,7 +803,8 @@ public class RhodesService extends Service {
                 }
 			}
 			else if (name.equalsIgnoreCase("webview_framework")) {
-				return "WEBKIT/" + Build.VERSION.RELEASE;
+				//return "WEBKIT/" + Build.VERSION.RELEASE;
+			    return RhodesActivity.safeGetInstance().getMainView().getWebView(-1).getView().getClass().getCanonicalName();
 			}
 		}
 		catch (Exception e) {

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

@@ -0,0 +1,70 @@
+package com.rhomobile.rhodes.extmanager;
+
+public abstract class AbstractRhoExtension implements IRhoExtension {
+
+    @Override
+    public void onSetPropertiesData(IRhoExtManager extManager, String propId,
+            String data, int pos, int total, IRhoExtData ext) {
+    }
+
+    @Override
+    public void onSetPropertiesDataEnd(IRhoExtManager extManager, IRhoExtData ext) {
+    }
+
+    @Override
+    public void onSetProperty(IRhoExtManager extManager, String name, String value, IRhoExtData ext) {
+    }
+
+    @Override
+    public void onBeforeNavigate(IRhoExtManager extManager, String url, IRhoExtData ext) {
+    }
+
+    @Override
+    public void onNavigateProgress(IRhoExtManager extManager, String url, int pos, int total, IRhoExtData ext) {
+    }
+
+    @Override
+    public void onNavigateComplete(IRhoExtManager extManager, String url, IRhoExtData ext) {
+    }
+
+    @Override
+    public void onDocumentComplete(IRhoExtManager extManager, String urlOfDocument, IRhoExtData ext) {
+    }
+
+    @Override
+    public void onAlert(IRhoExtManager extManager, String message, IRhoExtData ext) {
+    }
+
+    @Override
+    public void onConfirm(IRhoExtManager extManager, String message, IRhoExtData ext) {
+    }
+
+    @Override
+    public void onSelect(IRhoExtManager extManager, String[] items, int selected, IRhoExtData ext) {
+    }
+
+    @Override
+    public void onStatus(IRhoExtManager extManager, String status, IRhoExtData ext) {
+    }
+
+    @Override
+    public void onTitle(IRhoExtManager extManager, String title, IRhoExtData ext) {
+    }
+
+    @Override
+    public void onConsole(IRhoExtManager extManager, String message, IRhoExtData ext) {
+    }
+
+    @Override
+    public void onInputMethod(IRhoExtManager extManager, boolean enabled, IRhoExtData ext) {
+    }
+
+    @Override
+    public void onNavigateError(IRhoExtManager extManager, String url, IRhoExtData ext) {
+    }
+
+    @Override
+    public void onAppActivate(IRhoExtManager extManager, boolean bActivate) {
+    }
+
+}