rhodes 2.0.0.beta9 → 2.0.0.beta10

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

@@ -149,5 +149,17 @@ public class Utils {
 				os.close();
 		}
 	}
+	
+	public static String getDirName(String filePath) {
+		if (filePath == null)
+			return null;
+		return new File(filePath).getParent();
+	}
+	
+	public static String getBaseName(String filePath) {
+		if (filePath == null)
+			return null;
+		return new File(filePath).getName();
+	}
 
 }

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

@@ -35,14 +35,12 @@ public class Camera {
 	
 	public static final String INTENT_EXTRA_PREFIX = Rhodes.INTENT_EXTRA_PREFIX + "camera.";
 	
-	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());
 	}
 	
 	private static void init() {
-		File f = new File(BASE_CAMERA_DIR);
+		File f = new File(Rhodes.getBlobPath());
 		if (!f.exists())
 			f.mkdirs();
 	}
@@ -61,28 +59,27 @@ public class Camera {
 		
 	};
 	
-	private static class Runner implements Runnable {
-		
+	private static class Picture implements Runnable {
 		private String url;
-		private Class<?> cls;
+		private Class<?> klass;
 		
-		public Runner(String u, Class<?> c) {
+		public Picture(String u, Class<?> c) {
 			url = u;
-			cls = c;
+			klass = c;
 		}
 		
 		public void run() {
 			init();
 			Rhodes r = RhodesInstance.getInstance();
-			Intent intent = new Intent(r, cls);
+			Intent intent = new Intent(r, klass);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "callback", url);
 			r.startActivity(intent);
 		}
 	};
-
+	
 	public static void takePicture(String url) {
 		try {
-			Runnable runnable = Capabilities.CAMERA_ENABLED ? new Runner(url, ImageCapture.class) :
+			Runnable runnable = Capabilities.CAMERA_ENABLED ? new Picture(url, ImageCapture.class) :
 				new CameraDisabled(url);
 			Rhodes.performOnUiThread(runnable, false);
 		}
@@ -93,7 +90,7 @@ public class Camera {
 
 	public static void choosePicture(String url) {
 		try {
-			Rhodes.performOnUiThread(new Runner(url, FileList.class), false);
+			Rhodes.performOnUiThread(new Picture(url, FileList.class), false);
 		}
 		catch (Exception e) {
 			reportFail("choosePicture", e);

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

@@ -20,9 +20,9 @@
  */
 package com.rhomobile.rhodes.camera;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import com.rhomobile.rhodes.AndroidR;
@@ -31,11 +31,11 @@ import com.rhomobile.rhodes.Rhodes;
 import com.rhomobile.rhodes.Utils;
 
 import android.app.Activity;
+import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.os.Environment;
-//import android.provider.MediaStore.Images.Media;
+import android.provider.MediaStore;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.AdapterView;
@@ -51,15 +51,27 @@ public class FileList extends Activity implements OnClickListener{
 	private static final String TAG = "FileList";
 	
 	private String callbackUrl;
-	private Button okButton;
-	private Button cancelButton;
-	private TextView lookIn;
-	private List<String> items = null;
+	private List<String> files;
 	private String selectedFile = "";
 	private ImageView imagePreview;
-	private ListView filesList;
 	
-	private static final String BASE_DIR = Environment.getExternalStorageDirectory() + "/DCIM/Camera";
+	private ArrayList<String> getImages() {
+		String[] proj = {MediaStore.Images.Media.DATA};
+		Cursor cursor = MediaStore.Images.Media.query(getContentResolver(),
+				MediaStore.Images.Media.EXTERNAL_CONTENT_URI, proj);
+		
+		ArrayList<String> files = new ArrayList<String>();
+		
+		int idx = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+		if (cursor.moveToFirst()) {
+			do {
+				String path = cursor.getString(idx);
+				files.add(path);
+			} while (cursor.moveToNext());
+		}
+		
+		return files;
+	}
 	
 	/** Called when the activity is first created. */
 	@Override
@@ -74,18 +86,21 @@ public class FileList extends Activity implements OnClickListener{
 
 		imagePreview = (ImageView) findViewById(AndroidR.id.preview);
 
-		filesList = (ListView) findViewById(AndroidR.id.filesList);
-		
-		// TODO: implement cursor reading
-		fill(new File(BASE_DIR).listFiles());
-		//Cursor cursor = getContentResolver().query(Media.EXTERNAL_CONTENT_URI, null, null, null, null);
-		//fill(cursor);
+		ListView filesList = (ListView) findViewById(AndroidR.id.filesList);
 
-		okButton = (Button) findViewById(AndroidR.id.okButton);
-		cancelButton = (Button) findViewById(AndroidR.id.cancelButton);
+		files = getImages();
+		List<String> names = new ArrayList<String>();
+		Iterator<String> it = files.iterator();
+		while (it.hasNext())
+			names.add(Utils.getBaseName(it.next()));
+		filesList.setAdapter(new ArrayAdapter<String>(this,
+				AndroidR.layout.file_row, names));
+		
 
-		lookIn = (TextView) findViewById(AndroidR.id.lookIn);
+		Button okButton = (Button) findViewById(AndroidR.id.okButton);
+		Button cancelButton = (Button) findViewById(AndroidR.id.cancelButton);
 
+		TextView lookIn = (TextView) findViewById(AndroidR.id.lookIn);
 		lookIn.setText("Look In: Gallery");
 
 		okButton.setOnClickListener(this);
@@ -95,13 +110,12 @@ public class FileList extends Activity implements OnClickListener{
 
 			public void onItemClick(AdapterView<?> arg0, View arg1, int position, long arg3) {
 				try {
-					String file = items.get(position);
+					String file = files.get(position);
 					Logger.D(TAG, "Selected file: " + file);
 					
 					BitmapFactory.Options options = new BitmapFactory.Options();
 					options.inSampleSize = 10;
-					String fullPath = BASE_DIR + "/" + file;
-					Bitmap bm = BitmapFactory.decodeFile(fullPath, options);
+					Bitmap bm = BitmapFactory.decodeFile(file, options);
 					if (bm != null)
 						bm = Bitmap.createScaledBitmap(bm, 176, 144, true);
 					if (bm != null) {
@@ -115,65 +129,31 @@ public class FileList extends Activity implements OnClickListener{
 			
 		});
 	}
+	
+	private void doCallback(String file) {
+		try {
+			String dst = null;
+			if (file != null && file.length() > 0) {
+				dst = Rhodes.getBlobPath() + "/" + Utils.getBaseName(file);
+				Utils.copy(file, dst);
+			}
+			com.rhomobile.rhodes.camera.Camera.doCallback(callbackUrl, dst == null ? "" : dst);
+		}
+		catch (IOException e) {
+			Logger.E(TAG, e);
+		}
+	}
 
 	public void onClick(View view) {
 		switch (view.getId()) {
 		case AndroidR.id.okButton:
-			try {
-				String src = BASE_DIR + "/" + selectedFile;
-				String dst = Camera.BASE_CAMERA_DIR + "/" + selectedFile;
-				Utils.copy(src, dst);
-				com.rhomobile.rhodes.camera.Camera.doCallback(callbackUrl, dst);
-			} catch (IOException e) {
-				Logger.E(TAG, e);
-			}
-			finish();
+			doCallback(selectedFile);
 			break;
 		case AndroidR.id.cancelButton:
-			com.rhomobile.rhodes.camera.Camera.doCallback(callbackUrl, "");
-			finish();
+			doCallback(null);
 			break;
 		}
+		finish();
 	}
 	
-	/*
-	private void fill(Cursor cursor) {
-		if (!cursor.moveToFirst())
-			return;
-		
-		int count = cursor.getColumnCount();
-		for (int i = 0; i < count; ++i) {
-			String name = cursor.getColumnName(i);
-			Logger.D(TAG, "Name of " + i + " column: " + name);
-		}
-		
-		do {
-			String filename = cursor.getString(cursor.getColumnIndex(Media.TITLE));
-			Logger.D(TAG, "Filename: " + filename);
-		} while (cursor.moveToNext());
-	}
-	*/
-	
-	private void fill(File[] files) {
-		items = new ArrayList<String>();
-		if (files != null) {
-			for (File file : files) {
-				if (!file.isDirectory()) {
-					
-					boolean skip = false;
-					
-					if ( file.getName().indexOf(".png") == -1 && file.getName().indexOf(".jpg") == -1 )
-						skip = true;
-					
-					if ( !skip )
-						items.add(file.getName());
-				}
-			}
-		}
-		ArrayAdapter<String> fileList = new ArrayAdapter<String>(this,
-				AndroidR.layout.file_row, items);
-		
-		filesList.setAdapter(fileList);
-	}
-
 }

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

@@ -20,7 +20,6 @@
  */
 package com.rhomobile.rhodes.camera;
 
-import java.io.File;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -175,10 +174,7 @@ public class ImageCapture extends Activity implements SurfaceHolder.Callback, On
 
 			Uri uri = getContentResolver().insert(Media.EXTERNAL_CONTENT_URI, values);
 			// String filename = timeStampFormat.format(new Date());
-			String dir = com.rhomobile.rhodes.camera.Camera.BASE_CAMERA_DIR;
-			File fdir = new File(dir);
-			if (!fdir.exists())
-				fdir.mkdirs();
+			String dir = Rhodes.getBlobPath();
 			
 			OutputStream osCommon = getContentResolver().openOutputStream(uri);
 			iccb = new ImageCaptureCallback(callbackUrl, osCommon, dir + "/" + filename + ".jpg");

data/platform/android/build/androidcommon.rb

@@ -16,17 +16,17 @@ else
 end
 
 def num_cpus
+  num = nil
   if RUBY_PLATFORM =~ /linux/
-    num = `cat /proc/cpuinfo | grep processor | wc -l`
+    num = `cat /proc/cpuinfo | grep processor | wc -l`.gsub("\n", '')
   elsif RUBY_PLATFORM =~ /darwin/
-    num = `sysctl -n hw.ncpu`
+    num = `sysctl -n hw.ncpu`.gsub("\n", '')
   elsif RUBY_PLATFORM =~ /w(in)?32/
     num = ENV['NUMBER_OF_PROCESSORS']
-  else
-    num '1'
   end
-  num.gsub!("\n", '')
-  num.to_i
+  num = num.to_i
+  num = 1 if num == 0
+  num
 end
 
 def get_sources(name)
@@ -185,8 +185,7 @@ def cc_build(name, objdir, additional = nil)
   jobs = num_cpus
   jobs += 1 if jobs > 1
 
-  srcs = []
-  jobs.times.each { |x| srcs << [] }
+  srcs = Array.new(jobs, [])
   sources = get_sources(name)
   sources.each do |src|
     idx = sources.index(src)%jobs
@@ -194,10 +193,10 @@ def cc_build(name, objdir, additional = nil)
   end
 
   ths = []
-  jobs.times.each do |x|
+  srcs.each do |src|
     ths << Thread.new do
-      srcs[x].each do |src|
-        cc_compile src, objdir, additional or return 1
+      src.each do |f|
+        cc_compile f, objdir, additional or return 1
       end
       0
     end

data/platform/iphone/Classes/GeoLocation/LocationController.m

@@ -9,6 +9,7 @@
 #import <CFNetwork/CFNetwork.h>
 
 #import <CoreLocation/CoreLocation.h>
+#import "Rhodes.h"
 #import "LocationController.h"
 #import "logging/RhoLog.h"
 #include "rubyext/GeoLocation.h"
@@ -22,6 +23,17 @@ static void _TimerCallBack(CFRunLoopTimerRef timer, void* context);
 // This is a singleton class, see below
 static LocationController *sharedLC = nil;
 
+@interface LocationControllerInit : NSObject {}
++ (void)run;
+@end
+
+@implementation LocationControllerInit
++ (void)run {
+    [[LocationController alloc] init]; // assignment not done here
+}
+@end
+
+
 @implementation LocationController
 
 @synthesize _locationManager;
@@ -154,7 +166,7 @@ static LocationController *sharedLC = nil;
 + (LocationController *)sharedInstance {
     @synchronized(self) {
         if (sharedLC == nil) {
-            [[self alloc] init]; // assignment not done here
+            [Rhodes performOnUiThread:[LocationControllerInit class] wait:NO];
         }
     }
     return sharedLC;

data/platform/iphone/Classes/SimpleMainView.m

@@ -338,14 +338,26 @@
     [webView goForward];
 }
 
+- (NSString*)encodeUrl:(NSString*)url {
+    // This decode/encode trick allow to work properly with urls which are already encoded
+    // in the same manner as with those which are not. In case if 'url' is already encoded,
+    // encodedUrl will be exactly the same as original one whereas if original url was not
+    // encoded, encodedUrl will contain correct encoded version
+    NSString *decodedUrl = [url stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSString *encodedUrl = [decodedUrl stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    return encodedUrl;
+}
+
 - (void)navigate:(NSString *)url tab:(int)index {
-    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:url]];
+    NSString *encodedUrl = [self encodeUrl:url];
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:encodedUrl]];
     [webView loadRequest:request];
 }
 
 - (void)navigateRedirect:(NSString *)url tab:(int)index {
+    NSString *encodedUrl = [self encodeUrl:url];
     NSString* homeurl = [NSString stringWithUTF8String:rho_rhodesapp_gethomeurl()];
-    NSString *redirect = [NSString stringWithFormat:@"%@/system/redirect_to?url=%@", homeurl, url];
+    NSString *redirect = [NSString stringWithFormat:@"%@/system/redirect_to?url=%@", homeurl, encodedUrl];
     [self navigate:redirect tab:index];
 }
 

data/platform/shared/ruby/thread.c

@@ -2114,7 +2114,9 @@ static VALUE
 rb_thread_priority_set(VALUE thread, VALUE prio)
 {
     rb_thread_t *th;
+#if !USE_NATIVE_THREAD_PRIORITY
     int priority;
+#endif
     GetThreadPtr(thread, th);
 
     rb_secure(4);

data/platform/shared/rubyJVM/src/com/rho/net/AsyncHttp.java

@@ -147,7 +147,7 @@ public class AsyncHttp extends RhoThread
 		        break;
 	
 		    case hcDownload:
-		        m_pNetResponse = m_pNetRequest.pullFile(m_strUrl, m_strBody, null, m_mapHeaders);
+		        m_pNetResponse = m_pNetRequest.pullFile(m_strUrl, m_strFilePath, null, m_mapHeaders);
 		        break;
 	
 		    case hcUpload:

data/platform/shared/rubyJVM/src/com/rho/sync/SyncEngine.java

@@ -475,10 +475,10 @@ public class SyncEngine implements NetRequest.IRhoSession
 	{
 	    if ( strSources.length() > 0 )
 	    {
-	        /*NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null);
+	        NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null);
 	        loadAllSources();
 	        
-	        DBAdapter.initAttrManager();*/
+	        DBAdapter.initAttrManager();
 	    }
 	}
 	

data/platform/shared/rubyJVM/src/com/rho/sync/SyncSource.java

@@ -454,6 +454,7 @@ class SyncSource
 		        {
 		            getSync().stopSync();
 		            m_nErrCode = RhoRuby.getErrorFromResponse(resp);
+		            m_strError = resp.getCharData();
 		            continue;
 		        }
 		    }catch(Exception exc)

data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/ObjectFactory.java

@@ -131,8 +131,12 @@ public class ObjectFactory {
     }
 
     //RHO_COMMENT
-    public static RubyIO createResourceFile(String filename, String mode) {
-        return new RubyFile(new InputStreamExecutor(filename, mode), RubyRuntime.FileClass );
+    public static RubyIO createResourceFile(String filename, String mode) 
+    {
+    	InputStreamExecutor ise = new InputStreamExecutor(filename, mode);
+    	if ( ise.getInputStream() == null )
+    		return null;
+        return new RubyFile( ise, RubyRuntime.FileClass );
     }
     //RHO_COMMENT