rhodes 6.2.0 → 7.1.17

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

@@ -1031,7 +1031,11 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_mapview_MapView_deletemapviewp
 }
 
 void mapengine_delete_mapview_in_ui_thread(void* p) {
+#ifdef __aarch64__
+    size_t pl = (size_t)p;
+#else
 	int pl = (int)p;
+#endif
 
 	JNIEnv *env = jnienv();
 	jclass cls = rho_find_class(env, "com/rhomobile/rhodes/mapview/MapView");//env->FindClass("com/rhomobile/rhodes/mapview/MapView");//rho_find_class(env, "com/rhomobile/rhodes/mapview/MapView");

data/platform/android/Rhodes/res/xml/network_security_config.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="false">localhost</domain>
+	<domain includeSubdomains="false">127.0.0.1</domain>
+    </domain-config>
+</network-security-config>

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

@@ -220,6 +220,15 @@ public class BaseActivity extends Activity implements ServiceConnection {
                 setRequestedOrientation(getScreenProperties().getOrientation());
             }
         }
+
+        if (RhoConf.getInt("WebView.replaceContentBySplashWhenSnapshotBySystem") == 1) {
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
+        }
+        else
+        {
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        }
+
     }
 
 	@Override

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

@@ -50,7 +50,7 @@ public class LocalFileProvider extends ContentProvider
     private static final String TAG = LocalFileProvider.class.getSimpleName();
     private static String fullPathPrefix;
     private static String contentAuthority;
