rhodes 3.3.1 → 3.3.2.beta.1

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

@@ -25,9 +25,11 @@
 *------------------------------------------------------------------------*/
 
 #include "rhodes/JNIRhodes.h"
+#include "rhodes/JNIRhoRuby.h"
 
 #include "rhodes/jni/com_rhomobile_rhodes_signature_Signature.h"
 
+#include <common/rhoparams.h>
 #include <common/RhodesApp.h>
 #include "ruby/ext/rho/rhoruby.h"
 
@@ -44,14 +46,15 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_signature_Signature_callback
 
 RHO_GLOBAL void rho_signature_take(char* callback_url, rho_param* p)
 {
-///*
+
     JNIEnv *env = jnienv();
     jclass cls = getJNIClass(RHODES_JAVA_CLASS_SIGNATURE);
     if (!cls) return;
-    jmethodID mid = getJNIClassStaticMethod(env, cls, "takeSignature", "(Ljava/lang/String;Ljava/lang/String;)V");
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "takeSignature", "(Ljava/lang/String;Ljava/lang/Object;)V");
     if (!mid) return;
     jhstring objCallback = rho_cast<jhstring>(callback_url);
 
+    /*
     char* image_format = 0;
     if (p)
     {
@@ -64,7 +67,14 @@ RHO_GLOBAL void rho_signature_take(char* callback_url, rho_param* p)
 
     jhstring objFormat = rho_cast<jhstring>(image_format);
     env->CallStaticVoidMethod(cls, mid, objCallback.get(), objFormat.get());
-//*/
+     */
+    
+    jobject paramsObj = RhoValueConverter(env).createObject(p);
+    env->CallStaticVoidMethod(cls, mid, objCallback.get(), paramsObj);
+    env->DeleteLocalRef(paramsObj);
+    
+    
+    
 }
 
 RHO_GLOBAL void rho_signature_visible(bool b, rho_param* p)

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

@@ -44,6 +44,7 @@ import com.rhomobile.rhodes.util.ContextFactory;
 public class RhoCryptImpl 
 {
     private static final String TAG = "RhoCryptJava";
+    private static final boolean DEBUG = false;
 
 	byte[] m_dbKeyData;
 	String m_strDBPartition;
@@ -54,12 +55,28 @@ public class RhoCryptImpl
     private void readKeyFromStorage()
     {
         SharedPreferences settings = ContextFactory.getContext().getSharedPreferences( m_strPrefName, Context.MODE_PRIVATE);
-    	String strOldKey = settings.getString(m_strDBPartition, "");
-    	if ( strOldKey != null && strOldKey.length() > 0 )
-    	{
-    		m_dbKeyData = Base64.decode(strOldKey);//, Base64.DEFAULT);
-    	}
-	}
+        String strOldKey = settings.getString(m_strDBPartition, "");
+        if (strOldKey != null && strOldKey.length() > 0)
+        {
+            
+            m_dbKeyData = Base64.decode(strOldKey);//, Base64.DEFAULT);
+            Logger.I(TAG, "Key is successfully read from Shared Preferences");
+            if(DEBUG) {
+                Logger.I(TAG, "Key: " + dumpKey(m_dbKeyData));
+                Logger.I(TAG, "Encoded key: " + strOldKey);
+            }
+        } else {
+            Logger.I(TAG, "No key is found in Shared Preferences");
+        }
+    }
+
+    private static String dumpKey(byte[] key) {
+        StringBuffer buffer = new StringBuffer();
+        for(byte b:key) {
+            buffer.append(String.format("%x ", b));
+        }
+        return buffer.toString();
+    }
 
 	private void generateNewKey()throws Exception
 	{
@@ -68,15 +85,28 @@ public class RhoCryptImpl
 	    kgen.init(m_nKeyLenBit, sr);  
 	    SecretKey skey = kgen.generateKey();  
 	    m_dbKeyData = skey.getEncoded();
+	    Logger.I(TAG, "New key is generated");
+	    if(DEBUG)
+	        Logger.I(TAG, "Key: " + dumpKey(m_dbKeyData));
 	}
 
