rhodes 3.2.3 → 3.3.0.beta.1

data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java

@@ -317,7 +317,7 @@ public class GeoLocationImpl {
 			
 		} catch (Exception e) {
 			lastLocation = null;
-			Logger.E(TAG, e.getMessage());
+			Logger.E(TAG, e);
 		}
 	}
 	

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

@@ -28,8 +28,9 @@ package com.rhomobile.rhodes.mainview;
 
 import java.util.Map;
 
+import com.rhomobile.rhodes.webview.WebView;
+
 import android.view.View;
-import android.webkit.WebView;
 
 public interface MainView {
 

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

@@ -26,19 +26,27 @@
 
 package com.rhomobile.rhodes.mainview;
 
+import java.lang.reflect.Constructor;
 import java.util.Map;
 import java.util.Vector;
 
 import com.rhomobile.rhodes.AndroidR;
+import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesAppOptions;
+import com.rhomobile.rhodes.RhodesApplication;
 import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.file.RhoFileApi;
+import com.rhomobile.rhodes.mainview.MainView;
 import com.rhomobile.rhodes.nativeview.RhoNativeViewManager;
+import com.rhomobile.rhodes.util.ContextFactory;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 import com.rhomobile.rhodes.util.Utils;
+import com.rhomobile.rhodes.webview.WebView;
+import com.rhomobile.rhodes.webview.GoogleWebView;
 
+import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -50,7 +58,6 @@ import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
-import android.webkit.WebView;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
@@ -151,6 +158,7 @@ public class SimpleMainView implements MainView {
 		return view;
 	}
 
+	@Override
 	public WebView getWebView(int tab_index) {
 		return webView;
 	}
@@ -160,7 +168,7 @@ public class SimpleMainView implements MainView {
 		mNativeView = nview;
 		mNativeViewView = mNativeView.getView();
 		if (mNativeViewView != null) {
-			view.removeView(webView);
+			view.removeView(webView.getView());
 			//int view_index = 0;
 			//if (navBar != null) {
 				//view_index = 1;
@@ -212,7 +220,7 @@ public class SimpleMainView implements MainView {
 				view.addView(navBar, index);
 				index++;
 			}
-			view.addView( webView, index, new LinearLayout.LayoutParams(FILL_PARENT, 0, 1));
+			view.addView(webView.getView(), index, new LinearLayout.LayoutParams(FILL_PARENT, 0, 1));
 			index++;
 			if (toolBar != null) {
 				view.addView(toolBar, index);
@@ -296,7 +304,7 @@ public class SimpleMainView implements MainView {
 		restoreWebView();
 		WebView v = null;
 		if (webView != null) {
-			view.removeView(webView);
+			view.removeView(webView.getView());
 			v = webView;
 			webView = null;
 		}
@@ -508,22 +516,34 @@ public class SimpleMainView implements MainView {
 		}
 	}
 	
-	private void init(MainView v, Object params) {
-		Context ctx = RhodesActivity.getContext();
+	private void init(WebView v, Object params) {
+		RhodesActivity activity = RhodesActivity.safeGetInstance();
 		
-		view = new MyView(ctx);
+		view = new MyView(activity);
 		view.setOrientation(LinearLayout.VERTICAL);
 		view.setGravity(Gravity.BOTTOM);
 		view.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT));
 		
-		webView = null;
-		if (v != null)
-			webView = v.detachWebView();
-		if (webView == null)
-			webView = RhodesActivity.safeGetInstance().createWebView();
-		view.addView(webView, new LinearLayout.LayoutParams(FILL_PARENT, 0, 1));
+		webView = v;
+		//if (v != null)
+		//	webView = v.detachWebView();
+		if (webView == null) {
+	        if (Capabilities.WEBKIT_BROWSER_ENABLED) {
+	            try {
+	                Class<? extends WebView> viewClass = (Class<? extends WebView>)Class.forName("com.rhomobile.rhodes.webview.EkiohWebView");
+	                Constructor<? extends WebView> viewCtor = viewClass.getConstructor(Activity.class);
+	                webView = viewCtor.newInstance(activity);
+	            } catch (Throwable e) {
+	                Logger.E(TAG, e);
+	                RhodesApplication.stop();
+	            }
+	        } else {
+	            webView = new GoogleWebView(activity);
+	        }
+		}
+		view.addView(webView.getView(), new LinearLayout.LayoutParams(FILL_PARENT, 0, 1));
 		
-		LinearLayout bottom = new LinearLayout(ctx);
+		LinearLayout bottom = new LinearLayout(activity);
 		bottom.setOrientation(LinearLayout.HORIZONTAL);
 		bottom.setBackgroundColor(Color.GRAY);
 		bottom.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, WRAP_CONTENT, 0));
@@ -534,24 +554,24 @@ public class SimpleMainView implements MainView {
 		setupToolbar(toolBar, params);
 		
 		
-		webView.requestFocus();
+		webView.getView().requestFocus();
 	}
 	
 	public SimpleMainView() {
 		init(null, null);
 	}
 	
-	public SimpleMainView(MainView v) {
+	public SimpleMainView(WebView v) {
 		init(v, null);
 	}
 	
-	public SimpleMainView(MainView v, Object params) {
+	public SimpleMainView(WebView v, Object params) {
 		init(v, params);
 	}
 	
 	public void setWebBackgroundColor(int color) {
 		view.setBackgroundColor(color);
-		webView.setBackgroundColor(color);
+		webView.getView().setBackgroundColor(color);
 	}
 	
 	public void back(int index) {
@@ -559,7 +579,7 @@ public class SimpleMainView implements MainView {
         
         boolean bStartPage = RhodesService.isOnStartPage();
 
-        if ( !bStartPage && webView.canGoBack() )		
+        if ( !bStartPage && webView.canGoBack() )
             webView.goBack();
         else
         {    

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

@@ -28,34 +28,36 @@ package com.rhomobile.rhodes.mainview;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Constructor;
 import java.util.Map;
 
+import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesActivity;
-import com.rhomobile.rhodes.RhodesService;
+import com.rhomobile.rhodes.RhodesApplication;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 import com.rhomobile.rhodes.util.Utils;
+import com.rhomobile.rhodes.webview.GoogleWebView;
+import com.rhomobile.rhodes.webview.WebView;
 
-import android.content.Context;
+import android.app.Activity;
 import android.content.res.AssetManager;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.util.Log;
 import android.view.View;
-import android.webkit.WebView;
-import android.widget.ImageView;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 
 public class SplashScreen implements MainView {
 	
 	private static final String TAG = SplashScreen.class.getSimpleName();
 	
-	private static final boolean DEBUG = false;
+	private static final boolean DEBUG = true;
 	
 	private static final String LOADING_ANDROID_PNG = "apps/app/loading.android.png";
 	private static final String LOADING_PNG = "apps/app/loading.png";
 	private static final String LOADING_PAGE = "apps/app/loading.html";
 	
-	private View mContentView;
+	private FrameLayout mView;
 	
 	private WebView mWebView;
 	
@@ -65,72 +67,71 @@ public class SplashScreen implements MainView {
 	
 	private boolean mFirstNavigate = true;
 	
-	public SplashScreen(Context context) {
+    public SplashScreen(RhodesActivity context) {
+        mView = new FrameLayout(context);
+        mView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
 		AssetManager am = context.getResources().getAssets();
-		mContentView = createImageView(context, am);
-		if (mContentView == null)
-			mContentView = createHtmlView(context, am);
+		mWebView = createHtmlView(context, am);
+		mView.addView(mWebView.getView());
 		mFirstNavigate = true;
 	}
-	
-	private View createImageView(Context context, AssetManager am) {
-		String[] imageFiles = {LOADING_ANDROID_PNG, LOADING_PNG};
-		for (String imageFile : imageFiles) {
-			InputStream is = null;
-			try {
-				is = am.open(imageFile);
-				Bitmap bitmap = BitmapFactory.decodeStream(is);
-				
-				ImageView view = new ImageView(context);
-				view.setImageBitmap(bitmap);
-				view.setAdjustViewBounds(false);
-				
-				return view;
-			} catch (IOException e) {
-				if (DEBUG)
-					Log.d(TAG, "Can't load " + imageFile, e);
-			}
-			finally {
-				if (is != null)
-					try {
-						is.close();
-					} catch (IOException e) {}
-			}
-		}
-		
-		return null;
-	}
-	
-	private View createHtmlView(Context context, AssetManager am) {
-		boolean hasNeededPage;
 
-		String page = LOADING_PAGE;
-		InputStream is = null;
-		try {
-			is = am.open(page);
-			hasNeededPage = true;
-		} catch (IOException e) {
-			if (DEBUG)
-				Log.d(TAG, "Can't load " + page, e);
-			hasNeededPage = false;
-		}
-		finally {
-			if (is != null)
-				try {
-					is.close();
-				} catch (IOException e) {}
-		}
-		
-		// Now create WebView and load appropriate content there
-		WebView view = new WebView(context);
-		
-		if (hasNeededPage)
-			view.loadUrl("file:///android_asset/" + page);
-		else
-			view.loadData("<html><title>Loading</title><body>Loading...</body></html>", "text/html", "utf-8");
-		
-		return view;
-	}
+    private WebView createHtmlView(RhodesActivity context, AssetManager am) {
+
+        int type = 0;
+        final String[][] urls = {{LOADING_ANDROID_PNG, LOADING_PNG}, {LOADING_PAGE}};
+        String[] fn = new String[2];
+        types: for (String[] X: urls) {
+            for (String url:X) {
+                InputStream is = null;
+                try {
+                    is = am.open(url);
+                    fn[type] = url;
+                    break types;
+                }
+                catch (IOException e) {
+                    if (DEBUG)
+                        Log.d(TAG, "Can't load " + url, e);
+                    continue;
+                }
+                finally {
+                    if (is != null)
+                        try {
+                            is.close();
+                        } catch (IOException e) {}
+                }
+            }
+            type++;
+        }
+
+        // Now create WebView and load appropriate content there
+        WebView view = null;//new GoogleWebView(context);
+        if (Capabilities.WEBKIT_BROWSER_ENABLED) {
+            try {
+                Class<? extends WebView> viewClass = (Class<? extends WebView>)Class.forName("com.rhomobile.rhodes.webview.EkiohWebView");
+                Constructor<? extends WebView> viewCtor = viewClass.getConstructor(Activity.class);
+                view = viewCtor.newInstance(context);
+            } catch (Throwable e) {
+                Logger.E(TAG, e);
+                RhodesApplication.stop();
+            }
+        } else {
+            view = new GoogleWebView(context);
+        }
+
+        switch (type) {
+        case 0:
+            view.loadDataWithBaseURL("file:///android_asset/", "<html><body style=\"margin:0px\"><img src=\""+ fn[type] + "\" height=\"100%\" width=\"100%\" border=\"0\"/></body></html>", "text/html", "utf-8", null);
+            break;
+        case 1:
+            view.loadUrl("file:///android_asset/" + fn[type]);
+            break;
+        default:
+            view.loadData("<html><title>Loading</title><body text='white' bgcolor='black'>Loading...</body></html>", "text/html", "utf-8");
+        }
+
+        return view;
+    }
 	
 	public void start() {
 		nativeStart();
@@ -138,15 +139,11 @@ public class SplashScreen implements MainView {
 	
 	@Override
 	public View getView() {
-		return mContentView;
+		return mView;
 	}
 	
 	@Override
 	public WebView getWebView(int index) {
-		if (mWebView == null) {
-			RhodesActivity ra = RhodesActivity.getInstance();
-			mWebView = ra.createWebView();
-		}
 		return mWebView;
 	}
 	
@@ -156,10 +153,8 @@ public class SplashScreen implements MainView {
 	}
 	
 	@Override
-	public void navigate(String url, int index) {
+	public void navigate(final String url, final int index) {
 
-		final String _url = url;
-		final int _index = index;
 		if (DEBUG)
 			Log.d(TAG, "navigate: url=" + url);
 		
@@ -168,41 +163,41 @@ public class SplashScreen implements MainView {
 			delay = 0;
 		}
 		
-		Utils.platformLog(TAG, "$$$$$$$$$$$$$$$$$$$$$$$     DELAY for SplashScreen = "+String.valueOf(delay));
-
-		PerformOnUiThread.exec(new Runnable() {
-			private String mUrl = _url;
-			private int mIndex = _index;
-			public void run() {
-				if (mFirstNavigate) {
-					mFirstNavigate = false;
-			        RhodesService r = RhodesService.getInstance();
-					MainView mainView = r.getMainView();
-					SimpleMainView v = new SimpleMainView(mainView);
-					r.setMainView(v);		
-					//getWebView(0).loadUrl(url);
-					v.navigate(mUrl,0);
-				}
-				else {
-			        RhodesService r = RhodesService.getInstance();
-					MainView mainView = r.getMainView();
-					if (mainView != null) {
-						mainView.navigate(mUrl,mIndex);
-					}
-				}
-			}
-			
-		}, delay);
-		
-		//nativeHide();
-		
+		Utils.platformLog(TAG, "DELAY for SplashScreen = "+String.valueOf(delay));
+		final SplashScreen curView = this;
 
+        PerformOnUiThread.exec(new Runnable() {
+            private String mUrl = url;
+            private int mIndex = index;
+            public void run() {
+                try {
+                    RhodesActivity activity = RhodesActivity.safeGetInstance();
+                    if (mFirstNavigate) {
+                        mFirstNavigate = false;
+                        activity.switchToSimpleMainView(curView).navigate(mUrl, mIndex);
+                    }
+                    else {
+                        // Recover navigate in case of race conditions
+                        activity.getMainView().navigate(mUrl, mIndex);
+                    }
+                } catch (Throwable e) {
+                    Logger.E(TAG, e);
+                }
+            }
+        }, delay);
 	}
-	
-	@Override
-	public WebView detachWebView() {
-		return getWebView(0);
-	}
+
+    @Override
+    public WebView detachWebView() {
+        WebView v = null;
+        if (mWebView != null) {
+            mView.removeView(mWebView.getView());
+            v = mWebView;
+            mWebView = null;
+        }
+        return v;
+    }
+
 	@Override
 	public void back(int index) 
 	{
@@ -216,12 +211,9 @@ public class SplashScreen implements MainView {
 	}
 	@Override
 	public void reload(int index) {
-		// TODO Auto-generated method stub
-		
 	}
 	@Override
 	public String currentLocation(int index) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 	@Override
@@ -245,26 +237,4 @@ public class SplashScreen implements MainView {
 	@Override
 	public void removeNavBar() {
 	}
-
-	/*
-	public void start(ViewGroup outer) {
-		outer.removeAllViews();
-		if (view instanceof SplashImageView) {
-			((SplashImageView)view).setupExecuted = false;
-		}
-		outer.addView(view);
-		RhoService.platformLog(TAG, " view was showed on screen");
-	}
-	
-	public void rho_start() {
-		nativeStart();
-		RhoService.platformLog(TAG, " rho native loading splash screen started");
-	}
-	
-	public void hide(ViewGroup outer) {
-		nativeHide();
-		outer.removeView(view);
-		RhoService.platformLog(TAG, " splash screen closed");
-	}
-	*/
 }