rhodes 3.3.1 → 3.3.2.beta.1

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

@@ -47,6 +47,12 @@ import com.rhomobile.rhodes.Logger;
 
 class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
 
+	public int penColor;
+	public float penWidth;
+	public int bgColor;
+	
+	
+	
 	private class PointSequence {
 		public Vector<PointF> mPoints = new Vector<PointF>();
 	}
@@ -130,9 +136,16 @@ class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
 	}
 	
 	private void doFullRedraw() {
+		if (mCanvas == null) {
+			return;
+		}
+		
         Paint paint = new Paint();
         paint.setAntiAlias(false);
-        paint.setARGB(255, 255, 255, 255);
+        paint.setARGB(	255, 
+        				(bgColor & 0xFF0000) >> 16, 
+        				(bgColor & 0xFF00) >> 8,
+        				(bgColor & 0xFF));
    	 
         mCanvas.drawRect(0, 0, mCanvas.getWidth(), mCanvas.getHeight(), paint);
         
@@ -194,6 +207,20 @@ class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
 		
 	}
     
+	
+	public void setupView(int _penColor, float _penWidth, int _bgColor) {
+		penColor = _penColor;
+		penWidth = _penWidth;
+		bgColor = _bgColor;
+        mPaint = new Paint();
+        mPaint.setAntiAlias(true);
+        mPaint.setColor(0xFF000000 | penColor);
+        mPaint.setStyle(Paint.Style.STROKE);
+        mPaint.setStrokeJoin(Paint.Join.ROUND);
+        mPaint.setStrokeCap(Paint.Cap.ROUND);
+        mPaint.setStrokeWidth(penWidth);
+        doFullRedraw();
+	}
     
     public SignatureView(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -214,6 +241,7 @@ class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
         mPaint.setStrokeCap(Paint.Cap.ROUND);
         mPaint.setStrokeWidth(2);
 
+        bgColor = 0xFFFFFFFF;
         
         setFocusable(true); // make sure we get key events
         

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

@@ -51,6 +51,8 @@ public class ChromeClientOld extends WebChromeClient {
 			if (newProgress > RhodesActivity.MAX_PROGRESS)
 				newProgress = RhodesActivity.MAX_PROGRESS;
 			mRhodesActivity.getWindow().setFeatureInt(Window.FEATURE_PROGRESS, newProgress);
+		} else {
+		    newProgress = RhodesActivity.MAX_PROGRESS;
 		}
 		super.onProgressChanged(view, newProgress);
 	}

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

@@ -69,6 +69,10 @@ public class GoogleWebView implements WebView {
             throw new IllegalStateException(e);
         }
     }
