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

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

@@ -529,10 +529,11 @@ public class SimpleMainView implements MainView {
 		//	webView = v.detachWebView();
 		if (webView == null) {
 	        if (Capabilities.WEBKIT_BROWSER_ENABLED) {
+	            Logger.D(TAG, "Creating Motorola WebKIT view");
 	            try {
 	                Class<? extends IRhoWebView> viewClass = (Class<? extends IRhoWebView>)Class.forName("com.rhomobile.rhodes.webview.EkiohWebView");
-	                Constructor<? extends IRhoWebView> viewCtor = viewClass.getConstructor(Activity.class);
-	                webView = viewCtor.newInstance(activity);
+	                Constructor<? extends IRhoWebView> viewCtor = viewClass.getConstructor(Context.class, Runnable.class);
+	                webView = viewCtor.newInstance(activity, RhodesApplication.AppState.AppStarted.addObserver("MotorolaStartEngineObserver", true));
 	            } catch (Throwable e) {
 	                Logger.E(TAG, e);
 	                RhodesApplication.stop();

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

@@ -27,13 +27,9 @@
 package com.rhomobile.rhodes.signature;
 
 import java.io.File;
-import java.util.Enumeration;
 import java.util.Map;
-import java.util.Vector;
 
 import android.content.Intent;
-import android.text.method.HideReturnsTransformationMethod;
-import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
 import android.widget.AbsoluteLayout;
@@ -47,12 +43,13 @@ import com.rhomobile.rhodes.util.ContextFactory;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 import com.rhomobile.rhodes.util.Utils;
 
+import com.rhomobile.rhodes.extmanager.AbstractRhoExtension;
 import com.rhomobile.rhodes.extmanager.IRhoExtData;
 import com.rhomobile.rhodes.extmanager.IRhoExtension;
 import com.rhomobile.rhodes.extmanager.IRhoExtManager;
-import com.rhomobile.rhodes.extmanager.RhoExtManagerSingleton;
+import com.rhomobile.rhodes.extmanager.RhoExtManager;
 
-public class Signature implements IRhoExtension {
+public class Signature extends AbstractRhoExtension implements IRhoExtension {
 
 	static final String TAG = "Signature";
 	
@@ -89,7 +86,7 @@ public class Signature implements IRhoExtension {
 		
 		public void run() {
 			init();
-			RhodesActivity ra = RhodesActivity.getInstance();
+			RhodesActivity ra = RhodesActivity.safeGetInstance();
 			Intent intent = new Intent(ra, klass);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "callback", getSharedInstance().mProperties.callbackUrl);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "imageFormat", getSharedInstance().mProperties.imageFormat);
@@ -143,9 +140,13 @@ public class Signature implements IRhoExtension {
 		callback(callbackUrl, fp, "", fp.length() == 0);
 	}
 
-	public static void inline_signature_visible(int visible, Object params) {
-		if (visible == 0) {
-			inline_signature_hide();
+    public static void inline_signature_visible(int visible, Object params) {
+        inlineSignatureVisible(RhoExtManager.getInstance(), (visible != 0), params);
+    }
+
+    public static void inlineSignatureVisible(final IRhoExtManager extManager, boolean visible, Object params) {
+		if (!visible) {
+			inlineSignatureHide(extManager);
 			return;
 		}
 		
@@ -155,7 +156,7 @@ public class Signature implements IRhoExtension {
 			public void run() {
 				reportMsg(" $$$ Start make of Signature View");
 				
-				ViewGroup wv = (WebView)RhodesService.getInstance().getMainView().getWebView(-1).getView();
+				ViewGroup wv = (ViewGroup)extManager.getWebView();
 				if ((wv != null) && (ourInlineSignatureView != null)) {
 					wv.removeView(ourInlineSignatureView);
 					ourInlineSignatureView = null;
@@ -196,10 +197,14 @@ public class Signature implements IRhoExtension {
 		if (ourInlineSignatureView != null) {
 			ImageCapture.takeSignature(callback_url, getSharedInstance().mProperties.imageFormat, ourInlineSignatureView.makeBitmap());
 		}
-		inline_signature_hide();
+		inlineSignatureHide(RhoExtManager.getInstance());
 	}
 	
 	public static void inline_signature_clear() {
+	    inlineSignatureClear(RhoExtManager.getInstance());
+	}
+	
+	public static void inlineSignatureClear(IRhoExtManager extmanager) {
 		PerformOnUiThread.exec( new Runnable () {
 			public void run() {
 				if (ourInlineSignatureView != null) {
@@ -215,11 +220,11 @@ public class Signature implements IRhoExtension {
 		});
 	}
 	
-	public static void inline_signature_hide() {
+	public static void inlineSignatureHide(final IRhoExtManager extManager) {
 		PerformOnUiThread.exec( new Runnable () {
 			public void run() {
 				if (ourInlineSignatureView != null) {
-					ViewGroup wv = (WebView)RhodesService.getInstance().getMainView().getWebView(-1).getView();
+					ViewGroup wv = (ViewGroup)extManager.getWebView();
 					if (wv != null) {
 						wv.removeView(ourInlineSignatureView);
 						ourInlineSignatureView = null;
@@ -230,11 +235,12 @@ public class Signature implements IRhoExtension {
 	}
 	
 	@Override
-	public void onBeforeNavigate(String url, IRhoExtData data) {
-		inline_signature_hide();
+	public void onBeforeNavigate(IRhoExtManager extManager, String url, IRhoExtData data) {
+		inlineSignatureHide(extManager);
 	}
 	
-	public void onSetProperty(String name, String value, IRhoExtData data) {
+	@Override
+	public void onSetProperty(IRhoExtManager extManager, String name, String value, IRhoExtData data) {
 		if ((name == null) || (value == null)) {
 			return;
 		}
@@ -242,16 +248,16 @@ public class Signature implements IRhoExtension {
 		if ("Visibility".equalsIgnoreCase(name)) {
 			if ("Visible".equalsIgnoreCase(value)) {
 				// show
-				inline_signature_visible(1, null);
+				inlineSignatureVisible(extManager, true, null);
 			}
 			else {
 				// hide;
-				inline_signature_hide();
+				inlineSignatureHide(extManager);
 			}
 		}
 		else if ("Clear".equalsIgnoreCase(name)) {
 			// clear
-			inline_signature_clear();
+			inlineSignatureClear(extManager);
 		}
 	}
 	
@@ -264,43 +270,11 @@ public class Signature implements IRhoExtension {
 	}
 	
 	public static void registerSignatureCaptureExtension() {
-		RhoExtManagerSingleton.getRhoExtManagerInstance().registerExtension(SIGNATURE_EXT, getSharedInstance());
+		RhoExtManager.getInstance().registerExtension(SIGNATURE_EXT, getSharedInstance());
 	}
 	
 	public static native void callback(String callbackUrl, String filePath, String error, boolean cancelled);
 
-    @Override
-    public void onSetPropertiesData(String propId, String data, IRhoExtData ext) {
-        // Nothing
-    }
-
-    @Override
-    public void onNavigateComplete(String urlBeingNavigatedTo, IRhoExtData ext) {
-    }
-
-    @Override
-    public void onDocumentComplete(String urlOfDocument, IRhoExtData ext) {
-    }
-
-    @Override
-    public long onNavigateTimeout(String urlBeingNavigatedTo, IRhoExtData ext) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public long onSIPState(boolean bSIPState, IRhoExtData ext) {
-        return 0;
-    }
-
-    @Override
-    public long onNavigateError(String urlBeingNavigatedTo, IRhoExtData ext) {
-        return 0;
-    }
-
-    @Override
-    public void onAppActivate(boolean bActivate, IRhoExtData ext) {
-    }
 }
 
 

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

@@ -198,7 +198,28 @@ class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
         		}
         	}
         }
-        
+        {   
+        	PointSequence ps = mCurrentSequence;
+        	if ((ps != null) && (ps.mPoints != null)) {
+	        	for (p = 1; p < ps.mPoints.size(); p++) {
+	        		PointF prev = ps.mPoints.elementAt(p-1);
+	        		PointF cur = ps.mPoints.elementAt(p);
+	        		if ((prev != null) && (cur != null)) {
+	        			canvas.drawLine(prev.x, prev.y, cur.x, cur.y, mPaint);
+	        		}
+	        	}
+        	}
+        	else {
+        		if (ps == null) {
+        			//Logger.D(TAG, "##################  ps == null !");
+        		}
+        		else {
+	        		if (ps.mPoints == null) {
+	        			//Logger.D(TAG, "##################  ps.mPoints == null !");
+	        		}
+        		}
+        	}
+        }
         // update screen
         if (redrawOnScreen && (!isTransparency)) {
         	Canvas c = null;
@@ -335,14 +356,17 @@ class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
                 	mCurrentSequence.mPoints.add(new PointF(x,y));
                 	break;
                 case MotionEvent.ACTION_MOVE:
-                	doDrawSegment(mX,mY, x,y);
+                	//doDrawSegment(mX,mY, x,y);
                 	mCurrentSequence.mPoints.add(new PointF(x,y));
+                	doFullRedraw(mCanvas, mBitmap, true, true);
+                	invalidate();
                     break;
                 case MotionEvent.ACTION_UP:
-                	doDrawSegment(mX,mY, x,y);
+                	//doDrawSegment(mX,mY, x,y);
                 	mCurrentSequence.mPoints.add(new PointF(x,y));
                 	mSequences.add(mCurrentSequence);
                 	mCurrentSequence = new PointSequence();
+                	doFullRedraw(mCanvas, mBitmap, true, true);
                     break;
             }
     	 

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

@@ -40,8 +40,6 @@ public class Utils {
 	
 	public static class FileSource {
 		
-		public FileSource() {}
-		
 		String[] list(String dir) throws IOException {
 			return new File(dir).list();
 		}
@@ -136,24 +134,25 @@ public class Utils {
 		}
 	}
 	
-	public static void copyRecursively(FileSource fs, String source, File target, boolean remove) throws IOException
+	public static void copyRecursively(FileSource fs, File source, File target, boolean deleteTarget) throws IOException
 	{
-		if (remove && target.exists())
+		if (deleteTarget && target.exists())
 			deleteRecursively(target);
 		
-		String[] children = fs.list(source);
-		if (children != null && children.length > 0) {
-			if (!target.exists())
-				target.mkdirs();
-			
-			for(int i = 0; i != children.length; ++i)
-				copyRecursively(fs, source + "/" + children[i], new File(target, children[i]), false);
-		}
-		else {
+		if (source.isDirectory()) {
+    		String[] children = fs.list(source.getAbsolutePath());
+    		if (children != null && children.length > 0) {
+    			if (!target.exists())
+    				target.mkdirs();
+    			
+    			for(String child: children)
+    				copyRecursively(fs, new File(source, child), new File(target, child), false);
+    		}
+		} else if (source.isFile()){
 			InputStream in = null;
 			OutputStream out = null;
 			try {
-				in = fs.open(source);
+				in = fs.open(source.getAbsolutePath());
 				target.getParentFile().mkdirs();
 				out = new FileOutputStream(target);
 				

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

@@ -30,7 +30,7 @@ import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhoConf;
 import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesService;
-import com.rhomobile.rhodes.extmanager.RhoExtManagerSingleton;
+import com.rhomobile.rhodes.extmanager.RhoExtManager;
 
 import android.graphics.Bitmap;
 import android.net.http.SslError;
@@ -51,14 +51,14 @@ public class RhoWebViewClient extends WebViewClient
     
     @Override
     public void onPageStarted(WebView view, String url, Bitmap favicon) {
-        
-        RhoExtManagerSingleton.getRhoExtManagerInstance().onBeforeNavigate(url);
+        super.onPageStarted(view, url, 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);
+
+        RhoExtManager.getImplementationInstance().onBeforeNavigate(view, url);
     }
     
     @Override
@@ -69,11 +69,18 @@ public class RhoWebViewClient extends WebViewClient
         RhodesActivity.safeGetInstance().getWindow().setFeatureInt(
                     Window.FEATURE_PROGRESS, RhodesActivity.MAX_PROGRESS);
         
+        RhoExtManager.getImplementationInstance().onLoadEnd(view, url, 0, 0);
+        
         super.onPageFinished(view, url);
     }
     
-    public void onReceivedError(android.webkit.WebView view, int errorCode, java.lang.String description, java.lang.String failingUrl)
+    @Override
+    public void onReceivedError(WebView view, int errorCode, String description, String failingUrl)
     {
+        super.onReceivedError(view, errorCode, description, failingUrl);
+        
+        RhoExtManager.getImplementationInstance().onLoadError(view);
+        
         StringBuilder msg = new StringBuilder(failingUrl);
         msg.append(" failed: ");
         msg.append(errorCode);

data/platform/android/build/RhodesSRC_build.files

@@ -98,12 +98,13 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsOld.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebViewClient.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/IRhoWebView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/AbstractRhoExtension.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtData.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtension.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtManager.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtDataImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerImpl.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerSingleton.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManager.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality01.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality02.java

data/platform/android/build/android.rake

@@ -337,11 +337,17 @@ namespace "config" do
   end
 
   task :android => :set_android_platform do
-  
+
     Rake::Task["config:common"].invoke
 
     $java = $config["env"]["paths"]["java"]
 
+    $neon_root = nil
+    $neon_root = $config["env"]["paths"]["neon"] unless $config["env"]["paths"].nil?
+    if !($app_config["paths"].nil? or $app_config["paths"]["neon"].nil?)
+      $neon_root = $app_config["paths"]["neon"]  
+    end
+
     $androidsdkpath = $config["env"]["paths"]["android"]
     unless File.exists? $androidsdkpath
       puts "Missing or invalid 'android' section in rhobuild.yml: '#{$androidsdkpath}'"
@@ -580,7 +586,8 @@ namespace "config" do
     $use_google_addon_api = true unless $app_config["capabilities"].index("push").nil?
     
     unless $app_config['capabilities'].index('motorola').nil? and $app_config['capabilities'].index('motoroladev').nil?
-      $use_motosol_barcode_api = true if $app_config['extensions'].index('barcode') or $app_config['extensions'].index('barcode-moto')
+      $use_motosol_barcode_api = true #if $app_config['extensions'].index('barcode') or $app_config['extensions'].index('barcode-moto')
+      $use_motosol_api_classpath = true unless $app_config['capabilities'].index('motoroladev').nil?
       raise 'Cannot use Motorola SDK addon and Google SDK addon together!' if $use_google_addon_api
     end
  
@@ -592,7 +599,7 @@ namespace "config" do
     end 
 
     # Look for Motorola barcode SDK addon
-    if $use_motosol_barcode_api
+    if $use_motosol_api_classpath
       Dir.glob(File.join($androidsdkpath, 'add-ons', '*')).each do |dir|
         apijar = File.join(dir, 'libs', 'com.motorolasolutions.scanner.jar')
         if File.exists? apijar
@@ -748,27 +755,41 @@ namespace "build" do
       end
 
     end
-#    desc "Build RhoBundle for android"
-    task :rhobundle => ["config:android","build:bundle:noxruby",:extensions] do
-#      Rake::Task["build:bundle:noxruby"].execute
 
-      assets = File.join(Jake.get_absolute($androidpath), "Rhodes", "assets")
+    desc "Build RhoBundle for android"
+    task :rhobundle => ["config:android", :extensions] do
+    
+      Rake::Task["build:bundle:noxruby"].invoke
+
+      #assets = File.join(Jake.get_absolute($androidpath), "Rhodes", "assets")
+      assets = File.join $tmpdir, 'assets'
       rm_rf assets
       mkdir_p assets
       hash = nil
       ["apps", "db", "lib"].each do |d|
         cp_r File.join($srcdir, d), assets, :preserve => true
         # Calculate hash of directories
-        hash = get_dir_hash(File.join(assets, d), hash)
+        hash = get_dir_hash(File.join($srcdir, d), hash)
+      end
+      File.open(File.join($srcdir, "hash"), "w") { |f| f.write(hash.hexdigest) }    
+      File.open(File.join($srcdir, "name"), "w") { |f| f.write($appname) }
+      Jake.build_file_map($srcdir, "rho.dat")
+
+      ["apps", "db", "lib", "hash", "name", "rho.dat"].each do |d|
+        cp_r File.join($srcdir, d), assets, :preserve => true
       end
-      File.open(File.join(assets, "hash"), "w") { |f| f.write(hash.hexdigest) }
 
-      File.open(File.join(assets, "name"), "w") { |f| f.write($appname) }
-      
-      Jake.build_file_map(assets, "rho.dat")
     end
 
-    task :extensions => :genconfig do
+    desc "Build RhoBundle for Eclipse project"
+    task :eclipsebundle => "build:android:rhobundle" do
+      assets = File.join $tmpdir, 'assets'
+      eclipse_assets = File.join(Jake.get_absolute($androidpath), "Rhodes", "assets")
+      rm_rf eclipse_assets
+      cp_r assets, eclipse_assets, :preserve => true
+    end
+
+    task :extensions => ["config:android", :genconfig] do
 
       ENV['RHO_PLATFORM'] = 'android'
       ENV["ANDROID_NDK"] = $androidndkpath
@@ -778,6 +799,7 @@ namespace "build" do
       ENV["BUILD_DIR"] ||= $startdir + "/platform/android/build"
       ENV["RHO_INC"] = $appincdir
       ENV["RHO_ANDROID_TMP_DIR"] = $tmpdir
+      ENV["NEON_ROOT"] = $neon_root unless $neon_root.nil?
 
       ext_build_files = File.join($extensionsdir, "ext_build.files")
       if File.exist? ext_build_files
@@ -1460,8 +1482,19 @@ namespace "build" do
       end
     end
 
+    task :upgrade_package => :rhobundle do
+        #puts '$$$$$$$$$$$$$$$$$$'
+        #puts 'targetdir = '+$targetdir.to_s
+        #puts 'bindir = '+$bindir.to_s
+        android_targetdir = File.join($targetdir, 'android')
+        mkdir_p android_targetdir if not File.exists? android_targetdir
+        zip_file_path = File.join(android_targetdir, 'upgrade_bundle.zip')
+        Jake.build_file_map(File.join($srcdir, "apps"), "rhofilelist.txt")
+        Jake.zip_upgrade_bundle($bindir, zip_file_path)
+    end    
+    
     #desc "build all"
-    task :all => [:rhobundle, :rhodes]
+    task :all => ['build:android:rhobundle', :rhodes]
   end
 end
 
@@ -1482,7 +1515,7 @@ namespace "package" do
 
     manifest = $appmanifest
     resource = $appres
-    assets = Jake.get_absolute $androidpath + "/Rhodes/assets"
+    assets = File.join($tmpdir, 'assets')
     resourcepkg =  $bindir + "/rhodes.ap_"
 
     puts "Packaging Assets and Jars"
@@ -1498,8 +1531,6 @@ namespace "package" do
     end
 
     # Workaround: manually add files starting with '_' because aapt silently ignore such files when creating package
-    rm_rf File.join($tmpdir, "assets")
-    cp_r assets, $tmpdir
     Dir.glob(File.join($tmpdir, "assets/**/*")).each do |f|
       next unless File.basename(f) =~ /^_/
       relpath = Pathname.new(f).relative_path_from(Pathname.new($tmpdir)).to_s