-	private void writeKeyToStorage()
-	{
-		SharedPreferences settings =  ContextFactory.getContext().getSharedPreferences(m_strPrefName, Context.MODE_PRIVATE);		
-    	SharedPreferences.Editor editor = settings.edit();
-    	String strKey = Base64.encodeToString(m_dbKeyData, false);//, Base64.DEFAULT);
-    	editor.putString(m_strDBPartition, strKey );
-    	editor.commit();
+    private void writeKeyToStorage()
+    {
+        SharedPreferences settings =  ContextFactory.getContext().getSharedPreferences(m_strPrefName, Context.MODE_PRIVATE);		
+        SharedPreferences.Editor editor = settings.edit();
+        String strKey = Base64.encodeToString(m_dbKeyData, false);//, Base64.DEFAULT);
+        
+        editor.putString(m_strDBPartition, strKey );
+        if (editor.commit()) {
+            Logger.I(TAG, "Key is successfully saved to Shared Preferences");
+        } else {
+            Logger.E(TAG, "Write key to Shared Preferences is failed");
+        }
+
+        if (DEBUG) {
+            Logger.I(TAG, "Key: " + dumpKey(m_dbKeyData));
+            Logger.I(TAG, "Encoded key: " + strKey);
+        }
 	}
 
 	private void initKey(String szPartition)throws Exception
@@ -118,35 +148,38 @@ public class RhoCryptImpl
 		m_decryptCipher.init(Cipher.DECRYPT_MODE, skeySpec, paramSpec);
 		
         Logger.T(TAG, "RhoCrypt context initialized for partition: " + szPartition);
+    }
 
-	}
-	
-	private static void reportFail(String name, Exception e) 
-	{
-	    Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getClass().getSimpleName() + ": " + e.getMessage());
-	}
-	
     public boolean db_encrypt( String szPartition, ByteBuffer dataIn, ByteBuffer dataOut )
     {
-    	try
-    	{
-	    	initContext(szPartition);
+        try
+        {
+            initContext(szPartition);
 
             dataOut.rewind();
 
             if (m_encryptCipher == null)
                 throw new NullPointerException("m_encryptCipher == null");
 
-            m_encryptCipher.doFinal(dataIn, dataOut);
+            /* *********************************************************
+             * Work around Android 4 bug:
+             * http://code.google.com/p/android/issues/detail?id=24327 
+             */
+            ByteBuffer input = ByteBuffer.allocate(dataIn.capacity());
+            input.put(dataIn);
+            input.rewind();
+            /* ******************************************************* */
+
+            m_encryptCipher.doFinal(input, dataOut);
 
-	    	return true;
-    	}catch(Exception exc)
-    	{
-    		reportFail("db_encrypt", exc);
-    		return false;
-    	}
+            return true;
+        }catch(Exception exc)
+        {
+            Logger.E(TAG, exc);
+            return false;
+        }
     }
-    
+
     public boolean db_decrypt( String szPartition, ByteBuffer dataIn, ByteBuffer dataOut )
     {
         try
@@ -158,12 +191,21 @@ public class RhoCryptImpl
             if (m_decryptCipher == null)
                 throw new NullPointerException("m_decryptCipher == null");
 
-            m_decryptCipher.doFinal(dataIn, dataOut);
+            /* *********************************************************
+             * Work around Android 4 bug:
+             * http://code.google.com/p/android/issues/detail?id=24327 
+             */
+            ByteBuffer input = ByteBuffer.allocate(dataIn.capacity());
+            input.put(dataIn);
+            input.rewind();
+            /* ******************************************************* */
+
+            m_decryptCipher.doFinal(input, dataOut);
 
             return true;
 		}catch(Exception exc)
 		{
-			reportFail("db_decrypt", exc);
+			Logger.E(TAG, exc);
 			return false;
 		}
     }
@@ -175,7 +217,7 @@ public class RhoCryptImpl
 	    
 	    if ( keyData.length != (m_nKeyLenBit/8))
 	    {
-	    	reportFail("set_db_CryptKey", new Exception("Incorrect key size : " + keyData.length + "; Should be: " + (int)(m_nKeyLenBit/8)));
+	    	Logger.E(TAG, "Incorrect key size : " + keyData.length + "; Should be: " + (int)(m_nKeyLenBit/8));
 	    	return false;
 	    }
 	    m_dbKeyData = keyData;

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

