rhodes 3.3.2.beta.1 → 3.3.2.beta.2

data/lib/framework/rho/rhofsconnector.rb

@@ -62,7 +62,7 @@ if defined?( RHODES_EMULATOR )
           File.join(__rhoGetCurrentDir(), RHO_EMULATOR_DIR + '/db/syncdb' + postfix + '.sqlite')
 else
           if System::get_property('platform') == 'APPLE'
-                File.join(__rhoGetUserDir(), 'db/syncdb' + postfix + '.sqlite')
+                File.join(__rhoGetDBDir(), 'db/syncdb' + postfix + '.sqlite')
           else
                 File.join(__rhoGetCurrentDir(), 'db/syncdb' + postfix + '.sqlite')
           end
@@ -75,7 +75,7 @@ if defined?( RHODES_EMULATOR )
         File.join(__rhoGetCurrentDir(), RHO_EMULATOR_DIR + '/db/db-files')
 else
           if System::get_property('platform') == 'APPLE'
-                return File.join(__rhoGetUserDir(), 'db/db-files')
+                return File.join(__rhoGetDBDir(), 'db/db-files')
           else
                 return File.join(__rhoGetCurrentDir(), 'db/db-files')
           end
@@ -90,18 +90,21 @@ end
       def get_blob_path(relative_path)
         cur_dir = __rhoGetCurrentDir()
           if System::get_property('platform') == 'APPLE'
-                 cur_dir = __rhoGetUserDir()
+                 cur_dir = __rhoGetDBDir()
           end
 if defined?( RHODES_EMULATOR )
         cur_dir = __rhoGetCurrentDir()
         cur_dir = File.join(cur_dir, RHO_EMULATOR_DIR)
 end
+        ress = ''  
         if cur_dir && cur_dir.length()>0
-            File.join(cur_dir, relative_path)
+            ress = File.join(cur_dir, relative_path)
         else
-            relative_path.start_with?('/') ? relative_path : "/" + relative_path
+            ress = relative_path.start_with?('/') ? relative_path : "/" + relative_path
             
-        end    
+        end
+        #puts '$$$ blob path ['+ress.to_s+']  for ['+relative_path.to_s+']'  
+        return ress 
       end
       
     end

data/lib/framework/rhom/rhom_db_adapter.rb

@@ -30,10 +30,12 @@ module Rhom
 class RhomDbAdapter
     
   @database = nil
+  @dbpath = nil  
       
   # maintains a single database connection
   def initialize(dbfile, partition)
     unless @database
+      @dbpath = dbfile  
       @database = SQLite3::Database.new(dbfile,partition)
     end
   end
@@ -43,6 +45,7 @@ class RhomDbAdapter
     if @database
       @database.close
       @database = nil
+      @dbpath = nil
     else
       return false
     end
@@ -275,6 +278,13 @@ class RhomDbAdapter
     return cols,quests,vals
   end
 
+  def set_do_not_bakup_attribute(attr=1)
+       if System::get_property('platform') == 'APPLE'
+              System.set_do_not_bakup_attribute(@dbpath, attr)
+              System.set_do_not_bakup_attribute(@dbpath+'.version', attr)
+       end                         
+  end
+
   # deletes rows from a table which satisfy condition (hash)
   # example usage is the following:
   # delete_from_table('object_values',{"object"=>"some-object"})

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

@@ -102,3 +102,8 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhoLogConf_sendLog
     rho_conf_send_log("");
 }
 
+RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhoLogConf_hasLogView
+  (JNIEnv *, jclass)
+{
+    return LOGCONF().hasLogView();
+}

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