+    
+    public void applyWebSettings() {
+        mWebSettings.setWebSettings(mWebView);
+    }
 
     @Override
     public View getView() {

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

@@ -26,6 +26,9 @@
 
 package com.rhomobile.rhodes.webview;
 
+import com.rhomobile.rhodes.RhoConf;
+
+import android.util.Log;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 
@@ -37,8 +40,13 @@ public class RhoWebSettingsOld implements RhoWebSettings {
 		webSettings.setSaveFormData(false);
 		webSettings.setJavaScriptEnabled(true);
 		webSettings.setJavaScriptCanOpenWindowsAutomatically(false);
-		webSettings.setSupportZoom(true);
-		webSettings.setBuiltInZoomControls(true);
+        if (RhoConf.getBool("enable_screen_zoom")) {
+            webSettings.setSupportZoom(true);
+            webSettings.setBuiltInZoomControls(true);
+        } else {
+            webSettings.setSupportZoom(false);
+            webSettings.setBuiltInZoomControls(false);
+        }
 		webSettings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
 		webSettings.setSupportMultipleWindows(false);
 

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

@@ -52,6 +52,8 @@ public class RhoWebViewClient extends WebViewClient
     public void onPageStarted(WebView view, String url, Bitmap favicon) {
         if (RhodesActivity.ENABLE_LOADING_INDICATION)
             RhodesActivity.safeGetInstance().getWindow().setFeatureInt(Window.FEATURE_PROGRESS, 0);
+        else
+            RhodesActivity.safeGetInstance().getWindow().setFeatureInt(Window.FEATURE_PROGRESS, RhodesActivity.MAX_PROGRESS);
         super.onPageStarted(view, url, favicon);
     }
     
@@ -60,8 +62,7 @@ public class RhoWebViewClient extends WebViewClient
         // Set title
         String title = view.getTitle();
         RhodesActivity.safeGetInstance().setTitle(title);
-        if (RhodesActivity.ENABLE_LOADING_INDICATION)
-            RhodesActivity.safeGetInstance().getWindow().setFeatureInt(
+        RhodesActivity.safeGetInstance().getWindow().setFeatureInt(
                     Window.FEATURE_PROGRESS, RhodesActivity.MAX_PROGRESS);
         
         super.onPageFinished(view, url);

data/platform/android/build/android.rake

@@ -31,33 +31,12 @@ require 'pathname'
 USE_OWN_STLPORT = false
 #USE_TRACES = # see androidcommon.h
 
-ANDROID_API_LEVEL_TO_MARKET_VERSION = {}
-ANDROID_MARKET_VERSION_TO_API_LEVEL = {}
-{
-    2 => "1.1",
-    3 => "1.5",
-    4 => "1.6",
-    5 => "2.0",
-    6 => "2.0.1",
-    7 => "2.1",
-    8 => "2.2",
-    9 => "2.3.1",
-    10 => "2.3.3",
-    11 => "3.0",
-    12 => "3.1",
-    13 => "3.2",
-    14 => "4.0"
-  }.each do |k,v|
-  ANDROID_API_LEVEL_TO_MARKET_VERSION[k] = v
-  ANDROID_MARKET_VERSION_TO_API_LEVEL[v] = k
-end
-
 def get_market_version(apilevel)
-  ANDROID_API_LEVEL_TO_MARKET_VERSION[apilevel]
+  AndroidTools.get_market_version(apilevel)
 end
 
 def get_api_level(version)
-  ANDROID_MARKET_VERSION_TO_API_LEVEL[version]
+  AndroidTools.get_api_level(version)
 end
 
 JAVA_PACKAGE_NAME = 'com.rhomobile.rhodes'
@@ -1423,7 +1402,7 @@ namespace "build" do
       classpath = $androidjar
       classpath += $path_separator + $gapijar unless $gapijar.nil?
       classpath += $path_separator + $motosol_jar unless $motosol_jar.nil?
-      classpath += $path_separator + "#{$tmpdir}/Rhodes"
+      classpath += $path_separator + File.join($tmpdir, 'Rhodes')
       Dir.glob(File.join($extensionsdir, "*.jar")).each do |f|
         classpath += $path_separator + f
       end
@@ -1438,11 +1417,11 @@ namespace "build" do
         puts 'ext_build.files not found - no additional java files'
       end
 
-      java_compile($tmpdir+'/Rhodes', classpath, javafilelists)
+      java_compile(File.join($tmpdir, 'Rhodes'), classpath, javafilelists)
 
       files = []
       Dir.glob(File.join($extensionsdir, "*.jar")).each do |f|
-        puts Jake.run($jarbin, ["xf", f], File.join($tmpdir, "Rhodes"))
+        puts Jake.run($jarbin, ["xf", f], File.join($tmpdir, 'Rhodes'))
         unless $?.success?
           puts "Error running jar (xf)"
           exit 1
@@ -1911,7 +1890,7 @@ namespace "run" do
         $avdname = $appavdname
       end
 
-      createavd = "\"#{$androidbin}\" create avd --name #{$avdname} --target #{$avdtarget} --sdcard 32M "
+      createavd = "\"#{$androidbin}\" create avd --name #{$avdname} --target #{$avdtarget} --sdcard 128M "
       system("echo no | #{createavd}") unless File.directory?( File.join(ENV['HOME'], ".android", "avd", "#{$avdname}.avd" ) )
 
       if $use_google_addon_api

data/platform/android/build/androidcommon.rb

@@ -393,7 +393,7 @@ def java_compile(outpath, classpath, srclists)
     args = []
     args << "-g"
     args << "-d"
-    args << $tmpdir + '/Rhodes'
+    args << outpath
     args << "-source"
     args << "1.6"
     args << "-target"

data/platform/bb/rhodes/src/com/rho/rubyext/GeoLocation.java

@@ -37,6 +37,7 @@ import com.rho.net.NetResponse;
 import com.xruby.runtime.lang.*;
 import com.xruby.runtime.builtin.ObjectFactory;
 import com.xruby.runtime.builtin.RubyArray;
+import com.xruby.runtime.builtin.RubyHash;
 import com.rho.net.NetRequest;
 import com.rho.RhoAppAdapter;
 import j2me.lang.MathEx;
@@ -590,6 +591,31 @@ public class GeoLocation extends RhoThread{
 				}
 			}
 		});