@@ -60,7 +60,7 @@ public class RhodesActivity extends BaseActivity {
 	
 	private static final boolean DEBUG = false;
 	
-	public static boolean ENABLE_LOADING_INDICATION = true;
+	public static boolean ENABLE_LOADING_INDICATION = false;
 	
 	public static int MAX_PROGRESS = 10000;
 	
@@ -137,6 +137,7 @@ public class RhodesActivity extends BaseActivity {
 	protected void onCreate(Bundle savedInstanceState) {
 		
 		super.onCreate(savedInstanceState);
+        Log.i(TAG, ">>>>>>>>>>>>>>> onCreate()");
 		
 		mListeners = new ArrayList<RhodesActivityListener>();
 
@@ -154,15 +155,13 @@ public class RhodesActivity extends BaseActivity {
 		else {
 		}
 		requestWindowFeature(Window.FEATURE_PROGRESS);
-		getWindow().setFeatureInt(Window.FEATURE_PROGRESS, 10000);
+        getWindow().setFeatureInt(Window.FEATURE_PROGRESS, MAX_PROGRESS);
 
 		mHandler = new Handler();
 
         mSplashScreen = new SplashScreen(this);
         setMainView(mSplashScreen);
 
-		Log.i(TAG, ">>>>>>>>>>>>>>> onCreate()");
-
 		processStartupListeners();
         {
         	Iterator<RhodesActivityListener> iterator = mListeners.iterator();

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

@@ -832,7 +832,7 @@ public class RhodesService extends Service {
 				return AndroidFunctionalityManager.getAndroidFunctionality().AccessOwnerInfo_getEmail(getContext());
 			}
 			else if (name.equalsIgnoreCase("device_name")) {
-				return Build.DEVICE;
+				return Build.MANUFACTURER + " " + Build.DEVICE;
 			}
 			else if (name.equalsIgnoreCase("is_emulator")) {
 			    String strDevice = Build.DEVICE;

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

@@ -91,7 +91,7 @@ public class SplashScreen implements MainView {
                 }
                 catch (IOException e) {
                     if (DEBUG)
-                        Log.d(TAG, "Can't load " + url, e);
+                        Log.d(TAG, "Can't load " + url + ": " + e.getMessage());
                     continue;
                 }
                 finally {
@@ -116,7 +116,15 @@ public class SplashScreen implements MainView {
                 RhodesApplication.stop();
             }
         } else {
-            view = new GoogleWebView(context);
+            final GoogleWebView googleWebView = new GoogleWebView(context);
+            view = googleWebView;
+            RhodesApplication.runWhen(RhodesApplication.AppState.AppStarted, new RhodesApplication.StateHandler(true) {
+                @Override
+                public void run()
+                {
+                    googleWebView.applyWebSettings();
+                }
+            });
         }
 
         switch (type) {

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

@@ -37,10 +37,7 @@ import android.util.DisplayMetrics;
 import com.google.android.maps.GeoPoint;
 import com.google.android.maps.ItemizedOverlay;
 import com.google.android.maps.OverlayItem;
-import com.rhomobile.rhodes.RhodesService;
-import com.rhomobile.rhodes.WebView;
 import com.rhomobile.rhodes.file.RhoFileApi;
-import com.rhomobile.rhodes.util.Utils;
 
 public class AnnotationsOverlay extends ItemizedOverlay<OverlayItem> {
 	

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

@@ -75,7 +75,11 @@ public class Callout {
 		mTitle = title;
 		mDetails = details;
 		mUrl = url;
-		
+
+		if (mDetails == null) {
+		    mDetails = "";
+		}
+
 		if (mUrl != null) {
 			if (mUrl.length() < 2) {
 				mUrl = null;
@@ -84,8 +88,6 @@ public class Callout {
 		
 		Paint paint = new Paint();
 		paint.setAntiAlias(true);
-
-
 		
 		int title_width = 0;
 		int title_height = 0;
@@ -99,12 +101,11 @@ public class Callout {
 		title_height = rcLine.bottom - rcLine.top;
 		int max_text_width = title_width;
 		
-		
 		int details_width = 0;
 		int details_height = 0;
 		int details_max_line_height = 0;
 		// calc Details size (W,H)
-		String [] lines = details.split("\n");
+		String [] lines = mDetails.split("\n");
 		int i;
 		paint.setColor(DETAILS_COLOR);
 		paint.setTextSize(DETAILS_FONT_SIZE);

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

@@ -57,7 +57,6 @@ import com.rhomobile.rhodes.RhoConf;
 import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
-import com.rhomobile.rhodes.util.Utils;
 
 public class GoogleMapView extends MapActivity {
 

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

@@ -55,6 +55,7 @@ public class ImageCapture extends BaseActivity implements OnClickListener
 	
 	private String callbackUrl;
 	private String imageFormat;
+	
 	private SimpleDateFormat timeStampFormat = new SimpleDateFormat("yyyyMMddHHmmssSS");
 
 	private SignatureView surfaceView;
@@ -74,7 +75,7 @@ public class ImageCapture extends BaseActivity implements OnClickListener
 		
 		Bundle extras = getIntent().getExtras();
 		callbackUrl = extras.getString(com.rhomobile.rhodes.signature.Signature.INTENT_EXTRA_PREFIX + "callback");
-		imageFormat = extras.getString(com.rhomobile.rhodes.signature.Signature.INTENT_EXTRA_PREFIX + "format");
+		imageFormat = extras.getString(com.rhomobile.rhodes.signature.Signature.INTENT_EXTRA_PREFIX + "imageFormat");
 		
 		surfaceView = (SignatureView) findViewById(AndroidR.id.signature_view);
 		surfaceHolder = surfaceView.getHolder();
@@ -86,6 +87,11 @@ public class ImageCapture extends BaseActivity implements OnClickListener
 		clearButton.setOnClickListener(this);
 		okButton = (ImageButton)findViewById(AndroidR.id.sig_okButton);
 		okButton.setOnClickListener(this);
+
+		int penColor = extras.getInt(com.rhomobile.rhodes.signature.Signature.INTENT_EXTRA_PREFIX + "penColor");
+		float penWidth = extras.getFloat(com.rhomobile.rhodes.signature.Signature.INTENT_EXTRA_PREFIX + "penWidth");
+		int bgColor = extras.getInt(com.rhomobile.rhodes.signature.Signature.INTENT_EXTRA_PREFIX + "bgColor");
+		surfaceView.setupView(penColor, penWidth, bgColor);
 	}
 
 	@Override

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

@@ -27,6 +27,8 @@
 package com.rhomobile.rhodes.signature;
 
 import java.io.File;
+import java.util.Map;
+import java.util.Vector;
 
 import android.content.Intent;
 
@@ -55,12 +57,18 @@ public class Signature {
 	private static class Picture implements Runnable {
 		private String url;
 		private Class<?> klass;
-		private String format;
+		private String imageFormat;
+		private int penColor;
+		private float penWidth;
+		private int bgColor;
 		
-		public Picture(String u, Class<?> c, String form) {
+		public Picture(String u, Class<?> c, String _imageFormat, int _penColor, float _penWidth, int _bgColor) {
 			url = u;
 			klass = c;
-			format = form;
+			imageFormat = _imageFormat;
+			penColor = _penColor;
+			penWidth = _penWidth;
+			bgColor = _bgColor;
 		}
 		
 		public void run() {
@@ -68,14 +76,46 @@ public class Signature {
 			RhodesActivity ra = RhodesActivity.getInstance();
 			Intent intent = new Intent(ra, klass);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "callback", url);
-			intent.putExtra(INTENT_EXTRA_PREFIX + "format", format);
+			intent.putExtra(INTENT_EXTRA_PREFIX + "imageFormat", imageFormat);
+			intent.putExtra(INTENT_EXTRA_PREFIX + "penColor", penColor);
+			intent.putExtra(INTENT_EXTRA_PREFIX + "penWidth", penWidth);
+			intent.putExtra(INTENT_EXTRA_PREFIX + "bgColor", bgColor);
 			ra.startActivity(intent);
 		}
 	};
 	
-	public static void takeSignature(String url, String format) {
+	public static void takeSignature(String url, Object params) {
 		try {
-			Runnable runnable = new Picture(url, ImageCapture.class, format);
+			String imageFormat = "png";
+			int penColor = 0xFF66009A;
+			float penWidth = 2;
+			int bgColor = 0xFFFFFFFF;
+			
+			if (params instanceof Map<?,?>) {
+				Map<Object,Object> settings = (Map<Object,Object>)params;
+				
+				Object imgFrmtObj = settings.get("imageFormat");
+				if ((imgFrmtObj != null) && (imgFrmtObj instanceof String)) {
+					imageFormat = new String(((String)imgFrmtObj));
+				}
+				
+				Object penColorObj = settings.get("penColor");
+				if ((penColorObj != null) && (penColorObj instanceof String)) {
+					penColor = Integer.parseInt((String)penColorObj) | 0xFF000000;
+				}
+					
+				Object penWidthObj = settings.get("penWidth");
+				if ((penWidthObj != null) && (penWidthObj instanceof String)) {
+					penWidth = Float.parseFloat((String)penWidthObj);
+				}
+
+				Object bgColorObj = settings.get("bgColor");
+				if ((bgColorObj != null) && (bgColorObj instanceof String)) {
+					bgColor = Integer.parseInt((String)bgColorObj) | 0xFF000000;
+				}
+			}
+			
+			Runnable runnable = new Picture(url, ImageCapture.class, imageFormat, penColor, penWidth, bgColor);
 			PerformOnUiThread.exec(runnable, false);
 		}
 		catch (Exception e) {