rhodes 2.3.2 → 2.4.0.beta.1

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

@@ -1,6 +1,7 @@
 #include "rhodes/JNIRhodes.h"
 
 #include <common/rhoparams.h>
+#include "common/RhodesApp.h"
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "NativeBar"
@@ -114,3 +115,20 @@ RHO_GLOBAL void native_tabbar_set_tab_badge(int index,char *val) {
 	RAWLOG_INFO("Rho::NativeTabbar.set_tab_badge() unsupported on Android !");
 }
 
+RHO_GLOBAL int native_tabbar_get_current_tab() {
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_NATIVEBAR);
+    if (!cls) return 0;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "activeTab", "()I");
+    if (!mid) return 0;
+    return env->CallStaticIntMethod(cls, mid);
+}
+
+
+//private static native void onTabBarChangeTabCallback(String callback_url, String tab_index);
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_mainview_TabbedMainView_onTabBarChangeTabCallback
+  (JNIEnv *env, jclass, jstring callback, jstring body)
+{
+        rho_net_request_with_data(rho_http_normalizeurl(rho_cast<std::string>(callback).c_str()), rho_cast<std::string>(body).c_str());
+
+}

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

@@ -12,6 +12,7 @@
 
 #include <sys/stat.h>
 #include <sys/resource.h>
+#include <pwd.h>
 
 #include "rhodes/JNIRhodes.h"
 #include "rhodes/RhoClassFactory.h"
@@ -198,6 +199,14 @@ std::string const &rho_apk_path()
     return g_apk_path;
 }
 
+std::string rho_cur_path()
+{
+    char buf[PATH_MAX];
+    if (::getcwd(buf, sizeof(buf)) == NULL)
+        return "";
+    return buf;
+}
+
 jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/)
 {
     g_jvm = vm;
@@ -391,6 +400,60 @@ static bool set_capabilities(JNIEnv *env)
     return true;
 }
 
+static bool set_posix_environment(JNIEnv *env, jclass clsRE)
+{
+    // Set USER variable
+    struct passwd *pwd = ::getpwuid(::getuid());
+    if (!pwd)
+    {
+        env->ThrowNew(clsRE, "Can't find user name for current user");
+        return false;
+    }
+
+    size_t len = ::strlen(pwd->pw_name) + 16;
+    char *buf = (char *)::malloc(len + 1);
+    buf[len] = '\0';
+    ::snprintf(buf, len, "USER=%s", pwd->pw_name);
+    int e = ::putenv(buf);
+    ::free(buf);
+    if (e != 0)
+    {
+        env->ThrowNew(clsRE, "Can't set USER environment variable");
+        return false;
+    }
+
+    // Set HOME variable
+    std::string root_path = rho_root_path();
+    if (!root_path.empty() && root_path[root_path.size() - 1] == '/')
+        root_path.erase(root_path.size() - 1);
+    len = root_path.size() + 16;
+    buf = (char *)::malloc(len + 1);
+    buf[len] = '\0';
+    ::snprintf(buf, len, "HOME=%s", root_path.c_str());
+    e = ::putenv(buf);
+    ::free(buf);
+    if (e != 0)
+    {
+        env->ThrowNew(clsRE, "Can't set HOME environment variable");
+        return false;
+    }
+
+    // Set TMP variable
+    len = root_path.size() + 32;
+    buf = (char *)::malloc(len + 1);
+    buf[len] = '\0';
+    ::snprintf(buf, len, "TMP=%s/tmp", root_path.c_str());
+    e = ::putenv(buf);
+    ::free(buf);
+    if (e != 0)
+    {
+        env->ThrowNew(clsRE, "Can't set TMP environment variable");
+        return false;
+    }
+
+    return true;
+}
+
 static jobject g_classLoader = NULL;
 static jmethodID g_loadClass = NULL;
 
@@ -447,6 +510,14 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_createRhodesApp
         }
     }
 