+		
+		klass.getSingletonClass().defineMethod("do_geocoding",	new RubyVarArgMethod() {
+			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block) {
+				
+				if ( args.size() < 2 )
+					throw new RubyException(RubyRuntime.ArgumentErrorClass, 
+							"in GeoLocation.set_view_notification: wrong number of arguments ( " + args.size() + " for " + 2 + " )");			
+				
+				try{
+					RubyHash hashParams = (RubyHash)(args.get(0) != RubyConstant.QNIL ? args.get(0) : null);
+					String url = args.get(1) != RubyConstant.QNIL ? args.get(1).toStr() : "";
+					String params = "";
+					int nTimeout = 0;
+					if ( args.size() > 2 )
+						params = args.get(2) != RubyConstant.QNIL ? args.get(2).toStr() : "";
+					
+						
+				}catch(Exception e)
+				{
+					LOG.ERROR("do_geocoding failed", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+				return RubyConstant.QNIL;
+			}
+		});		
 	}
 	
 }

data/platform/iphone/Classes/AppManager/AppManager.h

@@ -34,6 +34,7 @@
 
 + (AppManager *)instance;
 + (NSString *) getApplicationsRootPath;
++ (NSString *) getApplicationsUserPath;
 + (NSString *) getDbPath;
 + (NSString *) getApplicationsRosterUrl;
 + (bool) installApplication:(NSString*)appName data:(NSData*)appData;

data/platform/iphone/Classes/AppManager/AppManager.m

@@ -43,6 +43,8 @@
 
 #import "Rhodes.h"
 
+#import "common/app_build_configs.h"
+
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "RhodesApp"
@@ -117,17 +119,20 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
  * Application folders located undern the root
  */
 + (NSString *) getApplicationsRootPath {
-	NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-	NSString *documentsDirectory = [paths objectAtIndex:0];
+	NSString *documentsDirectory = [NSString stringWithUTF8String:rho_native_rhopath()];
 	return [documentsDirectory stringByAppendingPathComponent:@"apps"];
 }
 
 + (NSString *) getDbPath {
-	NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-	NSString *documentsDirectory = [paths objectAtIndex:0];
+	NSString *documentsDirectory = [NSString stringWithUTF8String:rho_native_rhouserpath()];
 	return [documentsDirectory stringByAppendingPathComponent:@"db"];
 }
 
++ (NSString *) getApplicationsUserPath {
+	return [NSString stringWithUTF8String:rho_native_rhouserpath()];
+}
+
+
 + (NSString *) getApplicationsRosterUrl {
 	return @"http://dev.rhomobile.com/vlad/";
 }
@@ -207,9 +212,10 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
     
 	NSString *bundleRoot = [[NSBundle mainBundle] resourcePath];
 	NSString *rhoRoot = [NSString stringWithUTF8String:rho_native_rhopath()];
+	NSString *rhoUserRoot = [NSString stringWithUTF8String:rho_native_rhouserpath()];
 
 	NSString *filePathNew = [bundleRoot stringByAppendingPathComponent:@"name"];
-	NSString *filePathOld = [rhoRoot stringByAppendingPathComponent:@"name"];
+	NSString *filePathOld = [rhoUserRoot stringByAppendingPathComponent:@"name"];
 //#ifndef RHO_DONT_COPY_ON_START
     BOOL hasOldName = [fileManager fileExistsAtPath:filePathOld];
 //#endif
