rhodes 3.4.2 → 3.5.1.12

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

@@ -48,7 +48,6 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONTokener;
 
-import com.rhomobile.rhodes.RhodesApplication.AppState;
 import com.rhomobile.rhodes.alert.Alert;
 import com.rhomobile.rhodes.alert.StatusNotification;
 import com.rhomobile.rhodes.event.EventStore;
@@ -110,9 +109,9 @@ public class RhodesService extends Service {
 	
 	private static final boolean DEBUG = false;
 	
-	public static final String INTENT_EXTRA_PREFIX = "com.rhomobile.rhodes.";
+	public static final String INTENT_EXTRA_PREFIX = "com.rhomobile.rhodes";
 	
-	public static final String INTENT_SOURCE = INTENT_EXTRA_PREFIX + ".intent.source";
+	public static final String INTENT_SOURCE = INTENT_EXTRA_PREFIX + ".intent_source";
 	
 	public static int WINDOW_FLAGS = WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN;
 	public static int WINDOW_MASK = WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN;
@@ -131,6 +130,8 @@ public class RhodesService extends Service {
 	
 	private final IBinder mBinder = new LocalBinder();
 	
+	private BroadcastReceiver mConnectionChangeReceiver;
+	
 	@SuppressWarnings("rawtypes")
 	private static final Class[] mStartForegroundSignature = new Class[] {int.class, Notification.class};
 	@SuppressWarnings("rawtypes")
@@ -254,8 +255,11 @@ public class RhodesService extends Service {
 	public static native String getInvalidSecurityTokenMessage();
 	
 	public static native void resetHttpLogging(String http_log_url);
+	public static native void resetFileLogging(String log_path);
+	
+	public static native boolean isMotorolaLicencePassed(String license, String company, String appName);
 	
-	public static native boolean isMotorolaLicencePassed();
+	public native void notifyNetworkStatusChanged( int status );
 	
 	
 	public static RhodesService getInstance() {
@@ -327,22 +331,9 @@ public class RhodesService extends Service {
 		mUriHandlers.addElement(new SmsUriHandler(context));
 		mUriHandlers.addElement(new VideoUriHandler(context));
 
-        if (Capabilities.PUSH_ENABLED) {
-            Logger.D(TAG, "Push is enabled");
-            try {
-                String pushPin = getPushRegistrationId();
-                if (pushPin.length() == 0)
-                    PushService.register();
-                else
-                    Logger.D(TAG, "PUSH already registered: " + pushPin);
-            } catch (IllegalAccessException e) {
-                Logger.E(TAG, e);
-                exit();
-                return;
-            }
-        } else {
-            Logger.D(TAG, "Push is disabled");
-        }
+        mConnectionChangeReceiver = new ConnectionChangeReceiver();
+        IntentFilter filter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
+        registerReceiver(mConnectionChangeReceiver,filter);
 
 		RhodesApplication.start();
 
@@ -401,18 +392,20 @@ public class RhodesService extends Service {
 			handleCommand(intent, startId);
 		}
 		catch (Exception e) {
-			Log.e(TAG, "Can't handle service command", e);
+			Logger.E(TAG, "Can't handle service command");
+			Logger.E(TAG, e);
 		}
 	}
 	
 	@Override
 	public int onStartCommand(Intent intent, int flags, int startId) {
-		Log.d(TAG, "+++ onStartCommand");
+		Logger.D(TAG, "onStartCommand");
 		try {
 			handleCommand(intent, startId);
 		}
 		catch (Exception e) {
-			Log.e(TAG, "Can't handle service command", e);
+            Logger.E(TAG, "Can't handle service command");
+            Logger.E(TAG, e);
 		}
 		return Service.START_STICKY;
 	}
@@ -422,69 +415,59 @@ public class RhodesService extends Service {
 			return;
 		}
 		String source = intent.getStringExtra(INTENT_SOURCE);
-		Log.i(TAG, "handleCommand: startId=" + startId + ", source=" + source);
+		Logger.I(TAG, "handleCommand: startId=" + startId + ", source=" + source);
 		if (source == null)
 			throw new IllegalArgumentException("Service command received from empty source");
 		
 		if (source.equals(BaseActivity.INTENT_SOURCE)) {
-			Log.d(TAG, "New activity was created");
+			Logger.D(TAG, "New activity was created");
 		}
-		else if (source.equals(PushReceiver.INTENT_SOURCE)) {
-			int type = intent.getIntExtra(PushReceiver.INTENT_TYPE, PushReceiver.INTENT_TYPE_UNKNOWN);
+		else if (source.equals(PushContract.INTENT_SOURCE)) {
+			int type = intent.getIntExtra(PushContract.INTENT_TYPE, PushContract.INTENT_TYPE_UNKNOWN);
 			switch (type) {
-			case PushReceiver.INTENT_TYPE_REGISTRATION_ID:
-				String id = intent.getStringExtra(PushReceiver.INTENT_REGISTRATION_ID);
+			case PushContract.INTENT_TYPE_REGISTRATION_ID:
+				String id = intent.getStringExtra(PushContract.INTENT_REGISTRATION_ID);
 				if (id == null)
 					throw new IllegalArgumentException("Empty registration id received in service command");
-				Log.i(TAG, "Received PUSH registration id: " + id);
+				Logger.I(TAG, "Received PUSH registration id: " + id);
 				setPushRegistrationId(id);
 				break;
-            case PushReceiver.INTENT_TYPE_MESSAGE:
-                if(intent.hasExtra(PushReceiver.INTENT_MESSAGE_EXTRAS)) {
-                    final Bundle extras = intent.getBundleExtra(PushReceiver.INTENT_MESSAGE_EXTRAS);
-                    Log.i(TAG, "Received PUSH message: " + extras);
+            case PushContract.INTENT_TYPE_MESSAGE:
+                if(intent.hasExtra(PushContract.INTENT_MESSAGE_EXTRAS)) {
+                    final String pushType = intent.getStringExtra(PushContract.INTENT_PUSH_CLIENT);
+                    final Bundle extras = intent.getBundleExtra(PushContract.INTENT_MESSAGE_EXTRAS);
+                    Logger.D(TAG, "Received PUSH message: " + extras);
                     RhodesApplication.runWhen(
                         RhodesApplication.AppState.AppStarted,
                         new RhodesApplication.StateHandler(true) {
                             @Override
                             public void run()
                             {
-                                handlePushMessage(extras);
+                                handlePushMessage(pushType, extras);
                             }
                         });
+                    break;
                 }
-                else if(intent.hasExtra(PushReceiver.INTENT_MESSAGE_JSON)){
-                    final String json = intent.getStringExtra(PushReceiver.INTENT_MESSAGE_JSON);
-                    final String url = intent.getStringExtra(PushReceiver.INTENT_MESSAGE_CALLBACK_URL);
-                    Log.i(TAG, "Received PUSH message: " + json);
-                    RhodesApplication.runWhen(
-                        RhodesApplication.AppState.AppStarted,
-                        new RhodesApplication.StateHandler(true) {
-                            @Override
-                            public void run()
-                            {
-                                handlePushMessage(url, json);
-                            }
-                        });
-                }
-                else if(intent.hasExtra(PushReceiver.INTENT_MESSAGE_ERROR)){
-                    final String error = intent.getStringExtra(PushReceiver.INTENT_MESSAGE_ERROR);
-                    final String url = intent.getStringExtra(PushReceiver.INTENT_MESSAGE_CALLBACK_URL);
-                    Log.w(TAG, "Received PUSH error: " + error);
-                    RhodesApplication.runWhen(
-                        RhodesApplication.AppState.AppStarted,
-                        new RhodesApplication.StateHandler(true) {
-                            @Override
-                            public void run()
-                            {
-                                doRequestEx(url, "error=" + error, null, false);
-                            }
-                        });
+                else if (intent.hasExtra(PushContract.INTENT_MESSAGE_JSON)){
+                    final String pushType = intent.getStringExtra(PushContract.INTENT_PUSH_CLIENT);
+                    final String json = intent.getStringExtra(PushContract.INTENT_MESSAGE_JSON);
+                    if (json != null) {
+                        Logger.D(TAG, "Received PUSH message (JSON): " + json);
+                        RhodesApplication.runWhen(
+                            RhodesApplication.AppState.AppStarted,
+                            new RhodesApplication.StateHandler(true) {
+                                @Override
+                                public void run()
+                                {
+                                    handlePushMessage(pushType, json);
+                                }
+                            });
+                    }
+                    break;
                 }
-				break;
-			default:
-				Log.w(TAG, "Unknown command type received from " + source + ": " + type);
-			}
+            default:
+                Logger.W(TAG, "Unknown command type received from " + source + ": " + type);
+            }
 		}
 	}
 	
@@ -1209,11 +1192,10 @@ public class RhodesService extends Service {
 
 	public native void setPushRegistrationId(String id);
 	private native String getPushRegistrationId(); 
-	
-	private native boolean callPushCallback(String data);
-    private native boolean callPushCallbackWithJsonBody(String url, String data);
-	
-	private void handlePushMessage(Bundle extras) {
+
+    private native boolean callPushCallback(String type, String json, String data);
+
+	private void handlePushMessage(String pushType, Bundle extras) {
 		Logger.D(TAG, "Handle PUSH message");
 		
 		if (extras == null) {
@@ -1256,7 +1238,7 @@ public class RhodesService extends Service {
         String data = builder.toString();
 
         Logger.D(TAG, "Received PUSH message: " + data);
-        if (callPushCallback(data)) {
+        if (callPushCallback(pushType, null, data)) {
             Logger.T(TAG, "Push message completely handled in callback");
             return;
         }
@@ -1272,7 +1254,7 @@ public class RhodesService extends Service {
         
         if (statusNotification) {
             Intent intent = new Intent(getContext(), RhodesActivity.class);
-            StatusNotification.simpleNotification(TAG, 0, getContext(), intent, "PUSH message from: " + from, alert);
+            StatusNotification.simpleNotification(TAG, 0, getContext(), intent, getString(R.string.app_name), alert);
         }
 
 		if (alert != null) {
@@ -1320,68 +1302,74 @@ public class RhodesService extends Service {
 		}
 	}
 
-    private void handlePushMessage(String url, String json) {
+    private void handlePushMessage(String type, String json) {
         Logger.T(TAG, "Handle push message");
         
-        Logger.I(TAG, "Push message: " + json);
+        Logger.D(TAG, "Push message JSON: " + json);
         
-        if (callPushCallbackWithJsonBody(url, json)) {
+        if (callPushCallback(type, json, null)) {
             Logger.T(TAG, "Push message completely handled in callback");
             return;
         }
-        JSONObject jsonObject;
-        try {
-            jsonObject = (JSONObject)new JSONTokener(json).nextValue();
-
-            final String alert = jsonObject.optString("alert");
-
-            boolean statusNotification = false;
-            if (Push.PUSH_NOTIFICATIONS.equals(NOTIFICATION_ALWAYS))
-                statusNotification = true;
-            else if (Push.PUSH_NOTIFICATIONS.equals(NOTIFICATION_BACKGROUND))
-                statusNotification = !RhodesApplication.canHandleNow(RhodesApplication.AppState.AppActivated);
-
-            if (statusNotification) {
-                Intent intent = new Intent(getContext(), RhodesActivity.class);
-                StatusNotification.simpleNotification(TAG, 0, getContext(), intent, "PUSH message", alert);
-            }
-
-            if (alert.length() > 0) {
-                Logger.D(TAG, "PUSH: Alert: " + alert);
-                Alert.showPopup(alert);
-            }
-            final String sound = jsonObject.optString("sound");
-            if (sound.length() > 0) {
-                Logger.D(TAG, "PUSH: Sound file name: " + sound);
-                Alert.playFile("/public/alerts/" + sound, null);
-            }
-            int vibrate = jsonObject.optInt("vibrate");
-            if (vibrate > 0) {
-                Logger.D(TAG, "PUSH: Vibrate: " + vibrate);
-                Logger.D(TAG, "Vibrate " + vibrate + " seconds");
-                Alert.vibrate(vibrate);
-            }
-            JSONArray syncSources = jsonObject.optJSONArray("do_sync");
-            if ((syncSources != null) && (syncSources.length() > 0)) {
-                Logger.D(TAG, "PUSH: Sync:");
-                boolean syncAll = false;
-                for (int i = 0; i < syncSources.length(); ++i) {
-                    String source = syncSources.optString(i);
-                    Logger.D(TAG, "source = " + source);
-                    if (source.equalsIgnoreCase("all")) {
-                        syncAll = true;
-                        break;
-                    } else {
-                        doSyncSource(source);
-                    }
+        if (json != null) {
+            JSONObject jsonObject;
+            try {
+                jsonObject = (JSONObject)new JSONTokener(json).nextValue();
+    
+                final String alert = jsonObject.optString("alert");
+    
+                boolean statusNotification = false;
+                if (Push.PUSH_NOTIFICATIONS.equals(NOTIFICATION_ALWAYS)) {
+                    Logger.D(TAG, "Show push notification always");
+                    statusNotification = true;
+                } else if (Push.PUSH_NOTIFICATIONS.equals(NOTIFICATION_BACKGROUND)) {
+                    Logger.D(TAG, "Show push notification from background");
+                    statusNotification = !RhodesApplication.canHandleNow(RhodesApplication.AppState.AppActivated);
                 }
-                
-                if (syncAll) {
-                    doSyncAllSources(true); 
+    
+                if (statusNotification) {
+                    Logger.D(TAG, "Showing status push notification");
+                    Intent intent = new Intent(getContext(), RhodesActivity.class);
+                    StatusNotification.simpleNotification(TAG, 0, getContext(), intent, getString(R.string.app_name), alert);
+                }
+    
+                if (alert.length() > 0) {
+                    Logger.D(TAG, "PUSH: Alert: " + alert);
+                    Alert.showPopup(alert);
+                }
+                final String sound = jsonObject.optString("sound");
+                if (sound.length() > 0) {
+                    Logger.D(TAG, "PUSH: Sound file name: " + sound);
+                    Alert.playFile("/public/alerts/" + sound, null);
+                }
+                int vibrate = jsonObject.optInt("vibrate");
+                if (vibrate > 0) {
+                    Logger.D(TAG, "PUSH: Vibrate: " + vibrate);
+                    Logger.D(TAG, "Vibrate " + vibrate + " seconds");
+                    Alert.vibrate(vibrate);
+                }
+                JSONArray syncSources = jsonObject.optJSONArray("do_sync");
+                if ((syncSources != null) && (syncSources.length() > 0)) {
+                    Logger.D(TAG, "PUSH: Sync:");
+                    boolean syncAll = false;
+                    for (int i = 0; i < syncSources.length(); ++i) {
+                        String source = syncSources.optString(i);
+                        Logger.D(TAG, "source = " + source);
+                        if (source.equalsIgnoreCase("all")) {
+                            syncAll = true;
+                            break;
+                        } else {
+                            doSyncSource(source);
+                        }
+                    }
+                    
+                    if (syncAll) {
+                        doSyncAllSources(true); 
+                    }
                 }
+            } catch (JSONException e) {
+                Logger.E(TAG, "Error parsing JSON payload in push message: " + e.getMessage());
             }
-        } catch (JSONException e) {
-            Logger.E(TAG, "Error parsing JSON payload in push message: " + e.getMessage());
         }
     }
 

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

@@ -256,4 +256,30 @@ public class WebView {
             Logger.E(TAG, e);
         }
     }
+
+    public static void saveCurrentPage(final String format, final String path, final int index) {
+        try {
+            PerformOnUiThread.exec(new Runnable() {
+                @Override public void run() {
+                    RhodesActivity.safeGetInstance().getMainView().saveCurrentPage(format, path, index);
+                }
+            });
+        }
+        catch (Exception e) {
+            Logger.E(TAG, e);
+        }
+    }
+    
+    public static String get_current_url(int tab_index) {
+        try {
+            MainView mainView = RhodesActivity.safeGetInstance().getMainView();
+            return mainView != null ? mainView.get_current_url(tab_index) : "";
+        }
+        catch (Exception e) {
+            Logger.E(TAG, e);
+        }
+
+        return "";
+    	
+    }
 }

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

@@ -36,7 +36,6 @@ import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.file.RhoFileApi;
 
-import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -48,7 +47,6 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.WindowManager;
@@ -118,7 +116,7 @@ public class PopupActivity extends BaseActivity {
 		
 		Bundle extras = getIntent().getExtras();
 		if (extras == null) {
-			Log.e(TAG, "No data passed to popup activity");
+			Logger.E(TAG, "No data passed to popup activity");
 			finish();
 			return;
 		}
@@ -159,7 +157,7 @@ public class PopupActivity extends BaseActivity {
 		
 		Vector<CustomButton> buttons = new Vector<CustomButton>();
 		if (buttonIds.size() != buttonTitles.size()) {
-			Log.e(TAG, "Corrupted data passed to popup activity");
+			Logger.E(TAG, "Corrupted data passed to popup activity");
 			finish();
 			return;
 		}
@@ -209,7 +207,7 @@ public class PopupActivity extends BaseActivity {
 		
 		LinearLayout main = new LinearLayout(ctx);
 		main.setOrientation(LinearLayout.VERTICAL);
-		main.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.FILL_PARENT));
+		main.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
 		main.setPadding(10, nTopPadding, 10, 10);
 		
 		LinearLayout top = new LinearLayout(ctx);

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

@@ -27,11 +27,8 @@
 package com.rhomobile.rhodes.camera;
 
 import java.io.File;
-import java.util.Iterator;
-import java.util.List;
 
 import android.content.Intent;
-import android.hardware.Camera.Size;
 import android.os.Build;
 
 import com.rhomobile.rhodes.Capabilities;
@@ -46,7 +43,7 @@ public class Camera {
 
 	private static final String TAG = "Camera";
 	
-	public static final String INTENT_EXTRA_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + "camera.";
+	public static final String INTENT_EXTRA_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + ".camera.";
 	
 	private static int mMainCamera_max_Width = 0;
 	private static int mMainCamera_max_Height = 0;
@@ -133,12 +130,16 @@ public class Camera {
 		}
 		
 		public void run() {
-			init();
-			RhodesActivity ra = RhodesActivity.getInstance();
-			Intent intent = new Intent(ra, klass);
-			intent.putExtra(INTENT_EXTRA_PREFIX + "callback", url);
-			intent.putExtra(INTENT_EXTRA_PREFIX + "settings", settings);
-			ra.startActivity(intent);
+		    try {
+		        init();
+		        RhodesActivity ra = RhodesActivity.safeGetInstance();
+		        Intent intent = new Intent(ra, klass);
+		        intent.putExtra(INTENT_EXTRA_PREFIX + "callback", url);
+		        intent.putExtra(INTENT_EXTRA_PREFIX + "settings", settings);
+		        ra.startActivity(intent);
+		    } catch (Exception e) {
+		        Logger.E(TAG, e);
+		    }
 		}
 	};
 	
@@ -146,7 +147,7 @@ public class Camera {
 		try {
 			Runnable runnable = Capabilities.CAMERA_ENABLED ? new Picture(url, ImageCapture.class, params_obj) :
 				new CameraDisabled(url);
-			PerformOnUiThread.exec(runnable, false);
+			PerformOnUiThread.exec(runnable);
 		}
 		catch (Exception e) {
 			reportFail("takePicture", e);
@@ -155,7 +156,7 @@ public class Camera {
 
 	public static void choosePicture(String url) {
 		try {
-			PerformOnUiThread.exec(new Picture(url, FileList.class, null), false);
+			PerformOnUiThread.exec(new Picture(url, FileList.class, null));
 		}
 		catch (Exception e) {
 			reportFail("choosePicture", e);
@@ -170,8 +171,25 @@ public class Camera {
 		execute_callback(callbackUrl, fp, "", fp.length() == 0, w, h, format);
 		
 	}
+
+	public static void doCancelCallback(String callbackUrl) {
+		execute_callback(callbackUrl, null, null, true, 0, 0, null);
+		
+	}
+	
+	public static void doErrorCallback(String callbackUrl, String errorMsg) {
+		execute_callback(callbackUrl, null, errorMsg, false, 0, 0, null);
+		
+	}
+	
 	
 	public static void execute_callback(String callbackUrl, String filePath, String error, boolean cancelled, int w, int h, String format) {
+		if (callbackUrl == null) {
+			return;
+		}
+		if (callbackUrl.length() <= 0) {
+			return;
+		}
 		StringBuffer body = new StringBuffer();
 		body.append("&rho_callback=1");
 		if (cancelled || ((error != null) && (error.length() > 0))) {
@@ -213,7 +231,7 @@ public class Camera {
 			}
 		}
 		catch (Exception e) {
-			Logger.E(TAG, e.getMessage());
+			Logger.E(TAG, e);
 		}
 
 		if (camera == null) {