rhodes 2.0.0.beta1 → 2.0.0.beta2

data/lib/framework/builtinME.rb

@@ -259,6 +259,8 @@ class IO
         end
         close
     end
+    
+    alias each_line each
 end
 
 class Time

data/lib/framework/dateME.rb

@@ -42,7 +42,11 @@ class Date
   end
 
   def to_s() format('%.4d-%02d-%02d', year(), mon(), mday()) end # 4p
-
+  
+  def self.civil(y=-4712, m=1, d=1, sg=2299161)
+    Date.new( Time.new(y,m,d) )
+  end
+  
   def _get_date
     @m_date      
   end

data/lib/framework/rho/render.rb

@@ -196,7 +196,15 @@ module Rho
         modelpath = Rho::RhoFSConnector.get_model_path("app",model) if model
         content = eval_compiled_file(modelpath+'_' + partial_name.to_s+'_erb.iseq', locals.get_binding )
       else
+        #xruby issue - https://www.pivotaltracker.com/story/show/3454121
+        content = render_partial_collection(options,partial_name)
+      end
+      content
+    end
+
+    def render_partial_collection(options, partial_name)
         i = 0
+        content = ""
         options[:collection].each do |x|
           options[:locals][partial_name] = x
 
@@ -205,8 +213,8 @@ module Rho
           #puts "render partial: #{x}"
           content += render_partial :partial => options[:partial], :locals => options[:locals]
         end
-      end
-      content
+        
+        content
     end
 
     @@m_geoview_callback = nil

data/lib/framework/rhom/rhom_object_factory.rb

@@ -441,7 +441,7 @@ module Rhom
                                 listAttrs = sql.length > 0 ? db.execute_sql(sql,values) : []
                                 
                                 new_obj = self.new
-                                new_obj.vars.merge!({:object=>"{#{obj['object']}}"})
+                                new_obj.vars.merge!({:object=>"#{obj['object']}"})
                                 
                                 if attribs && obj['attrib']
                                     new_obj.vars.merge!( {obj['attrib'].to_sym()=>obj['value'] }) if obj['value']
@@ -805,6 +805,7 @@ module Rhom
               # deletes the record from the viewable list as well as
               # adding a delete record to the list of sync operations
               def destroy
+			    puts "destroy: #{self}"
                 obj = self.object #self.inst_strip_braces(self.object)
                 update_type='delete'
                 

data/lib/framework/singleton.rb

@@ -60,7 +60,7 @@
 #    and _dump(depth) hooks allows the (partially) resurrections of
 #    a previous state of ``the instance''.
 
-require 'thread'
+#require 'thread'
 
 module Singleton
   #  disable build-in copying methods

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

