rhodes 3.4.2 → 3.5.1.12

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

@@ -41,6 +41,7 @@ public class GeoLocation {
 	
 	private static double ourLatitude = 0;
 	private static double ourLongitude = 0;
+	private static double ourAltitude = 0;
 	private static double ourAccuracy = 0;
 	private static boolean ourIsKnownPosition = false;
 	private static boolean ourIsEnable = true;
@@ -56,12 +57,14 @@ public class GeoLocation {
 			if (loc != null) {
 				ourLatitude = loc.getLatitude();
 				ourLongitude = loc.getLongitude();
+				ourAltitude = loc.getAltitude();
 				ourAccuracy = loc.getAccuracy();
 				ourIsKnownPosition = true;
 			}
 			else {
 				ourLatitude = 0;
 				ourLongitude = 0;
+				ourAltitude = 0;
 				ourAccuracy = 0;
 				ourIsKnownPosition = false;
 			}
@@ -176,6 +179,19 @@ public class GeoLocation {
 		return 0.0;
 	}
 	
+	public static double getAltitude() {
+		onUpdateLocation();
+		try {
+			checkState();
+			Logger.T(TAG, "getAltitude");
+			return ourAltitude;
+		}
+		catch (Exception e) {
+            Logger.E(TAG, e);
+		}
+		return 0.0;
+	}
+	
 	public static float getAccuracy() {
 		onUpdateLocation();
 		try {

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

@@ -28,15 +28,18 @@ package com.rhomobile.rhodes.mainview;
 
 import java.util.Map;
 
-import com.rhomobile.rhodes.webview.IRhoWebView;
+import com.rhomobile.rhodes.extmanager.IRhoWebView;
 
 import android.view.View;
 
 public interface MainView {
+    public static final String FORMAT_JPEG = "jpeg";
+    public static final String FORMAT_HTML = "html";
 
 	public View getView();
 
-	public IRhoWebView getWebView(int tab_index);
+	public void setWebView(IRhoWebView view, int tabIndex);
+	public IRhoWebView getWebView(int tabIndex);
 	
 	public IRhoWebView detachWebView();
 	
@@ -62,4 +65,8 @@ public interface MainView {
 	
 	public void addNavBar(String title, Map<Object,Object> left, Map<Object,Object> right);
 	public void removeNavBar();
+	
+	public void saveCurrentPage(String format, String path, int index);
+	
+	public String get_current_url(int tab_index);	
 }

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

@@ -34,13 +34,14 @@ import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesAppOptions;
 import com.rhomobile.rhodes.RhodesService;
+import com.rhomobile.rhodes.extmanager.IRhoWebView;
 import com.rhomobile.rhodes.file.RhoFileApi;
 import com.rhomobile.rhodes.mainview.MainView;
 import com.rhomobile.rhodes.nativeview.IRhoCustomView;
 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.IRhoWebView;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -501,20 +502,14 @@ public class SimpleMainView implements MainView {
 		}
 	}
 	
-	private void init(IRhoWebView v, Object params) {
-		RhodesActivity activity = RhodesActivity.safeGetInstance();
+	private void init(Object params) {
+		Context activity = ContextFactory.getUiContext();
 		
 		view = new MyView(activity);
 		view.setOrientation(LinearLayout.VERTICAL);
 		view.setGravity(Gravity.BOTTOM);
 		view.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT));
-		
-		webView = v;
-		if (webView == null) {
-		    webView = activity.createWebView();
-		}
-		addWebViewToMainView(webView, 0, new LinearLayout.LayoutParams(FILL_PARENT, 0, 1));
-		
+
 		LinearLayout bottom = new LinearLayout(activity);
 		bottom.setOrientation(LinearLayout.HORIZONTAL);
 		bottom.setBackgroundColor(Color.GRAY);
@@ -527,17 +522,25 @@ public class SimpleMainView implements MainView {
 	}
 	
 	public SimpleMainView() {
-		init(null, null);
+		init(null);
 	}
 	
 	public SimpleMainView(IRhoWebView v) {
-		init(v, null);
+		init(null);
+		setWebView(v, 0);
 	}
 	
 	public SimpleMainView(IRhoWebView v, Object params) {
-		init(v, params);
+		init(params);
+		setWebView(v, 0);
 	}
-	
+
+    @Override
+    public void setWebView(IRhoWebView view, int tabIndex) {
+        webView = view;
+        addWebViewToMainView(webView, 0, new LinearLayout.LayoutParams(FILL_PARENT, 0, 1));
+    }
+
 	public void setWebBackgroundColor(int color) {
 		view.setBackgroundColor(color);
 		webView.getContainerView().setBackgroundColor(color);
@@ -676,4 +679,30 @@ public class SimpleMainView implements MainView {
 	public int getTabsCount() {
 		return 0;
 	}
+
+    @Override
+    public void saveCurrentPage(String format, String path, int index) {
+        if (format.equalsIgnoreCase(MainView.FORMAT_HTML)) {
+            webView.capture(IRhoWebView.CaptureFormat.CAPTURE_FORMAT_HTML, path);
+        }
+        else if (format.equalsIgnoreCase(MainView.FORMAT_JPEG)) {
+            webView.capture(IRhoWebView.CaptureFormat.CAPTURE_FORMAT_JPEG, path);
+        }
+        else {
+            Logger.E(TAG, "Wrong format to save current page: " + format);
+        }
+    }
+    
+	public String get_current_url(int tab_index) {
+		if (webView == null) {
+			return "";
+		}
+		android.webkit.WebView v = (android.webkit.WebView)webView.getView();
+		if (v == null) {
+			return "";
+		}
+		//Utils.platformLog("MOHUS", "$$$$$$$$$$$$$$$$$ = "+v.getUrl());
+		return v.getUrl();
+	}
+
 }

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

@@ -30,23 +30,21 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 
-import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.RhodesApplication;
-import com.rhomobile.rhodes.util.PerformOnUiThread;
-import com.rhomobile.rhodes.webview.IRhoWebView;
-
 import android.app.Activity;
-import android.content.Context;
 import android.content.res.AssetManager;
 import android.graphics.BitmapFactory;
 import android.os.SystemClock;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
+import android.webkit.WebView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-public class SplashScreen implements MainView {
+import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.RhodesApplication;
+import com.rhomobile.rhodes.extmanager.IRhoWebView;
+import com.rhomobile.rhodes.util.PerformOnUiThread;
+
+public class SplashScreen implements MainView{
     
     public interface SplashScreenListener {
         void onSplashScreenGone(SplashScreen splashScreen);
@@ -62,10 +60,8 @@ public class SplashScreen implements MainView {
 	private static final String LOADING_PAGE = "apps/app/loading.html";
 
 	private SplashScreenListener mSplashScreenListener;
-	private FrameLayout mView;
-	private IRhoWebView mWebView;
-	private ImageView mImageView;
-	private Activity mActivity;
+	private View mView;
+	private MainView mBackendView;
 
 	private native void nativeStart();
 	private native void nativeHide();
@@ -77,19 +73,22 @@ public class SplashScreen implements MainView {
 	private int mNavigateIndex = 0;
 	private Thread mSleepThread;
 
-    public SplashScreen(Activity activity, IRhoWebView webView, SplashScreenListener listener) {
+    public SplashScreen(Activity activity, MainView mainView, SplashScreenListener listener) {
         mSplashScreenListener = listener;
-        mActivity = activity;
-        mView = new FrameLayout(activity);
-        mWebView = webView;
-        loadContent();
+        mBackendView = mainView;
+        loadContent(activity);
+    }
+
+    public MainView getBackendView() {
+        return mBackendView;
     }
 
-    public synchronized String getUrlToNavigate() { return mUrlToNavigate; }
-    private synchronized void setUrlToNavigate(String url) { mUrlToNavigate = url; }
+    public View getSplashView() {
+        return mView;
+    }
 
-    private void loadContent() {
-        AssetManager am = mActivity.getAssets();
+    private void loadContent(Activity activity) {
+        AssetManager am = activity.getAssets();
         int type = 0;
 
         Logger.I(TAG, "Looking for start page source");
@@ -118,29 +117,43 @@ public class SplashScreen implements MainView {
             type++;
         }
 
-        mActivity.setContentView(mView, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
         switch (type) {
         case 0:
             try {
-                mImageView = new ImageView(mActivity);
-                mImageView.setImageBitmap(BitmapFactory.decodeStream(am.open(fn[type])));
-                mActivity.addContentView(mImageView, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
-                mImageView.setAdjustViewBounds(true);
-                mImageView.setScaleType(ImageView.ScaleType.FIT_CENTER);
+                Logger.I(TAG, "Loading image: " + fn[type]);
+                
+                ImageView imageView = new ImageView(activity);
+                imageView.setImageBitmap(BitmapFactory.decodeStream(am.open(fn[type])));
+                imageView.setAdjustViewBounds(true);
+                imageView.setScaleType(ImageView.ScaleType.FIT_CENTER);
+                mView = imageView;
             } catch (IOException e) {
                 Logger.E(TAG, e);
             }
-            mView.addView(mWebView.getContainerView(), new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT)) ; 
-            //mWebView.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:
-            mView.addView(mWebView.getContainerView(), new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT)) ; 
-            mWebView.loadUrl("file:///android_asset/" + fn[type]);
+            {
+                Logger.I(TAG, "Loading html: " + fn[type]);
+
+                WebView webView = new WebView(activity);
+                webView.setVerticalScrollBarEnabled(false);
+                webView.setHorizontalScrollBarEnabled(false);
+                webView.loadUrl("file:///android_asset/" + fn[type]);
+                mView = webView;
+            }
             break;
         default:
-            mView.addView(mWebView.getContainerView(), new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT)) ; 
-            mWebView.loadData("<html><title>Loading</title><body text='white' bgcolor='black'>Loading...</body></html>", "text/html", "utf-8");
+            {
+                Logger.I(TAG, "Loading default html data");
+
+                WebView webView = new WebView(activity);
+                webView.setVerticalScrollBarEnabled(false);
+                webView.setHorizontalScrollBarEnabled(false);
+                webView.loadData("<html><title>Loading</title><body text='white' bgcolor='black'>Loading...</body></html>", "text/html", "utf-8");
+                mView = webView;
+            }
         }
+        activity.addContentView(mView, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
         Logger.I(TAG, "Done");
     }
 	
@@ -151,17 +164,22 @@ public class SplashScreen implements MainView {
 	
 	@Override
 	public View getView() {
-		return mView;
+		return mBackendView.getView();
 	}
-	
+
+   @Override
+    public void setWebView(IRhoWebView view, int index) {
+       mBackendView.setWebView(view, index);
+    }
+
 	@Override
 	public IRhoWebView getWebView(int index) {
-		return mWebView;
+		return mBackendView.getWebView(index);
 	}
 	
 	@Override
 	public void goBack() {
-		// Nothing here
+		mBackendView.goBack();
 	}
 	
 	@Override
@@ -169,6 +187,8 @@ public class SplashScreen implements MainView {
 
         Logger.D(TAG, "navigate: url=" + url);
 
+        mBackendView.navigate(url, index);
+
         long delay = howLongWaitMs();
         if (delay <= 0) {
             delay = 0;
@@ -181,12 +201,10 @@ public class SplashScreen implements MainView {
         Logger.D(TAG, "DELAY for SplashScreen = " + String.valueOf(delay));
         final SplashScreen curView = this;
 
-        if (getUrlToNavigate() == null) {
-            setUrlToNavigate(url);
-            final long threadDelay = delay;
-            mSleepThread = new Thread(new Runnable() {
-                @Override
-                public void run() {
+        final long threadDelay = delay;
+        mSleepThread = new Thread(new Runnable() {
+            @Override
+            public void run() {
                     SystemClock.sleep(threadDelay);
                     RhodesApplication.runWhen(
                         RhodesApplication.AppState.AppActivated,
@@ -207,28 +225,17 @@ public class SplashScreen implements MainView {
                         }
                     });
                 }
-            });
-            mSleepThread.start();
-        } else {
-            setUrlToNavigate(url);
-        }
-        
+        });
+        mSleepThread.start();
 	}
 
     @Override
     public IRhoWebView detachWebView() {
-        IRhoWebView v = null;
-        if (mWebView != null) {
-            mView.removeView(mWebView.getContainerView());
-            v = mWebView;
-            mWebView = null;
-        }
-        return v;
+        return mBackendView.detachWebView();
     }
 
     @Override
-    public void back(int index) 
-    {
+    public void back(int index) {
         mSplashScreenListener.onSplashScreenNavigateBack();
     }
 
@@ -237,36 +244,47 @@ public class SplashScreen implements MainView {
 	}
 	@Override
 	public void reload(int index) {
+	    mBackendView.reload(index);
 	}
 	@Override
 	public String currentLocation(int index) {
-		return null;
+		return mBackendView.currentLocation(index);
 	}
 	@Override
 	public void switchTab(int index) {
+	    mBackendView.switchTab(index);
 	}
 	@Override
 	public int activeTab() {
-		return 0;
+		return mBackendView.activeTab();
 	}
 	@Override
 	public int getTabsCount() {
-		return 1;
+		return mBackendView.getTabsCount();
 	}
 	@Override
 	public void loadData(String data, int index) {
 	}
 	@Override
-	public void addNavBar(String title, Map<Object, Object> left,
-			Map<Object, Object> right) {
+	public void addNavBar(String title, Map<Object, Object> left, Map<Object, Object> right) {
 	}
 	@Override
 	public void removeNavBar() {
 	}
     @Override
     public void executeJS(String js, int index) {
+        mBackendView.executeJS(js, index);
     }
     @Override
     public void stopNavigate(int index) {
+        mBackendView.stopNavigate(index);
     }
+    @Override
+    public void saveCurrentPage(String format, String path, int index) {
+        mBackendView.saveCurrentPage(format, path, index);
+    }
+    
+	public String get_current_url(int tab_index) {
+		return mBackendView.get_current_url(tab_index);
+	}    
 }

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

@@ -32,9 +32,9 @@ import java.util.Vector;
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesService;
+import com.rhomobile.rhodes.extmanager.IRhoWebView;
 import com.rhomobile.rhodes.file.RhoFileApi;
 import com.rhomobile.rhodes.util.ContextFactory;
-import com.rhomobile.rhodes.webview.IRhoWebView;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -607,19 +607,19 @@ public class TabbedMainView implements MainView {
 				spec.setIndicator(label);
 			else
 				spec.setIndicator(label, drawable);
-			
-			SimpleMainView view = null;
-			if (use_current_view_for_tab) {
-                MainView mainView = RhodesActivity.safeGetInstance().getMainView();
+
+            SimpleMainView view = null;
+            RhodesActivity activity = RhodesActivity.safeGetInstance();
+            if (use_current_view_for_tab) {
+                MainView mainView = activity.getMainView();
                 action = mainView.currentLocation(-1);
                 IRhoWebView webView = mainView.detachWebView();
                 view = new SimpleMainView(webView);
-			}
-			if (view == null) {
-				view = new SimpleMainView();
-				view.getWebView(-1).setWebClient(RhodesActivity.safeGetInstance());
-			}
-			
+            }
+            if (view == null) {
+                view = new SimpleMainView(activity.createWebView(i));
+            }
+
 			// Set view factory
 			
 			if (web_bkg_color_Obj != null) {
@@ -850,12 +850,17 @@ public class TabbedMainView implements MainView {
 	public View getView() {
 		return host;
 	}
-	
+
+   @Override
+    public void setWebView(IRhoWebView view, int index) {
+       getTabMainView(index).setWebView(view, -1);
+    }
+
     @Override
     public IRhoWebView getWebView(int tab_index) {
         return getTabMainView(tab_index).getWebView(-1);
     }
-	
+
 	@Override
 	public IRhoWebView detachWebView() {
 		return getTabMainView(activeTab()).detachWebView();
@@ -924,4 +929,14 @@ public class TabbedMainView implements MainView {
         getTabMainView(index).stopNavigate(0);
     }
 
+
+    @Override
+    public void saveCurrentPage(String format, String path, int index) {
+        getTabMainView(index).saveCurrentPage(format, path, 0);
+    }
+    
+	public String get_current_url(int tab_index) {
+		return getTabMainView(tab_index).get_current_url(tab_index);
+	}     
+
 }