+    if (!set_posix_environment(env, clsRE)) return;
+
+    if (::chdir(rho_root_path().c_str()) == -1)
+    {
+        env->ThrowNew(clsRE, "Can not chdir to HOME directory");
+        return;
+    }
+
     if (!set_capabilities(env)) return;
 
     // Init SQLite temp directory
@@ -492,6 +563,14 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doSyncSource
     rho_sync_doSyncSourceByName(source.c_str());
 }
 
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesApplication_setStartParameters
+  (JNIEnv *, jclass, jstring strUrl)
+{
+    std::string const &url = rho_cast<std::string>(strUrl);
+    RHODESAPP().setStartParameters(url.c_str());
+}
+
+
 RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getOptionsUrl
   (JNIEnv *env, jclass)
 {
@@ -557,7 +636,19 @@ RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_isOnStartPag
     return (jboolean)res;
 }
 
-JNIEXPORT jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_canStartApp
+
+RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_isEnableTitle
+  (JNIEnv *, jclass, jstring cmdLine, jstring sep)
+{
+    bool value = true;
+    const char* svalue = get_app_build_config_item("android_title");
+    if (svalue != NULL) {
+        value = svalue[0] != '0';
+    } 
+    return (jboolean)value;
+}
+
+RHO_GLOBAL jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_canStartApp
   (JNIEnv *, jclass, jstring cmdLine, jstring sep)
 {
     std::string const &strCmdLine = rho_cast<std::string>(cmdLine);

data/platform/android/Rhodes/res/values/styles.xml

@@ -0,0 +1,7 @@
+<resources>
+    <style name="PopupTheme" parent="android:Theme">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@null</item>
+        <item name="android:windowIsFloating">true</item>
+    </style>
+</resources>

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

@@ -10,6 +10,7 @@ import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.util.Log;
+import android.view.Display;
 
 public class BaseActivity extends Activity implements ServiceConnection {
 	
@@ -21,6 +22,27 @@ public class BaseActivity extends Activity implements ServiceConnection {
 	
 	protected RhodesService mRhodesService;
 	private boolean mBoundToService;
+	private int mRuntimeOrientation;
+
+	protected int getScreenOrientation() {
+	    Display display = getWindowManager().getDefaultDisplay();
+	    int orientation = display.getOrientation();
+
+	    if (orientation == Configuration.ORIENTATION_UNDEFINED)
+	    {
+	        orientation = getResources().getConfiguration().orientation;
+
+	        if (orientation == Configuration.ORIENTATION_UNDEFINED) {
+	            if (display.getWidth() == display.getHeight())
+	                orientation = Configuration.ORIENTATION_SQUARE;
+	            else if(display.getWidth() < display.getHeight())
+	                orientation = Configuration.ORIENTATION_PORTRAIT;
+	            else
+	                orientation = Configuration.ORIENTATION_LANDSCAPE;
+	        }
+	    }
+	    return orientation;
+	}
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -33,6 +55,8 @@ public class BaseActivity extends Activity implements ServiceConnection {
 			throw new RuntimeException("Can not start Rhodes service");
 		bindService(intent, this, Context.BIND_AUTO_CREATE);
 		mBoundToService = true;
+		
+		mRuntimeOrientation = this.getScreenOrientation();
 	}
 	
 	@Override
@@ -59,8 +83,17 @@ public class BaseActivity extends Activity implements ServiceConnection {
 	@Override
 	public void onConfigurationChanged(Configuration newConfig) {
 		Logger.T(TAG, "+++ onConfigurationChanged");
-		super.onConfigurationChanged(newConfig);
-		RhodesService.getInstance().rereadScreenProperties();
+		if (RhoConf.getBool("disable_screen_rotation"))
+		{
+			super.onConfigurationChanged(newConfig);
+			this.setRequestedOrientation(mRuntimeOrientation);
+		}
+		else
+		{
+			mRuntimeOrientation = this.getScreenOrientation();
+			super.onConfigurationChanged(newConfig);
+			RhodesService.getInstance().rereadScreenProperties();
+		}
 	}
 	
 	public RhodesApplication getRhodesApplication() {

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

@@ -1,17 +1,16 @@
 package com.rhomobile.rhodes;
 
 public class Capabilities {
-	
-	public static boolean AUDIO_ENABLED = true;
-	public static boolean BLUETOOTH_ENABLED = true;
-	public static boolean CALENDAR_ENABLED = true;
-	public static boolean CAMERA_ENABLED = true;
-	public static boolean GPS_ENABLED = true;
-	public static boolean NETWORK_STATE_ENABLED = true;
-	public static boolean PHONE_ENABLED = true;
-	public static boolean PIM_ENABLED = true;
-	public static boolean PUSH_ENABLED = true;
-	public static boolean RECORD_AUDIO_ENABLED = true;
-	public static boolean VIBRATE_ENABLED = true;
-	
+	  public static boolean AUDIO_ENABLED = true;
+	  public static boolean BLUETOOTH_ENABLED = true;
+	  public static boolean CALENDAR_ENABLED = true;
+	  public static boolean CAMERA_ENABLED = true;
+	  public static boolean GPS_ENABLED = true;
+	  public static boolean NETWORK_STATE_ENABLED = true;
+	  public static boolean PHONE_ENABLED = true;
+	  public static boolean PIM_ENABLED = true;
+	  public static boolean PUSH_ENABLED = true;
+	  public static boolean RECORD_AUDIO_ENABLED = true;
+	  public static boolean SDCARD_ENABLED = true;
+	  public static boolean VIBRATE_ENABLED = true;
 }

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

@@ -0,0 +1,130 @@
+package com.rhomobile.rhodes;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+
+import com.rhomobile.rhodes.file.RhoFileApi;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+import android.webkit.MimeTypeMap;
+
+
+public class LocalFileProvider extends ContentProvider
+{
+    private static final String TAG = LocalFileProvider.class.getSimpleName();
+    public static final String PATH_PREFIX = "/data/data/";
+    public static final String PROTOCOL_PREFIX = "content://";
+
+    public static boolean isCorrectAuthority(String authority)
+    {
+//        Logger.D(TAG, "Comparing authorities: "
+//                    + RhodesService.getInstance().getClass().getPackage().getName()
+//                    + " vs. " + authority);
+//        return authority.equals(RhodesService.getInstance().getClass().getPackage().getName());
+        return true;
+    }
+    
+    public static Uri uriFromLocalFile(File file)
+    {
+        String path = file.getAbsolutePath();
+        String url = PROTOCOL_PREFIX +
+            path.substring(PATH_PREFIX.length(), path.length());
+        return Uri.parse(url);
+    }
+    
+    public static void revokeUriPermissions(Context ctx)
+    {
+        String rootUri = PROTOCOL_PREFIX + '/' + ctx.getPackageName();
+
+        Logger.I(TAG, "Revoke URI permissions: " + rootUri);
+
+        ctx.revokeUriPermission(Uri.parse(rootUri), Intent.FLAG_GRANT_READ_URI_PERMISSION);
+    }
+    
+    public static File fileFromUri(Uri uri) throws IllegalArgumentException
+    {
+        String authority = uri.getAuthority();
+        if(isCorrectAuthority(authority))
+            return new File(PATH_PREFIX + authority + uri.getPath());
+        else throw new IllegalArgumentException("Unknown URI authority: " + authority);
+    }
+    
+    @Override
+    public ParcelFileDescriptor openFile(Uri uri, String mode)
+        throws FileNotFoundException, SecurityException
+    {
+        Logger.D(TAG, "Opening content: " + uri);
+        
+        if(mode.compareTo("r") != 0)
+        {
+            throw new SecurityException("Unacceptable openFile mode: " + mode);
+        }
+        
+        try {
+            File path = fileFromUri(uri);
+            
+            Logger.D(TAG, "Opening content file: " + path.getPath());
+            
+            ParcelFileDescriptor fd = RhoFileApi.openParcelFd(path.getPath());
+            if(fd == null)
+                throw new IllegalArgumentException();
+            
+            return fd;
+        } catch(IllegalArgumentException error)
+        {
+            FileNotFoundException fileError = new FileNotFoundException("Cannot assign file for URI: " + uri.toString());
+            fileError.initCause(error);
+            throw fileError;
+        }
+    }
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public int delete(Uri uri, String s, String[] as) {
+        throw new UnsupportedOperationException(
+                "Delete operation is not supported by this provider");
+    }
+
+    @Override
+    public String getType(Uri uri) {
+
+        Logger.D(TAG, "Resolving content type - " + uri);
+
+        String type = "";
+        String ext = MimeTypeMap.getFileExtensionFromUrl(uri.getPath());
+        if (ext == null || ext.length() == 0)
+            throw new IllegalArgumentException("Unknown URI " + uri);
+
+        type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext);
+        return type;
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues contentvalues) {
+        throw new UnsupportedOperationException(
+                "Insert operation is not supported by this provider");
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] as, String s, String[] as1, String s1) {
+        throw new UnsupportedOperationException(
+                "Query operation is not supported by this provider");
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues contentvalues, String s, String[] as) {
+        throw new UnsupportedOperationException(
+                "Update operation is not supported by this provider");
+    }
+
+}

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

@@ -143,4 +143,10 @@ public class NativeBar {
 	public static boolean isStarted() {
 		return started;
 	}
+	
+	public static int activeTab() {
+		RhodesService r = RhodesService.getInstance();
+		MainView mainView = r.getMainView();
+		return mainView.activeTab();
+	}
 }

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

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 import android.util.Log;
 
 public class PushReceiver extends BroadcastReceiver {
@@ -35,6 +36,7 @@ public class PushReceiver extends BroadcastReceiver {
 			Log.d(TAG, "Unregistered: " + unregistered);
 		}
 		else if (id != null) {
+			Log.d(TAG, "Registered: " + id);
 			Intent serviceIntent = new Intent(context, RhodesService.class);
 			serviceIntent.putExtra(RhodesService.INTENT_SOURCE, INTENT_SOURCE);
 			serviceIntent.putExtra(INTENT_TYPE, INTENT_TYPE_REGISTRATION_ID);
@@ -46,10 +48,12 @@ public class PushReceiver extends BroadcastReceiver {
 	}
 	
 	private void handleMessage(Context context, Intent intent) {
+		Bundle extras = intent.getExtras();
+		Log.d(TAG, "Message: " + extras);
 		Intent serviceIntent = new Intent(context, RhodesService.class);
 		serviceIntent.putExtra(RhodesService.INTENT_SOURCE, INTENT_SOURCE);
 		serviceIntent.putExtra(INTENT_TYPE, INTENT_TYPE_MESSAGE);
-		serviceIntent.putExtra(INTENT_EXTRAS, intent.getExtras());
+		serviceIntent.putExtra(INTENT_EXTRAS, extras);
 		context.startService(serviceIntent);
 	}
 	

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

@@ -22,8 +22,10 @@ public class PushService {
 	}
 	
 	public static void register() throws IllegalAccessException {
-		if (!isOsVersionEnough())
+		if (!isOsVersionEnough()) {
+			Logger.E(TAG, "OS version is not enough for C2DM");
 			return;
+		}
 		
 		checkCapabilities();
 		
@@ -37,8 +39,10 @@ public class PushService {
 	}
 	
 	public static void unregister() throws IllegalAccessException {
-		if (!isOsVersionEnough())
+		if (!isOsVersionEnough()) {
+			Logger.E(TAG, "OS version is not enough for C2DM");
 			return;
+		}
 		
 		checkCapabilities();