-  
+
     private static String getPathPrefix() {
         if (fullPathPrefix == null) {
             fullPathPrefix = ContextFactory.getAppContext().getApplicationInfo().dataDir;

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

@@ -0,0 +1,8 @@
+package com.rhomobile.rhodes;
+
+public abstract class RhoMain
+{
+    public void onAppStart()
+    {
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.rhomobile.rhodes;
+
+public class RhoRubyArrayObjects extends IRhoRubyObject {
+
+    public RhoRubyArrayObjects(IRhoRubyObject[] arr) {
+        super(RhoRubyTypes.Array, arr);
+    }
+
+    public RhoRubyArrayObjects(int c) {
+        super(RhoRubyTypes.Array, new IRhoRubyObject[c]);
+    }
+
+    public int getCount() {
+        return ((IRhoRubyObject[]) getValue()).length;
+    }
+
+    public IRhoRubyObject getItem(int index)
+    {
+        return ((IRhoRubyObject[])getValue())[index];
+    }
+
+    public RhoRubyObject getRhoObjectItem(int index)
+    {
+        return ((RhoRubyObject[])getValue())[index];
+    }
+
+    public  void setItem(int index, IRhoRubyObject obj)
+    {
+        ((IRhoRubyObject[])getValue())[index] = obj;
+    }
+
+}
+

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

@@ -0,0 +1,20 @@
+package com.rhomobile.rhodes;
+
+public class RhoRubyClassObject extends IRhoRubyObject {
+    private String klass_name;
+    public RhoRubyClassObject(String name) {
+        super(RhoRubyTypes.Class, null);
+        klass_name = name;
+
+        if (!NativeMakeRubyClassObject(klass_name))
+            throw new RuntimeException("Could not create class from Ruby!");
+    }
+
+    public IRhoRubyObject ExecuteRubyObjectMethod(String name_function, RhoRubyArrayObjects parameters)
+    {
+        return NativeExecuteRubyObjectMethod(klass_name, name_function, parameters);
+    }
+
+    native boolean NativeMakeRubyClassObject(String name);
+    native IRhoRubyObject NativeExecuteRubyObjectMethod(String class_name, String name_function, RhoRubyArrayObjects parameters);
+}

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

@@ -0,0 +1,115 @@
+package com.rhomobile.rhodes;
+
+abstract class IRhoRubyObject
+{
+    private RhoRubyTypes type;
+    private Object value;
+
+    private IRhoRubyObject()
+    {
+        type = RhoRubyTypes.None;
+        value = null;
+    }
+
+    IRhoRubyObject(RhoRubyTypes t, Object v)
+    {
+        type = t;
+        value = v;
+    }
+
+    IRhoRubyObject(int t, Object v)
+    {
+        switch (t) {
+            case 0: type = RhoRubyTypes.None; break;
+            case 1: type = RhoRubyTypes.RubyNil; break;
+            case 2: type = RhoRubyTypes.Class; break;
+            case 3: type = RhoRubyTypes.Object; break;
+            case 4: type = RhoRubyTypes.Boolean; break;
+            case 5: type = RhoRubyTypes.Integer; break;
+            case 6: type = RhoRubyTypes.Float; break;
+            case 7: type = RhoRubyTypes.String; break;
+            case 8: type = RhoRubyTypes.Array; break;
+            case 9: type = RhoRubyTypes.Hash; break;
+            default: throw new RuntimeException("Unknown type!");
+        }
+        value = v;
+    }
+
+    private void setVlaue(RhoRubyTypes t, Object v)
+    {
+        type = t;
+        value = v;
+    }
+
+    public Object getValue() { return value; }
+    public int getType()
+    {
+        switch (type) {
+            case None: return 0;
+            case RubyNil: return 1;
+            case Class: return 2;
+            case Object: return 3;
+            case Boolean: return 4;
+            case Integer: return 5;
+            case Float: return 6;
+            case String: return 7;
+            case Array: return 8;
+            case Hash: return 9;
+            default: throw new RuntimeException("Unknown type!");
+        }
+
+    }
+}
+
+
+public class RhoRubyObject extends IRhoRubyObject {
+
+    public RhoRubyObject(RhoRubyTypes t, Object v)
+    {
+        super(t, v);
+        if(t == RhoRubyTypes.Array) throw new IllegalArgumentException("Cannot directly create an Array. Use RhoRubyArraysObject");
+        if(t == RhoRubyTypes.Hash) throw new IllegalArgumentException("Cannot directly create an Hash. Use RhoRubyHashObject");
+        //if(t == RhoRubyTypes.Class) throw new IllegalArgumentException("Cannot directly create an Class. Use RhoRubyClassObject");
+    }
+
+    public RhoRubyObject(int t, Object v)
+    {
+        super(t, v);
+        if(t == 8) throw new IllegalArgumentException("Cannot directly create an Array. Use RhoArrayObjects");
+        if(t == 9) throw new IllegalArgumentException("Cannot directly create an Hash. Use RhoRubyHashObject");
+        //if(t == 2) throw new IllegalArgumentException("Cannot directly create an Class. Use RhoRubyClassObject");
+    }
+
+    public int getIntValue() throws ClassCastException
+    {
+        if(super.getValue() instanceof Integer)
+            return (Integer)super.getValue();
+        else
+            throw new ClassCastException("This value is not integer");
+    }
+
+    public String getStringValue() throws ClassCastException
+    {
+        if(super.getValue() instanceof String)
+            return (String)super.getValue();
+        else
+            throw new ClassCastException("This value is not string");
+    }
+
+    public boolean getBooleanValue() throws ClassCastException
+    {
+        if(super.getValue() instanceof Boolean)
+            return (Boolean) super.getValue();
+        else
+            throw new ClassCastException("This value is not boolean");
+    }
+
+    public float getFloatValue() throws ClassCastException
+    {
+        if(super.getValue() instanceof Float)
+            return (Float) super.getValue();
+        else
+            throw new ClassCastException("This value is not float");
+    }
+
+}

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

@@ -0,0 +1,52 @@
+package com.rhomobile.rhodes;
+
+import java.util.HashMap;
+
+public class RhoRubySingleton
+{
+
+    public interface RhoRunnable {
+        public void rhoRun();
+    }
+
+
+    private static RhoRubySingleton singleton = null;
+
+    private static HashMap<Integer, RhoRunnable> ourRunnablesMap = new HashMap<Integer, RhoRunnable>();
+    private static int ourRunnableIDCounter = 1;
+
+
+    public static RhoRubySingleton instance()
+    {
+        if(singleton == null) {
+            singleton = new RhoRubySingleton();
+        }
+        return singleton;
+    }
+
+    public void executeInRubyThread(RhoRunnable command)
+    {
+            int id = 0;
+            synchronized (ourRunnablesMap) {
+                id = ourRunnableIDCounter++;
+                ourRunnablesMap.put(new Integer(id), command);
+            }
+            executeInRubyThreadNative(id);
+    }
+
+    private static void executeRunnableByID(int id) {
+        RhoRunnable command = null;
+        synchronized (ourRunnablesMap) {
+            command = ourRunnablesMap.get(new Integer(id));
+            ourRunnablesMap.remove(new Integer(id));
+        }
+        if (command != null) {
+            command.rhoRun();
+        }
+    }
+
+    public native String executeRubyMethodWithJSON(String full_class_name, String method_name, String parameters);
+    public native String getRubyServerURL();
+
+    private native void executeInRubyThreadNative(int id);
+}

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

@@ -0,0 +1,15 @@
+package com.rhomobile.rhodes;
+
+public enum RhoRubyTypes
+{
+    None,
+    RubyNil,
+    Class,
+    Object,
+    Boolean,
+    Integer,
+    Float,
+    String,
+    Array,
+    Hash
+}

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

@@ -83,6 +83,7 @@ import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.Notification;
+import android.app.Notification.Builder;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -184,6 +185,8 @@ public class RhodesService extends Service {
 	public static String               m_Text                      = "";
 	private static String				ExitPasswordEnabled         = "";
 	private static String				ExitPasswordValue           = "";
+
+	private static RhoMain rhoMain = null;
 	
 	public static  void setExitPasswordEnabled(String exitPasswordEnabled)
 	{ 
@@ -199,6 +202,8 @@ public class RhodesService extends Service {
 	{
 		return ExitPasswordEnabled;
 	}
+
+	public static void setRhoMain(RhoMain main) { rhoMain = main; }
 	
 	public static  String getExitPasswordValue()
 	{
@@ -369,7 +374,7 @@ public class RhodesService extends Service {
         RhodesApplication.create();
 
         // Increase WebView rendering priority
-        WebView w = new WebView(context);
+		WebView w = new WebView(context);
         WebSettings webSettings = w.getSettings();
         webSettings.setRenderPriority(WebSettings.RenderPriority.HIGH);
 
@@ -405,7 +410,9 @@ public class RhodesService extends Service {
 
 	public static void handleAppStarted()
 	{
-	    RhodesApplication.handleAppStarted();
+		RhodesApplication.handleAppStarted();
+		if(rhoMain != null)		
+		   rhoMain.onAppStart();
 	}
 	
 	private void initForegroundServiceApi() {
@@ -1093,10 +1100,6 @@ public class RhodesService extends Service {
 	private void updateDownloadNotification(String url, int totalBytes, int currentBytes) {
 		Context context = RhodesActivity.getContext();
 		
-		Notification n = new Notification();
-		n.icon = android.R.drawable.stat_sys_download;
-		n.flags |= Notification.FLAG_ONGOING_EVENT;
-		
 		RemoteViews expandedView = new RemoteViews(context.getPackageName(),
 				R.layout.status_bar_ongoing_event_progress_bar);
 		
@@ -1121,14 +1124,19 @@ public class RhodesService extends Service {
 				totalBytes < 0 ? 100 : totalBytes,
 				currentBytes,
 				totalBytes < 0);
-		n.contentView = expandedView;
+
+		Builder builder = AndroidFunctionalityManager.getAndroidFunctionality().getNotificationBuilder(context,String.valueOf(DOWNLOAD_PACKAGE_ID),url);
 		
+		builder.setSmallIcon(android.R.drawable.stat_sys_download);
+		builder.setDefaults(Notification.FLAG_ONGOING_EVENT);		
+		//min API = 24
+		//builder.setCustomContentView(expandedView);
 		Intent intent = new Intent(ACTION_ASK_CANCEL_DOWNLOAD);
-		n.contentIntent = PendingIntent.getBroadcast(context, 0, intent, 0);
+		builder.setContentIntent(PendingIntent.getBroadcast(context, 0, intent, 0));
 		intent = new Intent(ACTION_CANCEL_DOWNLOAD);
-		n.deleteIntent = PendingIntent.getBroadcast(context, 0, intent, 0);
+		builder.setDeleteIntent(PendingIntent.getBroadcast(context, 0, intent, 0));
 
-		mNM.notify(DOWNLOAD_PACKAGE_ID, n);
+		mNM.notify(DOWNLOAD_PACKAGE_ID, builder.build() );
 	}
 	
 	private File downloadPackage(String url) throws IOException {
@@ -1216,9 +1224,9 @@ public class RhodesService extends Service {
 				break;
 			}
 			*/
-			
-			tmpFile = ctx.getFileStreamPath(UUID.randomUUID().toString() + ".apk");
-			os = ctx.openFileOutput(tmpFile.getName(), Context.MODE_WORLD_READABLE);
+		
+			tmpFile = new File( Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), UUID.randomUUID().toString() + ".apk" );
+			os = ctx.openFileOutput(tmpFile.getName(), Context.MODE_PRIVATE);
 			
 			Logger.D(TAG, "Download " + url + " to " + tmpFile.getAbsolutePath() + "...");
 			
@@ -1267,6 +1275,10 @@ public class RhodesService extends Service {
 			return tmpFile;
 		}
 		catch (IOException e) {
+
+			Logger.E(TAG, e.toString());
+			e.printStackTrace();
+
 			if (tmpFile != null)
 				tmpFile.delete();
 			throw e;

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

@@ -0,0 +1,57 @@
+package com.rhomobile.rhodes;
+
+import com.rhomobile.rhodes.extmanager.IRhoWebView;
+import com.rhomobile.rhodes.mainview.MainView;
+import com.rhomobile.rhodes.mainview.SimpleMainView;
+import android.webkit.WebView;
+import java.security.SecureRandom;
+import java.security.spec.AlgorithmParameterSpec;
+import java.util.Formatter;
+
+public class SecurityTokenGenerator
+{
+    byte[] token;
+    String currentAgent;
+    SecureRandom random;
+    String nameParam = "RHO-SECURE-TOKEN";
+    static SecurityTokenGenerator instance = null;
+
+    public SecurityTokenGenerator()
+    {
+        currentAgent = ((WebView) RhodesActivity.safeGetInstance().getMainView().getWebView(0).getView()).getSettings().getUserAgentString();
+        token = new byte[32];
+        random = new SecureRandom();
+        random.nextBytes(token);
+    }
+
+    public static SecurityTokenGenerator getInstance()
+    {
+        if (instance == null) instance = new SecurityTokenGenerator();
+        return instance;
+    }
+
+    public String getTokenString()
+    {
+        Formatter formatter = new Formatter();
+        for (byte b : token) {
+            formatter.format("%02x", b);
+        }
+        return formatter.toString();
+    }
+
+    public String getSecureAgent()
+    {
+        return currentAgent + " " + nameParam + "=" + getTokenString();
+    }
+
+    public String getCurrentUserAgent()
+    {
+        return currentAgent;
+    }
+
+    public byte[] getToken()
+    {
+        return token;
+    }
+
+}