@@ -88,19 +88,23 @@ jclass rho_find_class(JNIEnv *env, const char *c)
     return cls;
 }
 
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_initClassLoader
-  (JNIEnv *env, jobject, jobject cl)
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_initClassLoader
+  (JNIEnv *env, jclass, jobject cl)
 {
     g_classLoader = env->NewGlobalRef(cl);
     jclass javaLangClassLoader = env->FindClass("java/lang/ClassLoader");
     g_loadClass = env->GetMethodID(javaLangClassLoader, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;");
 }
 
-RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_createRhodesApp
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_setupRhodesApp
   (JNIEnv *env, jclass)
 {
     android_setup(env);
+}
 
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_createRhodesApp
+  (JNIEnv *env, jclass)
+{
     // Start Rhodes application
     rho_rhodesapp_create(rho_native_rhopath());
 }

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

@@ -34,45 +34,90 @@ import android.content.ServiceConnection;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Display;
+import android.view.WindowManager;
 
 public class BaseActivity extends Activity implements ServiceConnection {
 	
-	private static final String TAG = BaseActivity.class.getName();
+	private static final String TAG = BaseActivity.class.getSimpleName();
 	
 	private static final boolean DEBUG = false;
 	
 	public static final String INTENT_SOURCE = BaseActivity.class.getName();
 	
-	protected RhodesService mRhodesService;
+    public static class ScreenProperties {
+        private int mScreenWidth;
+        private int mScreenHeight;
+        private int mScreenOrientation;
+        private float mScreenPpiX;
+        private float mScreenPpiY;
+        
+        ScreenProperties(Context context) {
+            reread(context);
+        }
+        
+        public void reread(Context context) {
+            Logger.T(TAG, "Updating screen properties");
+            
+            WindowManager wm = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);
+
+            Display d = wm.getDefaultDisplay();
+
+            mScreenWidth = d.getWidth();
+            mScreenHeight = d.getHeight();
+
+            DisplayMetrics metrics = new DisplayMetrics();
+            d.getMetrics(metrics);
+
+            mScreenPpiX = metrics.xdpi;
+            mScreenPpiY = metrics.ydpi;
+            
+            int orientation;
+            orientation = context.getResources().getConfiguration().orientation;
+            Logger.D(TAG, "Resources orientation: "+ orientation);
+
+            if (orientation == Configuration.ORIENTATION_UNDEFINED)
+            {
+                orientation = d.getOrientation();
+                Logger.D(TAG, "DisplayMetrics orientation: "+ orientation);
+
+                if (orientation == Configuration.ORIENTATION_UNDEFINED) {
+                    if (d.getWidth() == d.getHeight())
+                        orientation = Configuration.ORIENTATION_SQUARE;
+                    else if(d.getWidth() < d.getHeight())
+                        orientation = Configuration.ORIENTATION_PORTRAIT;
+                    else
+                        orientation = Configuration.ORIENTATION_LANDSCAPE;
+
+                    Logger.D(TAG, "Screen resolution orientation: " + orientation);
+                }
+            }
+            mScreenOrientation = orientation;
+
+            Logger.D(TAG, "New screen properties - width: " + mScreenWidth + ", height: " + mScreenHeight + ", orientation: " + mScreenOrientation);
+        }
+        
+        public int getWidth() { return mScreenWidth; }
+        public int getHeight() { return mScreenHeight; }
+        public int getOrientation() { return mScreenOrientation; }
+        public float getPpiX() { return mScreenPpiX; }
+        public float getPpiY() { return mScreenPpiY; }
+    }
+
+    private static ScreenProperties sScreenProp = null;
+    
+    public static ScreenProperties getScreenProperties() { return sScreenProp; }
+    
+    protected RhodesService mRhodesService;
 	private boolean mBoundToService;
-	private int mRuntimeOrientation;
-
-	protected int getScreenOrientation() {
-	    Display display = getWindowManager().getDefaultDisplay();
-	    int orientation = display.getOrientation();
-
-	    if (orientation == Configuration.ORIENTATION_UNDEFINED)
-	    {
-	        orientation = getResources().getConfiguration().orientation;
-
-	        if (orientation == Configuration.ORIENTATION_UNDEFINED) {
-	            if (display.getWidth() == display.getHeight())
-	                orientation = Configuration.ORIENTATION_SQUARE;
-	            else if(display.getWidth() < display.getHeight())
-	                orientation = Configuration.ORIENTATION_PORTRAIT;
-	            else
-	                orientation = Configuration.ORIENTATION_LANDSCAPE;
-	        }
-	    }
-	    return orientation;
-	}
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		
+		Logger.T(TAG, "onCreate");
+
 		Intent intent = new Intent(this, RhodesService.class);
 		intent.putExtra(RhodesService.INTENT_SOURCE, INTENT_SOURCE);
 		ComponentName serviceName = startService(intent);
@@ -80,8 +125,15 @@ public class BaseActivity extends Activity implements ServiceConnection {
 			throw new RuntimeException("Can not start Rhodes service");
 		bindService(intent, this, Context.BIND_AUTO_CREATE);
 		mBoundToService = true;
-		
-		mRuntimeOrientation = this.getScreenOrientation();
+
+        if (sScreenProp == null) {
+            sScreenProp = new ScreenProperties(this);
+        } else {
+            if (RhoConf.getBool("disable_screen_rotation")) { 
+                Logger.D(TAG, "Screen rotation is disabled. Force orientation: " + getScreenProperties().getOrientation());
+                setRequestedOrientation(getScreenProperties().getOrientation());
+            }
+        }
 	}
 	
 	@Override
@@ -107,26 +159,19 @@ public class BaseActivity extends Activity implements ServiceConnection {
 	
 	@Override
 	public void onConfigurationChanged(Configuration newConfig) {
-		Logger.T(TAG, "+++ onConfigurationChanged");
+		Logger.T(TAG, "onConfigurationChanged");
 		if (RhoConf.getBool("disable_screen_rotation"))
 		{
 			super.onConfigurationChanged(newConfig);
-			this.setRequestedOrientation(mRuntimeOrientation);
+            Logger.D(TAG, "Screen rotation is disabled. Force old orientation: " + getScreenProperties().getOrientation());
+			setRequestedOrientation(getScreenProperties().getOrientation());
 		}
 		else
 		{
-			mRuntimeOrientation = this.getScreenOrientation();
 			super.onConfigurationChanged(newConfig);
-			RhodesService.getInstance().rereadScreenProperties();
+			getScreenProperties().reread(this);
 		}
 	}
-	
-//	public NativeApplication getRhodesApplication() {
-//		Application app = super.getApplication();
-//		if (DEBUG)
-//			Log.d(TAG, "getApplication: " + app);
-//		return (NativeApplication)app;
-//	}
 
 	@Override
 	public void onServiceConnected(ComponentName name, IBinder service) {

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

@@ -44,4 +44,6 @@ public class RhoLogConf {
 	public static native int getLogTextPos();
 	
 	public static native void sendLog();
+	
+	public static native boolean hasLogView();
 }

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

@@ -135,9 +135,8 @@ public class RhodesActivity extends BaseActivity {
 	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
-		
+        Logger.T(TAG, "onCreate");
 		super.onCreate(savedInstanceState);
-        Log.i(TAG, ">>>>>>>>>>>>>>> onCreate()");
 		
 		mListeners = new ArrayList<RhodesActivityListener>();
 
@@ -223,7 +222,7 @@ public class RhodesActivity extends BaseActivity {
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
 
-        Log.d(TAG, "RhodesActivity.onNewIntent()");
+        Logger.D(TAG, "onNewIntent");
 
         handleStartParams(intent);
 
@@ -239,7 +238,7 @@ public class RhodesActivity extends BaseActivity {
 	public void onStart() {
 		super.onStart();
 
-        Log.d(TAG, "RhodesActivity.onStart()");
+        Logger.D(TAG, "onStart");
         mIsInsideStartStop = true;
         
         RhodesApplication.stateChanged(RhodesApplication.UiState.MainActivityStarted);
@@ -247,7 +246,7 @@ public class RhodesActivity extends BaseActivity {
 	
 	@Override
 	public void onResume() {
-        Log.d(TAG, "RhodesActivity.onResume()");
+        Logger.D(TAG, "onResume");
     	mIsForeground = true;
 		super.onResume();
         {
@@ -270,7 +269,7 @@ public class RhodesActivity extends BaseActivity {
         }
 
         super.onPause();
-        Log.d(TAG, "RhodesActivity.onPause()");
+        Logger.D(TAG, "onPause");
 
         RhodesApplication.stateChanged(RhodesApplication.UiState.MainActivityPaused);
     }
@@ -279,13 +278,13 @@ public class RhodesActivity extends BaseActivity {
 	public void onStop() 
 	{
 		super.onStop();
-        Log.d(TAG, "RhodesActivity.onStop()");
+        Logger.D(TAG, "onStop");
         mIsInsideStartStop = false;
 	}
 	
 	@Override
 	public void onDestroy() {
-        Log.d(TAG, "RhodesActivity.onDestroy()");
+        Logger.D(TAG, "onDestroy");
         
         //TODO: Check is it really correct in case activity killed immediately after onPause()
         sInstance = null;
@@ -298,7 +297,7 @@ public class RhodesActivity extends BaseActivity {
 		case KeyEvent.KEYCODE_BACK:
 			RhodesService r = RhodesService.getInstance();
 			if (DEBUG)
-				Log.d(TAG, "onKeyDown: r=" + r);
+				Logger.D(TAG, "onKeyDown: r=" + r);
 			if (r == null)
 				return false;
 			

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

@@ -26,12 +26,23 @@
 
 package com.rhomobile.rhodes;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.Collection;
 import java.util.Vector;
 
+import com.rhomobile.rhodes.file.RhoFileApi;
+import com.rhomobile.rhodes.util.Utils;
+import com.rhomobile.rhodes.util.Utils.AssetsSource;
+import com.rhomobile.rhodes.util.Utils.FileSource;
+
 import android.app.Application;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Handler;
 import android.os.Process;
+import android.util.Log;
 
 public class RhodesApplication extends Application{
 	
@@ -40,11 +51,39 @@ public class RhodesApplication extends Application{
     static {
         NativeLibraries.load();
     }
-    
+
+    private ApplicationInfo getAppInfo() {
+        Context context = this;
+        String pkgName = context.getPackageName();
+        try {
+            ApplicationInfo info = context.getPackageManager().getApplicationInfo(pkgName, 0);
+            return info;
+        } catch (NameNotFoundException e) {
+            throw new RuntimeException("Internal error: package " + pkgName + " not found: " + e.getMessage());
+        }
+    }
+
+    private boolean isAppHashChanged(String rootPath) {
+        try {
+            File hash = new File(rootPath, "hash");
+            if (!hash.exists())
+                return true;
+            
+            FileSource as = new AssetsSource(getResources().getAssets());
+            FileSource fs = new FileSource();
+            return !Utils.isContentsEquals(as, "hash", fs, hash.getPath());
+        }
+        catch (IOException e) {
+            return true;
+        }
+    }
+
     @Override
     public void onCreate(){
         super.onCreate();
 
+        Log.i(TAG, "Initializing...");
+        
         RhodesApplication.runWhen(
                 UiState.MainActivityStarted,
                 new StateHandler(false) {
@@ -65,6 +104,50 @@ public class RhodesApplication extends Application{
                         }
                     }
                 });
+
+        initClassLoader(getClassLoader());
+
+        ApplicationInfo appInfo = getAppInfo();
+        String rootPath;
+
+        try {
+            rootPath = RhoFileApi.initRootPath(appInfo.dataDir, appInfo.sourceDir);
+            Log.d(TAG, "Root path: " + rootPath);
+
+            RhoFileApi.init(this);
+        } catch (IOException e) {
+            Log.e(TAG, e.getMessage());
+            stop();
+            return;
+        }
+
+        if (this.isAppHashChanged(rootPath)) {
+            try {
+                Log.i(TAG, "Application hash was changed");
+                
+                File libDir = new File(rootPath, "lib");
+                File testLib = new File(libDir.getPath(), "rhoframework.iseq");
+                if(libDir.isDirectory() && testLib.isFile())
+                {
+                    Log.i(TAG, "Updating from very old rhodes version, clean filesystem.");
+                    Utils.deleteChildrenIgnoreFirstLevel(new File(rootPath, "apps"), "rhoconfig.txt");
+                    Utils.deleteRecursively(libDir);
+                }
+
+                rootPath = RhoFileApi.initRootPath(appInfo.dataDir, appInfo.sourceDir);
+                Log.d(TAG, "Root path: " + rootPath);
+
+                RhoFileApi.init(this);
+                RhoFileApi.copy("hash");
+            } catch (IOException e) {
+                Log.e(TAG, e.getMessage());
+                stop();
+                return;
+            }
+        }
+        
+        setupRhodesApp();
+        Log.i(TAG, "Initialized");
     }
     private static boolean sRhodesActivityStarted = false;
 
@@ -76,11 +159,13 @@ public class RhodesApplication extends Application{
     synchronized
     public static boolean isRhodesActivityStarted() { return sRhodesActivityStarted; }
 
+    private native static void initClassLoader(ClassLoader c);
+    private native static void setupRhodesApp();
     private native static void createRhodesApp();
     private native static void startRhodesApp();
     private native static void stopRhodesApp();
     private native static boolean canStartApp(String strCmdLine, String strSeparators);
-
+    
     public static void create()
     {
         if (sAppState != AppState.Undefined) {