@@ -222,7 +228,7 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
         contentChanged = YES;
 	else {
 		filePathNew = [bundleRoot stringByAppendingPathComponent:@"hash"];
-		filePathOld = [rhoRoot stringByAppendingPathComponent:@"hash"];
+		filePathOld = [rhoUserRoot stringByAppendingPathComponent:@"hash"];
 
         contentChanged = ![self isContentsEqual:fileManager first:filePathNew second:filePathOld];
         
@@ -271,13 +277,21 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
         }
 
         NSError *error;
+        
+        NSString *appsDocDir = [rhoUserRoot stringByAppendingPathComponent:@"apps"];
+        [fileManager createDirectoryAtPath:rhoRoot withIntermediateDirectories:YES attributes:nil error:&error];
+        [fileManager createDirectoryAtPath:appsDocDir withIntermediateDirectories:YES attributes:nil error:&error];
+        
         // Create symlink to "lib"
         NSString *src = [bundleRoot stringByAppendingPathComponent:@"lib"];
         NSLog(@"src: %@", src);
         NSString *dst = [rhoRoot stringByAppendingPathComponent:@"lib"];
         NSLog(@"dst: %@", dst);
         [fileManager removeItemAtPath:dst error:&error];
+        
         [fileManager createSymbolicLinkAtPath:dst withDestinationPath:src error:&error];
+        //[self copyFromMainBundle:fileManager fromPath:src toPath:dst remove:YES];
+
         
         NSString *dirs[] = {@"apps"};
         for (int i = 0, lim = sizeof(dirs)/sizeof(dirs[0]); i < lim; ++i) {
@@ -323,7 +337,7 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
                     remove = NO;
                 NSString *src = [bundleRoot stringByAppendingPathComponent:copy_dirs[i]];
                 NSLog(@"copy src: %@", src);
-                NSString *dst = [rhoRoot stringByAppendingPathComponent:copy_dirs[i]];
+                NSString *dst = [rhoUserRoot stringByAppendingPathComponent:copy_dirs[i]];
                 NSLog(@"copy dst: %@", dst);
                 [self copyFromMainBundle:fileManager fromPath:src toPath:dst remove:remove];
             }
@@ -332,7 +346,7 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
             for (int i = 0, lim = sizeof(items)/sizeof(items[0]); i < lim; ++i) {
                 NSString *src = [bundleRoot stringByAppendingPathComponent:items[i]];
                 NSLog(@"copy src: %@", src);
-                NSString *dst = [rhoRoot stringByAppendingPathComponent:items[i]];
+                NSString *dst = [rhoUserRoot stringByAppendingPathComponent:items[i]];
                 NSLog(@"copy dst: %@", dst);
                 [fileManager removeItemAtPath:dst error:&error];
                 [fileManager copyItemAtPath:src toPath:dst error:&error];
@@ -353,8 +367,8 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
 #endif
 	}
     
-	rho_logconf_Init(rho_native_rhopath(), "");
-	rho_rhodesapp_create(rho_native_rhopath());
+	rho_logconf_Init_with_separate_user_path(rho_native_rhopath(), "", rho_native_rhouserpath());
+	rho_rhodesapp_create_with_separate_user_path(rho_native_rhopath(), rho_native_rhouserpath());
 	RAWLOG_INFO("Rhodes started");
 }
 
@@ -391,8 +405,9 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
 
 @end
 
