rhodes 3.3.3.beta.4 → 3.3.3

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality05.java

@@ -29,47 +29,60 @@ package com.rhomobile.rhodes.osfunctionality;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.Context;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
 
 
 //Android 2.0
 class AndroidFunctionality05 extends AndroidFunctionality04 implements AndroidFunctionality {
 
-	 private Account AccessOwnerInfo_getAccount(AccountManager accountManager) {
-		    Account[] accounts = accountManager.getAccountsByType("com.google");
-	    Account account;
-	    if (accounts.length > 0) {
-	      account = accounts[0];
-	    } else {
-	      account = null;
-	    }
-	    return account;
-	  }
-	
-	  public String AccessOwnerInfo_getEmail(Context context) {
-	    AccountManager accountManager = AccountManager.get(context);
-	    Account account = AccessOwnerInfo_getAccount(accountManager);
-	
-	    if (account == null) {
-	      return null;
-	    } else {
-	      return account.name;
-	    }
-	  }
-	
-	  public String AccessOwnerInfo_getUsername(Context context) {
-	    // String email;
-		AccountManager manager = AccountManager.get(context);
-		Account account = AccessOwnerInfo_getAccount(manager);
-		if (account == null) {
-		  return "";
-		} else {
-		  String email = account.name;
-		  String[] parts = email.split("@");
-		  if (parts.length > 0 && parts[0] != null)
-		    return parts[0];
-		  else
-		    return "";
-	    }
-	  }	
-	
+    private Account AccessOwnerInfo_getAccount(AccountManager accountManager) {
+        Account[] accounts = accountManager.getAccountsByType("com.google");
+        Account account;
+        if (accounts.length > 0) {
+            account = accounts[0];
+        } else {
+            account = null;
+        }
+        return account;
+    }
+
+    public String AccessOwnerInfo_getEmail(Context context) {
+        AccountManager accountManager = AccountManager.get(context);
+        Account account = AccessOwnerInfo_getAccount(accountManager);
+
+        if (account == null) {
+            return null;
+        } else {
+            return account.name;
+        }
+    }
+
+    public String AccessOwnerInfo_getUsername(Context context) {
+        // String email;
+        AccountManager manager = AccountManager.get(context);
+        Account account = AccessOwnerInfo_getAccount(manager);
+        if (account == null) {
+            return "";
+        } else {
+            String email = account.name;
+            String[] parts = email.split("@");
+            if (parts.length > 0 && parts[0] != null)
+                return parts[0];
+            else
+                return "";
+        }
+    }
+
+    @Override
+    public void applyWebSettings(WebView view) {
+        super.applyWebSettings(view);
+        WebSettings settings = view.getSettings();
+        settings.setDatabaseEnabled(true);
+
+        Context context = view.getContext();
+        String databasePath = context.getDir("database", Context.MODE_PRIVATE).getPath();
+        settings.setDatabasePath(databasePath);
+    }
+
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality07.java

@@ -26,9 +26,17 @@
 
 package com.rhomobile.rhodes.osfunctionality;
 
+import android.webkit.WebSettings;
+import android.webkit.WebView;
 
 //Android 2.1
 class AndroidFunctionality07 extends AndroidFunctionality06 implements AndroidFunctionality {
 
-	
+    @Override
+    public void applyWebSettings(WebView view) {
+        super.applyWebSettings(view);
+        WebSettings settings = view.getSettings();
+        settings.setAppCacheEnabled(true);
+        settings.setDomStorageEnabled(true);
+    }
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality08.java

@@ -1,44 +1,61 @@
 /*------------------------------------------------------------------------
-* (The MIT License)
-* 
-* Copyright (c) 2008-2011 Rhomobile, Inc.
-* 
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-* 
-* The above copyright notice and this permission notice shall be included in
-* all copies or substantial portions of the Software.
-* 
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-* 
-* http://rhomobile.com
-*------------------------------------------------------------------------*/
+ * (The MIT License)
+ * 
+ * Copyright (c) 2008-2011 Rhomobile, Inc.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ * 
+ * http://rhomobile.com
+ *------------------------------------------------------------------------*/
 
 package com.rhomobile.rhodes.osfunctionality;
 
+import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.RhoConf;
 import com.rhomobile.rhodes.RhodesService;
 
 import android.content.Context;
 import android.view.Display;
 import android.view.WindowManager;
-
+import android.webkit.WebSettings;
 
 //Android 2.2
-class AndroidFunctionality08 extends AndroidFunctionality07 implements AndroidFunctionality {
+class AndroidFunctionality08 extends AndroidFunctionality07 implements
+        AndroidFunctionality {
+
+    public int getDeviceRotation() {
+        Display display = ((WindowManager) RhodesService.getContext()
+                .getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+        int rotation = display.getRotation();
+        return rotation;
+    }
+
+    @Override
+    protected void setWebPlugins(WebSettings settings) {
+        if(RhoConf.getBool("enable_web_plugins")) {
+            settings.setPluginState(WebSettings.PluginState.ON);
+            Logger.I(TAG, "Set web plugins state 'ON'");
+        }
+        else {
+            settings.setPluginState(WebSettings.PluginState.OFF);
+            Logger.I(TAG, "Set web plugins state 'OFF'");
+        }
+    }
 
-	public int getDeviceRotation() {
-		Display display = ((WindowManager) RhodesService.getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
-		int rotation = display.getRotation();
-		return rotation;
-	}
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionalityManager.java

@@ -26,45 +26,44 @@
 
 package com.rhomobile.rhodes.osfunctionality;
 
+import com.rhomobile.rhodes.Logger;
+
 import android.os.Build;
 
 
 public class AndroidFunctionalityManager {
+    
+    private static final String TAG = AndroidFunctionalityManager.class.getSimpleName();
 
-private static AndroidFunctionality ourFunctionality = null;
+    private static AndroidFunctionality ourFunctionality = null;
 	
 	public static AndroidFunctionality getAndroidFunctionality() {
 		if (ourFunctionality == null) {
-			int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
-			if (sdkVersion >= 10) {
+			int sdkVersion = Build.VERSION.SDK_INT;
+			if (sdkVersion >= Build.VERSION_CODES.GINGERBREAD_MR1) { // 2.3.3 and above - 10
 				ourFunctionality = new AndroidFunctionality10();
 			}
-			else if (sdkVersion >= 9) {
+			else if (sdkVersion == Build.VERSION_CODES.GINGERBREAD) { // 2.3, 2.3.1, 2.3.2 - 9
 				ourFunctionality = new AndroidFunctionality09();
 			}
-			else if (sdkVersion >= 8) {
+			else if (sdkVersion == Build.VERSION_CODES.FROYO) { // 2.2 - 8
 				ourFunctionality = new AndroidFunctionality08();
 			}
-			else if (sdkVersion >= 7) {
+			else if (sdkVersion == Build.VERSION_CODES.ECLAIR_MR1) { // 2.1 - 7
 				ourFunctionality = new AndroidFunctionality07();
 			}
-			else if (sdkVersion >= 6) {
+			else if (sdkVersion == Build.VERSION_CODES.ECLAIR_0_1) { // 2.0.1 - 6
 				ourFunctionality = new AndroidFunctionality06();
 			}
-			else if (sdkVersion >= 5) {
+			else if (sdkVersion == Build.VERSION_CODES.ECLAIR) { //2.0 - 5
 				ourFunctionality = new AndroidFunctionality05();
 			}
-			else if (sdkVersion >= 4) {
+			else if (sdkVersion == Build.VERSION_CODES.DONUT) { // 1.6 - 4
 				ourFunctionality = new AndroidFunctionality04();
 			}
-			else if (sdkVersion >= 3) {
-				ourFunctionality = new AndroidFunctionality03();
-			}
-			else if (sdkVersion >= 2) {
-				ourFunctionality = new AndroidFunctionality02();
-			}
 			else {
-				ourFunctionality = new AndroidFunctionality01();
+			    Logger.E(TAG, "Unsupported Android version: " + sdkVersion);
+			    throw new RuntimeException("Unsupported Android version: " + sdkVersion);
 			}
 		}
 		return ourFunctionality;

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

@@ -30,7 +30,9 @@ import java.io.File;
 import java.util.Map;
 
 import android.content.Intent;
+import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.webkit.WebView;
 import android.widget.AbsoluteLayout;
 
@@ -156,12 +158,23 @@ public class Signature extends AbstractRhoExtension implements IRhoExtension {
 			public void run() {
 				reportMsg(" $$$ Start make of Signature View");
 				
-				ViewGroup wv = (ViewGroup)extManager.getWebView();
-				if ((wv != null) && (ourInlineSignatureView != null)) {
-					wv.removeView(ourInlineSignatureView);
-					ourInlineSignatureView = null;
+				Object webView_obj = extManager.getWebView();
+				if (webView_obj instanceof ViewGroup) {
+					ViewGroup wv = (ViewGroup)webView_obj;
+					if ((wv != null) && (ourInlineSignatureView != null)) {
+						wv.removeView(ourInlineSignatureView);
+						ourInlineSignatureView = null;
+					}
+				}
+				else {
+					ViewGroup wv = (ViewGroup)(((View)webView_obj).getParent());
+					if ((wv != null) && (ourInlineSignatureView != null)) {
+						wv.removeView(ourInlineSignatureView);
+						ourInlineSignatureView = null;
+					}
 				}
 				
+				
 				ourInlineSignatureView = new SignatureView(ContextFactory.getUiContext(), null);
 				
 				{
@@ -179,13 +192,26 @@ public class Signature extends AbstractRhoExtension implements IRhoExtension {
 																getSharedInstance().mProperties.top));
 					
 				}
-				
-				wv.addView(ourInlineSignatureView);
-				wv.bringChildToFront(ourInlineSignatureView);	
-				ourInlineSignatureView.requestFocus();
-				ourInlineSignatureView.bringToFront();
-				ourInlineSignatureView.invalidate();
-				
+				if (webView_obj instanceof ViewGroup) {
+					ViewGroup wv = (ViewGroup)webView_obj;
+					if ((wv != null) && (ourInlineSignatureView != null)) {
+						wv.addView(ourInlineSignatureView);
+						wv.bringChildToFront(ourInlineSignatureView);	
+						ourInlineSignatureView.requestFocus();
+						ourInlineSignatureView.bringToFront();
+						ourInlineSignatureView.invalidate();
+					}
+				}
+				else {
+					ViewGroup wv = (ViewGroup)(((View)webView_obj).getParent());
+					if ((wv != null) && (ourInlineSignatureView != null)) {
+						wv.addView(ourInlineSignatureView);
+						wv.bringChildToFront(ourInlineSignatureView);	
+						ourInlineSignatureView.requestFocus();
+						ourInlineSignatureView.bringToFront();
+						ourInlineSignatureView.invalidate();
+					}
+				}
 				//wv.invalidate();
 				
 				reportMsg(" $$$ Finish make of Signature View");
@@ -224,10 +250,21 @@ public class Signature extends AbstractRhoExtension implements IRhoExtension {
 		PerformOnUiThread.exec( new Runnable () {
 			public void run() {
 				if (ourInlineSignatureView != null) {
-					ViewGroup wv = (ViewGroup)extManager.getWebView();
-					if (wv != null) {
-						wv.removeView(ourInlineSignatureView);
-						ourInlineSignatureView = null;
+					
+					Object webView_obj = extManager.getWebView();
+					if (webView_obj instanceof ViewGroup) {
+						ViewGroup wv = (ViewGroup)webView_obj;
+						if ((wv != null) && (ourInlineSignatureView != null)) {
+							wv.removeView(ourInlineSignatureView);
+							ourInlineSignatureView = null;
+						}
+					}
+					else {
+						ViewGroup wv = (ViewGroup)(((View)webView_obj).getParent());
+						if ((wv != null) && (ourInlineSignatureView != null)) {
+							wv.removeView(ourInlineSignatureView);
+							ourInlineSignatureView = null;
+						}
 					}
 				}
 			}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/LocalFileHandler.java

@@ -28,6 +28,7 @@ package com.rhomobile.rhodes.uri;
 
 import java.io.File;
 import java.net.URISyntaxException;
+import java.util.regex.Pattern;
 
 import com.rhomobile.rhodes.LocalFileProvider;
 import com.rhomobile.rhodes.Logger;
@@ -40,18 +41,35 @@ import android.webkit.URLUtil;
 public class LocalFileHandler implements UriHandler
 {
     private static final String TAG = "LocalFileHandler";
+    private static final Pattern mHtmlPattern = Pattern.compile(".*\\.(html|htm)$");
+    private static final Pattern mImagePattern = Pattern.compile(".*\\.(jpg|jpeg|png|gif|svg)$");
     private Context ctx;
     
     public LocalFileHandler(Context c) {
         ctx = c;
     }
 
+    private static boolean isHtmlUrl(String url) {
+        Logger.T(TAG, "Looking for html extension: " + url);
+        return mHtmlPattern.matcher(url).matches();
+    }
+
+    private static boolean isImageUrl(String url) {
+        Logger.T(TAG, "Looking for image extension: " + url);
+        return mImagePattern.matcher(url).matches();
+    }
+
     public boolean handle(String url) throws URISyntaxException {
 
-        if(!URLUtil.isFileUrl(url))
+        if (!URLUtil.isFileUrl(url))
+            return false;
+        
+        String noAnchorUrl = URLUtil.stripAnchor(url);
+        if (isHtmlUrl(noAnchorUrl) || isImageUrl(noAnchorUrl)) {
             return false;
+        }
 
-        Logger.D(TAG, "This is 'file' URI, handle it: " + url);
+        Logger.D(TAG, "Handle URI externally: " + url);
 
         int intentFlags = 0;
         String path = Uri.parse(url).getPath();

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

@@ -26,6 +26,7 @@
 
 package com.rhomobile.rhodes.webview;
 
+import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesActivity;
 
 import android.app.Activity;

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

@@ -1,23 +1,25 @@
 package com.rhomobile.rhodes.webview;
 
-import java.lang.reflect.Constructor;
-
-import com.rhomobile.rhodes.RhodesActivity;
+import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.osfunctionality.AndroidFunctionalityManager;
+import com.rhomobile.rhodes.util.PerformOnUiThread;
 
 import android.app.Activity;
 import android.os.Build;
 import android.view.View;
+import android.view.ViewGroup;
 import android.webkit.WebChromeClient;
 import android.webkit.WebViewClient;
 
 public class GoogleWebView implements IRhoWebView {
+    private static final String TAG = GoogleWebView.class.getSimpleName(); 
 
-    private static WebChromeClient mChromeClient;
+    private WebChromeClient mChromeClient;
     private static WebViewClient mWebViewClient;
-    private static RhoWebSettings mWebSettings;
     private static Boolean mInitialized = false;
 
-    private android.webkit.WebView mWebView; 
+    private android.webkit.WebView mWebView;
+    private ViewGroup mContainerView;
 
     public GoogleWebView(Activity activity) {
         synchronized(mInitialized) {
@@ -26,39 +28,27 @@ public class GoogleWebView implements IRhoWebView {
             }
         }
         mWebView = new android.webkit.WebView(activity);
-        mWebSettings.setWebSettings(mWebView);
-        mWebView.setWebChromeClient(mChromeClient);
-        mWebView.setWebViewClient(mWebViewClient);
-        mWebView.clearCache(true);
     }
 
     private static void initWebStuff(Activity activity) {
-        String ccName;
-        String wsName;
-        int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
-        if (sdkVersion < Build.VERSION_CODES.ECLAIR_MR1) {
-            ccName = "ChromeClientOld";
-            wsName = "RhoWebSettingsOld";
-        }
-        else {
-            ccName = "ChromeClientNew";
-            wsName = "RhoWebSettingsNew";
-        }
+        //String ccName;
+        //String wsName;
+        //int sdkVersion = Build.VERSION.SDK_INT;
+        //if (sdkVersion < Build.VERSION_CODES.ECLAIR_MR1) {
+        //    ccName = "ChromeClientOld";
+        //}
+        //else {
+        //    ccName = "ChromeClientNew";
+        //}
         
         try {
-            String pkgname = ChromeClientOld.class.getPackage().getName();
-            String fullName = pkgname + "." + ccName;
-            Class<? extends WebChromeClient> ccClass =
-                Class.forName(fullName).asSubclass(WebChromeClient.class);
+            //String pkgname = ChromeClientOld.class.getPackage().getName();
+            //String fullName = pkgname + "." + ccName;
+            //Class<? extends WebChromeClient> ccClass =
+            //    Class.forName(fullName).asSubclass(WebChromeClient.class);
             
-            Constructor<? extends WebChromeClient> ctor = ccClass.getConstructor(RhodesActivity.class);
-            mChromeClient = ctor.newInstance(activity);
-            
-            pkgname = RhoWebSettings.class.getPackage().getName();
-            fullName = pkgname + "." + wsName;
-            Class<? extends RhoWebSettings> wsClass =
-                Class.forName(fullName).asSubclass(RhoWebSettings.class);
-            mWebSettings = wsClass.newInstance();
+            //Constructor<? extends WebChromeClient> ctor = ccClass.getConstructor(RhodesActivity.class);
+            //mChromeClient = ctor.newInstance(activity);
             
             mWebViewClient = new RhoWebViewClient();
             
@@ -70,7 +60,35 @@ public class GoogleWebView implements IRhoWebView {
     }
     
     public void applyWebSettings() {
-        mWebSettings.setWebSettings(mWebView);
+        PerformOnUiThread.exec(new Runnable() {
+            @Override
+            public void run() {
+                mWebView.setVerticalScrollBarEnabled(true);
+                mWebView.setHorizontalScrollBarEnabled(true);
+                mWebView.setVerticalScrollbarOverlay(true);
+                mWebView.setHorizontalScrollbarOverlay(true);
+                mWebView.setFocusableInTouchMode(true);
+                AndroidFunctionalityManager.getAndroidFunctionality().applyWebSettings(mWebView);
+                if (mChromeClient != null) {
+                    mWebView.setWebChromeClient(mChromeClient);
+                }
+                mWebView.setWebViewClient(mWebViewClient);
+                mWebView.clearCache(true);
+            }
+        });
+    }
+
+    @Override
+    public void setWebClient(Activity activity) {
+        Logger.I(TAG, "Creating new RhoWebChromeClient");
+        mChromeClient = new RhoWebChromeClient(activity);
+        PerformOnUiThread.exec(new Runnable() {
+            @Override
+            public void run() {
+                Logger.I(TAG, "Setting RhoWebChromeClient");
+                mWebView.setWebChromeClient(mChromeClient);
+            }
+        });
     }
 
     @Override
@@ -78,6 +96,16 @@ public class GoogleWebView implements IRhoWebView {
         return mWebView;
     }
 
+    @Override
+    public void setContainerView(ViewGroup view) {
+        mContainerView = view;
+    }
+
+    @Override
+    public ViewGroup getContainerView() {
+        return mContainerView;
+    }
+
     @Override
     public boolean canGoBack() {
         return mWebView.canGoBack();
@@ -130,4 +158,19 @@ public class GoogleWebView implements IRhoWebView {
     public void stopLoad() {
         mWebView.stopLoading();
     }
+
+    @Override
+    public void setZoom(int scale) {
+        // TODO Auto-generated method stub
+    }
+
+    @Override
+    public void setTextZoom(int scale) {
+        //mWebView.getSettings().setTextZoom(scale);
+    }
+
+    @Override
+    public String getEngineId() {
+        return "WEBKIT/GOOGLE/" + Build.VERSION.RELEASE;
+    }
 }