@@ -391,10 +391,8 @@ RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_Rhodes_normalizeUrl
   (JNIEnv *, jobject, jstring strUrl)
 {
     std::string const &s = rho_cast<std::string>(strUrl);
-    char *normalized = rho_http_normalizeurl(s.c_str());
-    jstring newStr = rho_cast<jstring>(normalized);
-    free(normalized);
-    return newStr;
+    std::string const &cs = RHODESAPP().canonicalizeRhoUrl(s);
+    return rho_cast<jstring>(cs);
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_Rhodes_navigateBack

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

@@ -45,25 +45,30 @@ public class NativeBar {
 		}
 
 		public void run() {
-			Rhodes r = RhodesInstance.getInstance();
-			MainView v = null;
-			
-			switch (type) {
-			case NOBAR_TYPE:
-				v = new SimpleMainView();
-				break;
-			case TOOLBAR_TYPE:
-				v = new SimpleMainView(params);
-				break;
-			case TABBAR_TYPE:
-				v = new TabbedMainView(params);
-				break;
-			default:
-				Logger.E(TAG, "Unknown bar type passed: " + type);
+			try {
+				Rhodes r = RhodesInstance.getInstance();
+				MainView v = null;
+				
+				switch (type) {
+				case NOBAR_TYPE:
+					v = new SimpleMainView();
+					break;
+				case TOOLBAR_TYPE:
+					v = new SimpleMainView(params);
+					break;
+				case TABBAR_TYPE:
+					v = new TabbedMainView(params);
+					break;
+				default:
+					Logger.E(TAG, "Unknown bar type passed: " + type);
+				}
+				
+				if (v != null)
+					r.setMainView(v);
+			}
+			catch (Exception e) {
+				reportFail("CreateTask", e);
 			}
-			
-			if (v != null)
-				r.setMainView(v);
 		}
 		
 	};

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

@@ -29,11 +29,11 @@ import java.util.Vector;
 import com.rhomobile.rhodes.Utils.AssetsSource;
 import com.rhomobile.rhodes.Utils.FileSource;
 import com.rhomobile.rhodes.mainview.MainView;
-import com.rhomobile.rhodes.mainview.SimpleMainView;
 import com.rhomobile.rhodes.ui.AboutDialog;
 import com.rhomobile.rhodes.ui.LogOptionsDialog;
 import com.rhomobile.rhodes.ui.LogViewDialog;
 import com.rhomobile.rhodes.uri.MailUriHandler;
+import com.rhomobile.rhodes.uri.SmsUriHandler;
 import com.rhomobile.rhodes.uri.TelUriHandler;
 import com.rhomobile.rhodes.uri.UriHandler;
 import com.rhomobile.rhodes.uri.VideoUriHandler;
@@ -41,6 +41,8 @@ import com.rhomobile.rhodes.uri.VideoUriHandler;
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.net.ConnectivityManager;
@@ -82,8 +84,7 @@ public class Rhodes extends Activity {
 	
 	private static int MAX_PROGRESS = 10000;
 	
-	private static final String INSTALLING_PAGE = "apps/app/installing.html";
-	private static final String LOADING_PAGE = "apps/app/loading.html";
+	private static boolean ENABLE_LOADING_INDICATION = true;
 	
 	private long uiThreadId;
 	public long getUiThreadId() {
@@ -149,11 +150,21 @@ public class Rhodes extends Activity {
 	}
 	
 	private String phoneMemoryRootPath() {
-		return "/data/data/" + getPackageName() + "/data/";
+		String pkgName = getPackageName();
+		try {
+			ApplicationInfo info = getPackageManager().getApplicationInfo(pkgName, 0);
+			String path = info.dataDir + "/rhodata/";
+			return path;
+		} catch (NameNotFoundException e) {
+			throw new RuntimeException("Internal error: package " + pkgName + " not found: " + e.getMessage());
+		}
 	}
 	
 	private String sdcardRootPath() {
-		return Environment.getExternalStorageDirectory() + "/rhomobile/" + getPackageName() + "/";
+		String sdPath = Environment.getExternalStorageDirectory().getAbsolutePath();
+		String pkgName = getPackageName();
+		String path = sdPath + "/rhomobile/" + pkgName + "/";
+		return path;
 	}
 	
 	private RhoLogConf m_rhoLogConf = new RhoLogConf();
@@ -204,7 +215,7 @@ public class Rhodes extends Activity {
 		*/
 	}
 	
-	private boolean isNameChanged() {
+	public boolean isNameChanged() {
 		try {
 			FileSource as = new AssetsSource(getResources().getAssets());
 			FileSource fs = new FileSource();
@@ -215,7 +226,7 @@ public class Rhodes extends Activity {
 		}
 	}
 	
-	private boolean isBundleChanged() {
+	public boolean isBundleChanged() {
 		if (contentChanged == null) {
 			try {
 				String rp = getRootPath();
@@ -306,9 +317,9 @@ public class Rhodes extends Activity {
 		w.setHorizontalScrollbarOverlay(true);
 
 		w.setWebViewClient(new WebViewClient() {
-
-			private boolean realPageLoaded = false;
 			
+			private boolean splashHidden = false;
+
 			@Override
 			public boolean shouldOverrideUrlLoading(WebView view, String url) {
 				return handleUrlLoading(url);
@@ -316,25 +327,24 @@ public class Rhodes extends Activity {
 			
 			@Override
 			public void onPageStarted(WebView view, String url, Bitmap favicon) {
-				getWindow().setFeatureInt(Window.FEATURE_PROGRESS, 0);
+				if (ENABLE_LOADING_INDICATION)
+					getWindow().setFeatureInt(Window.FEATURE_PROGRESS, 0);
 				super.onPageStarted(view, url, favicon);
 			}
 			
 			@Override
 			public void onPageFinished(WebView view, String url) {
-				// Clear page until we get real page loaded
-				if (!(realPageLoaded || url.equals(LOADING_PAGE)))
-					realPageLoaded = true;
-				if (!realPageLoaded)
-					view.clearHistory();
 				// Set title
 				Rhodes r = RhodesInstance.getInstance();
 				String title = view.getTitle();
 				r.setTitle(title);
 				// Hide splash screen
-				if (url.startsWith("http://"))
+				if (!splashHidden && url.startsWith("http://")) {
 					hideSplashScreen();
-				getWindow().setFeatureInt(Window.FEATURE_PROGRESS, MAX_PROGRESS);
+					splashHidden = true;
+				}
+				if (ENABLE_LOADING_INDICATION)
+					getWindow().setFeatureInt(Window.FEATURE_PROGRESS, MAX_PROGRESS);
 				super.onPageFinished(view, url);
 			}
 
@@ -343,12 +353,14 @@ public class Rhodes extends Activity {
 		w.setWebChromeClient(new WebChromeClient() {
 			@Override
 			public void onProgressChanged(WebView view, int newProgress) {
-				newProgress *= 100;
-				if (newProgress < 0)
-					newProgress = 0;
-				if (newProgress > MAX_PROGRESS)
-					newProgress = MAX_PROGRESS;
-				getWindow().setFeatureInt(Window.FEATURE_PROGRESS, newProgress);
+				if (ENABLE_LOADING_INDICATION) {
+					newProgress *= 100;
+					if (newProgress < 0)
+						newProgress = 0;
+					if (newProgress > MAX_PROGRESS)
+						newProgress = MAX_PROGRESS;
+					getWindow().setFeatureInt(Window.FEATURE_PROGRESS, newProgress);
+				}
 				super.onProgressChanged(view, newProgress);
 			}
 		});
@@ -420,8 +432,8 @@ public class Rhodes extends Activity {
 		}
 	}
 	
-	private void showSplashScreen(String file) throws IOException {
-		splashScreen = new SplashScreen(this, file);
+	private void showSplashScreen() {
+		splashScreen = new SplashScreen(this);
 		splashScreen.start(outerFrame);
 	}
 	
@@ -435,48 +447,6 @@ public class Rhodes extends Activity {
 		view.requestFocus();
 	}
 	
-	private void showLoadingPage() {
-		try {
-			boolean hasInstalling = false;
-			try {
-				getResources().getAssets().open("apps/app/installing.png").close();
-				hasInstalling = true;
-			}
-			catch (IOException e) {}
-			showSplashScreen("apps/app/" + (hasInstalling && isBundleChanged() ? "installing.png" : "loading.png"));
-		}
-		catch (Exception e) {
-			MainView v = new SimpleMainView();
-			
-			boolean bc = isBundleChanged();
-			String page = bc ? INSTALLING_PAGE : LOADING_PAGE;
-			
-			boolean hasNeededPage;
-			try {
-				getResources().getAssets().open(page).close();
-				hasNeededPage = true;
-			}
-			catch (IOException e1) {
-				hasNeededPage = false;
-			}
-			
-			if (hasNeededPage) {
-				v.navigate("file:///android_asset/" + page, 0);
-			}
-			else {
-				StringBuffer p = new StringBuffer();
-				p.append("<html><title>");
-				p.append(bc ? "Installing" : "Loading");
-				p.append("</title><body>");
-				p.append(bc ? "Installing" : "Loading");
-				p.append("...</body></html>");
-				v.loadData(p.toString(), 0);
-			}
-			
-			setMainView(v);
-		}
-	}
-	
 	/** Called when the activity is first created. */
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -511,13 +481,15 @@ public class Rhodes extends Activity {
 		this.setRequestedOrientation(disableScreenRotation ? ActivityInfo.SCREEN_ORIENTATION_PORTRAIT :
 			ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
 		
-		this.requestWindowFeature(Window.FEATURE_PROGRESS);
+		ENABLE_LOADING_INDICATION = !RhoConf.getBool("disable_loading_indication");
+		if (ENABLE_LOADING_INDICATION)
+			this.requestWindowFeature(Window.FEATURE_PROGRESS);
 
 		outerFrame = new FrameLayout(this);
 		this.setContentView(outerFrame, new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
 		
 		Logger.I("Rhodes", "Loading...");
-		showLoadingPage();
+		showSplashScreen();
 		
 		// Increase WebView rendering priority
 		WebView w = new WebView(this);
@@ -541,6 +513,7 @@ public class Rhodes extends Activity {
 		// Register custom uri handlers here
 		uriHandlers.addElement(new MailUriHandler(this));
 		uriHandlers.addElement(new TelUriHandler(this));
+		uriHandlers.addElement(new SmsUriHandler(this));
 		uriHandlers.addElement(new VideoUriHandler(this));
 		
 		Thread init = new Thread(new Runnable() {

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

@@ -7,23 +7,75 @@ import android.content.Context;
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.view.View;
 import android.view.ViewGroup;
+import android.webkit.WebView;
 import android.widget.ImageView;
 
 public class SplashScreen {
 	
-	private ImageView view;
+	private static final String INSTALLING_PNG = "apps/app/installing.png";
+	private static final String LOADING_PNG = "apps/app/loading.png";
+	
+	private static final String INSTALLING_PAGE = "apps/app/installing.html";
+	private static final String LOADING_PAGE = "apps/app/loading.html";
+	
+	private View view;
 	
 	private native void nativeStart();
 	private native void nativeHide();
 	
-	public SplashScreen(Context ctx, String file) throws IOException {
-		view = new ImageView(ctx);
+	public SplashScreen(Context ctx) {
 		AssetManager am = ctx.getResources().getAssets();
-		InputStream is = am.open(file);
-		Bitmap bitmap = BitmapFactory.decodeStream(is);
-		view.setImageBitmap(bitmap);
-		view.setId(Rhodes.RHO_SPLASH_VIEW);
+		Rhodes r = RhodesInstance.getInstance();
+		boolean bc = r.isBundleChanged();
+		
+		String file = bc ? INSTALLING_PNG : LOADING_PNG;
+		
+		Bitmap bitmap = null;
+		try {
+			InputStream is = am.open(file);
+			bitmap = BitmapFactory.decodeStream(is);
+			is.close();
+			
+			ImageView v = new ImageView(ctx);
+			v.setImageBitmap(bitmap);
+			v.setId(Rhodes.RHO_SPLASH_VIEW);
+			view = v;
+		}
+		catch (IOException e) {
+			WebView v = r.createWebView();
+			
+			String page = bc ? INSTALLING_PAGE : LOADING_PAGE;
+			
+			boolean hasNeededPage;
+			try {
+				InputStream is1 = am.open(page);
+				if (is1 != null)
+					is1.close();
+				hasNeededPage = true;
+			}
+			catch (IOException e1) {
+				hasNeededPage = false;
+			}
+			
+			if (hasNeededPage) {
+				v.loadUrl("file:///android_asset/" + page);
+			}
+			else {
+				StringBuffer p = new StringBuffer();
+				p.append("<html><title>");
+				p.append(bc ? "Installing" : "Loading");
+				p.append("</title><body>");
+				p.append(bc ? "Installing" : "Loading");
+				p.append("...</body></html>");
+				v.loadData(p.toString(), "text/html", "utf-8");
+			}
+			
+			v.setId(Rhodes.RHO_SPLASH_VIEW);
+			
+			view = v;
+		}
 	}
 	
 	public void start(ViewGroup outer) {

data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java

@@ -35,7 +35,7 @@ public class Camera {
 	
 	public static final String INTENT_EXTRA_PREFIX = Rhodes.INTENT_EXTRA_PREFIX + "camera.";
 	
-	public static String BASE_CAMERA_DIR = RhodesInstance.getInstance().getRootPath() + "apps/public/db-files";
+	public static String BASE_CAMERA_DIR = RhodesInstance.getInstance().getRootPath() + "db/db-files";
 	
 	private static void reportFail(String name, Exception e) {
 		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());