-const char* rho_native_rhopath() 
-{
+
+
+const char* getUserPath() {
 	static bool loaded = FALSE;
 	static char root[FILENAME_MAX];
 	if (!loaded){
@@ -407,6 +422,49 @@ const char* rho_native_rhopath()
 	return root;
 }
 
+
+
+const char* rho_native_rhopath() 
+{
+    BOOL all_in_doc = NO;
+    const char* svalue = get_app_build_config_item("iphone_all_in_doc_folder");
+    if (svalue != NULL) {
+        all_in_doc = svalue[0] != '0';
+    } 
+    
+    if (all_in_doc) {
+        return getUserPath();
+    }
+
+	static bool loaded = FALSE;
+	static char root[FILENAME_MAX];
+	if (!loaded){
+		NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES);
+		NSString *documentsDirectory = //[paths objectAtIndex:0];
+		[ [paths objectAtIndex:0] stringByAppendingString:@"/Private Documents/"];
+		[documentsDirectory getFileSystemRepresentation:root maxLength:sizeof(root)];
+		
+		loaded = TRUE;
+	}
+	
+	return root;
+}
+
+const char* rho_native_rhouserpath() 
+{
+    BOOL use_doc = YES;
+    const char* svalue = get_app_build_config_item("iphone_use_doc_folder");
+    if (svalue != NULL) {
+        use_doc = svalue[0] != '0';
+    } 
+    
+    if (!use_doc) {
+        return rho_native_rhopath();
+    }
+
+    return getUserPath();
+}
+
 VALUE rho_sys_get_locale() 
 {
 	NSString *preferredLang = [[NSLocale preferredLanguages] objectAtIndex:0];

data/platform/iphone/Classes/Camera/PickImageDelegate.m

@@ -112,7 +112,7 @@
 @synthesize settings;
 
 - (void)useImage:(UIImage*)theImage { 
-    NSString *folder = [[AppManager getApplicationsRootPath] stringByAppendingPathComponent:@"/../db/db-files"];
+    NSString *folder = [[AppManager getDbPath] stringByAppendingPathComponent:@"/db-files"];
 
     
     UIImage* img = theImage;

data/platform/iphone/Classes/Event/Event.m

@@ -288,13 +288,42 @@ VALUE event_fetch(VALUE rParams)
     VALUE end_date = rb_hash_aref(rParams, rb_str_new2(RUBY_EV_END_DATE));
     int include_repeating = rho_ruby_get_bool(rb_hash_aref(rParams, rb_str_new2(RUBY_FETCH_include_repeating)));
     
+    EKEventStore *eventStore = [[Rhodes sharedInstance] eventStore];
+    
+    
     NSDate *start = dateFromRuby(start_date);
     NSDate *finish = dateFromRuby(end_date);
     
-    EKEventStore *eventStore = [[Rhodes sharedInstance] eventStore];
-    NSPredicate *pred = [eventStore predicateForEventsWithStartDate:start endDate:finish calendars:nil];
-    NSArray *events = [eventStore eventsMatchingPredicate:pred];
+    // use Dictionary for remove dublicates produced by eventscovered more one year segment
+    NSMutableDictionary *eventsDict = [NSMutableDictionary dictionaryWithCapacity:1024];
     
+    NSDate* currentStart = [NSDate dateWithTimeInterval:0 sinceDate:start];
+
+    int seconds_in_year = 60*60*24*365;
+    
+    // enumerate events by one year segment because iOS do not support predicate longer than 4 year !
+    while ([currentStart compare:finish] == NSOrderedAscending) {
+        
+        NSDate* currentFinish = [NSDate dateWithTimeInterval:seconds_in_year sinceDate:currentStart];
+        
+        if ([currentFinish compare:finish] == NSOrderedDescending) {
+            currentFinish = [NSDate dateWithTimeInterval:0 sinceDate:finish];
+        }
+        NSPredicate *predicate = [eventStore predicateForEventsWithStartDate:currentStart endDate:currentFinish calendars:nil];
+        [eventStore enumerateEventsMatchingPredicate:predicate
+                                          usingBlock:^(EKEvent *event, BOOL *stop) {
+                                              
+                                              if (event) {
+                                                  [eventsDict setObject:event forKey:event.eventIdentifier];
+                                              }
+                                              
+                                          }];       
+        currentStart = [NSDate dateWithTimeInterval:(seconds_in_year + 1) sinceDate:currentStart];
+        
+    }
+    
+    NSArray *events = [eventsDict allValues];
+
     VALUE ret = rho_ruby_create_array();
     
     for (int i = 0, lim = [events count]; i != lim; ++i) {
@@ -333,6 +362,12 @@ const char* event_save(VALUE rEvent)
     EKEvent *event = eventFromRuby(eventStore, rEvent);
     
     NSError *err;
+
+    // Workaround for iOS 5.0 bug - event can not have the same start and end dates !!!
+    if ([event.endDate isEqualToDate:event.startDate]) {
+        event.endDate = [event.startDate dateByAddingTimeInterval:1.0]; // add one second
+    }    
+    
     BOOL saved = [eventStore saveEvent:event span:EKSpanFutureEvents error:&err];
     
     if (saved) {