rhodes 3.3.3.beta.4 → 3.3.3

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/Request.java

@@ -0,0 +1,193 @@
+/*------------------------------------------------------------------------
+* (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.mapview;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.util.ArrayList;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+import com.rhomobile.rhodes.util.Utils;
+
+public class Request {
+	
+	private static int ourRequestGlobalID = 0;
+	
+	public Request() {
+		mID = ++ourRequestGlobalID;
+		mData = null;
+		mRequest = null;
+	}
+	
+	public int getId() {
+		return mID;
+		
+	}
+	
+	public void cancel() {
+		HttpGet r = mRequest;
+		if (r != null) {
+			r.abort();
+		}
+		mData = null;
+	}
+	
+	private class ArrayCollector {
+		
+		public ArrayCollector(int step_size) {
+			mStep = step_size;
+			mList = new ArrayList<byte[]>();
+			mCurrentBufUsed = 0;
+			mGlobalSize = 0;
+			mCurrentBuf = new byte[mStep];
+		}
+		
+		public byte[] getCurrentBuf() {
+			return mCurrentBuf;
+		}
+		
+		public boolean isCurrentBufFull() {
+			return mCurrentBufUsed >= mStep;
+		}
+		
+		public int getCurrentStartFreeIndex() {
+			return mCurrentBufUsed;
+		}
+ 		
+		public int getCurrentFreeSize() {
+			return mStep - mCurrentBufUsed;
+		}
+		
+		public int getGlobalSize() {
+			return mGlobalSize;
+		}
+		
+		public void nextStep() {
+			mList.add(mCurrentBuf);
+			mCurrentBufUsed = 0;
+			mCurrentBuf = new byte[mStep];
+		}
+		
+		public void addUsed(int size) {
+			mGlobalSize += size;
+			mCurrentBufUsed += size;
+		}
+		
+		public byte[] makeOne() {
+			byte[] buf = new byte[mGlobalSize];
+			int i;
+			for (i = 0; i < mList.size(); i++) {
+				byte[] b = mList.get(i);
+				System.arraycopy(b, 0, buf, i*mStep, mStep);
+			}
+			System.arraycopy(mCurrentBuf, 0, buf, i*mStep, mCurrentBufUsed);
+			return buf;
+		}
+		
+		private int mGlobalSize;
+		private int mStep;
+		private int mCurrentBufUsed;
+		private byte[] mCurrentBuf;
+		private ArrayList<byte[]> mList;
+	}
+	
+	public void requestData(String url) {
+		Utils.platformLog("MapengineRequest", "requestData("+url+")");
+
+        InputStream is = null;
+        try {
+            HttpClient client = new DefaultHttpClient();
+            
+            mRequest = new HttpGet();
+            mRequest.setURI(new URI(url));
+            HttpResponse response = client.execute(mRequest);
+            mRequest = null;
+            is = response.getEntity().getContent();
+            if (is != null) {
+            	
+            	ArrayCollector collector = new ArrayCollector(64000); 
+            	
+            	int s = is.read(collector.getCurrentBuf(), collector.getCurrentStartFreeIndex(), collector.getCurrentFreeSize());
+            	while (s > 0) {
+            		collector.addUsed(s);
+            		if (collector.isCurrentBufFull()) {
+            			collector.nextStep();
+            		}
+            		s = is.read(collector.getCurrentBuf(), collector.getCurrentStartFreeIndex(), collector.getCurrentFreeSize());
+            	}
+            	if (collector.getGlobalSize() > 0) {
+	            	mData = collector.makeOne();
+	        		Utils.platformLog("MapengineRequest", "requestData() success received data with size2 = "+String.valueOf(collector.getGlobalSize()));
+            	}
+            	else {
+            		Utils.platformLog("MapengineRequest", "requestData() InputStream is EMPTY !2");
+            	}
+            }
+            else {
+        		Utils.platformLog("MapengineRequest", "requestData() InputStream is NULL !");
+            }
+        }            
+        catch (Exception e) {
+    		Utils.platformLog("MapengineRequest", "requestData() EXCEPTION :"+e.getMessage());
+        	e.printStackTrace();
+        	mData = null;
+        }
+        finally {
+            if (is != null) {
+                try {
+                    	is.close();
+                    } 
+                catch (IOException e) {
+                		Utils.platformLog("MapengineRequest", "requestData() IO EXCEPTION :"+e.getMessage());
+                    	e.printStackTrace();
+                }
+            }
+        }		
+	}
+	
+	public int getDataSize() {
+		byte[] ar = mData;
+		if (ar == null) {
+			return 0;
+		}
+		return ar.length;
+	}
+	
+	public byte[] getData() {
+		return mData;
+	}
+	
+	private byte[] mData; 
+	private int mID;
+	private HttpGet mRequest;
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/IRhoCustomView.java

@@ -0,0 +1,13 @@
+package com.rhomobile.rhodes.nativeview;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+public interface IRhoCustomView {
+    ViewGroup getContainerView();
+	View getView();
+	void navigate(String url);
+	void stop();
+	void destroyView();
+	String getViewType();
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java

@@ -27,26 +27,29 @@
 package com.rhomobile.rhodes.nativeview;
 
 import android.view.View;
-import com.rhomobile.rhodes.RhodesService;
-import com.rhomobile.rhodes.webview.IRhoWebView;
+import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
+import android.widget.FrameLayout;
+
+import com.rhomobile.rhodes.RhodesActivity;
+import com.rhomobile.rhodes.util.ContextFactory;
 
 public class RhoNativeViewManager {
 
-	public interface RhoNativeView {
-		View getView();
-		void navigate(String url);
-		void destroyView();
-		String getViewType();
-	}
-	
-	private static class RhoNativeViewImpl implements RhoNativeView {
-		
-		RhoNativeViewImpl(String viewType, long factory_h, long view_h) {
-			mViewType = viewType;
-			mFactoryHandle = factory_h;
-			mViewHandle = view_h;
-		}
-		
+	private static class RhoNativeViewImpl implements IRhoCustomView {
+        private String mViewType;
+        private long mFactoryHandle;
+        private long mViewHandle;
+        private FrameLayout mContainerView;
+
+        RhoNativeViewImpl(String viewType, long factory_h, long view_h) {
+            mViewType = viewType;
+            mFactoryHandle = factory_h;
+            mViewHandle = view_h;
+            mContainerView = new FrameLayout(ContextFactory.getUiContext());
+            mContainerView.addView(getView(), new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+        }
+
 		public View getView() {
 			return getViewByHandle(mViewHandle);
 		}
@@ -60,16 +63,22 @@ public class RhoNativeViewManager {
 		public String getViewType() {
 			return mViewType;
 		}
-		private String mViewType;
-		private long mFactoryHandle;
-		private long mViewHandle;
+
+        @Override
+        public ViewGroup getContainerView() {
+            return mContainerView;
+        }
+
+        @Override
+        public void stop() {
+        }
 	}
 	
-	public static android.webkit.WebView getWebViewObject(int tab_index) {
-		return (android.webkit.WebView)RhodesService.getInstance().getMainView().getWebView(tab_index).getView();
+	public static Object getWebViewObject(int tab_index) {
+		return RhodesActivity.safeGetInstance().getMainView().getWebView(tab_index).getView();
 	}
 
-	public static RhoNativeView getNativeViewByteType(String typename) {
+	public static IRhoCustomView getNativeViewByType(String typename) {
 		long factory_h = getFactoryHandleByViewType(typename);
 		if (factory_h == 0) {
 			return null;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoVideoView.java

@@ -0,0 +1,74 @@
+package com.rhomobile.rhodes.nativeview;
+
+import com.rhomobile.rhodes.Logger;
+
+import android.media.MediaPlayer;
+import android.media.MediaPlayer.OnCompletionListener;
+import android.media.MediaPlayer.OnErrorListener;
+import android.net.Uri;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebChromeClient;
+import android.webkit.WebChromeClient.CustomViewCallback;
+import android.widget.VideoView;
+
+public class RhoVideoView implements IRhoCustomView, OnCompletionListener, OnErrorListener {
+    private static final String TAG = RhoVideoView.class.getSimpleName();
+    
+    private ViewGroup mCustomView;
+    private VideoView mVideoView;
+    private WebChromeClient.CustomViewCallback mCustomViewCallback;
+
+    public RhoVideoView(ViewGroup view, CustomViewCallback viewCallback) {
+        mCustomView = view;
+        mVideoView = (VideoView)view.getFocusedChild();
+        mCustomViewCallback = viewCallback;
+        
+        mVideoView.setOnCompletionListener(this);
+        mVideoView.setOnErrorListener(this);
+    }
+    
+    @Override
+    public boolean onError(MediaPlayer mp, int what, int extra) {
+        Logger.E(TAG, "Media player error: " + ((what == MediaPlayer.MEDIA_ERROR_SERVER_DIED) ? "media server died" : "unknown"));
+        return false;
+    }
+
+    @Override
+    public void onCompletion(MediaPlayer player) {
+        player.stop();
+    }
+
+    @Override
+    public View getView() {
+        return mVideoView;
+    }
+
+    @Override
+    public ViewGroup getContainerView() {
+        return mCustomView;
+    }
+
+    @Override
+    public void navigate(String url) {
+        mVideoView.setVideoURI(Uri.parse(url));
+        mVideoView.start();
+    }
+
+    @Override
+    public void stop() {
+        mVideoView.stopPlayback();
+    }
+
+    @Override
+    public void destroyView() {
+        mVideoView.stopPlayback();
+        mCustomViewCallback.onCustomViewHidden();
+    }
+
+    @Override
+    public String getViewType() {
+        return "";
+    }
+
+}

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

@@ -27,14 +27,13 @@
 package com.rhomobile.rhodes.osfunctionality;
 
 import android.content.Context;
+import android.webkit.WebView;
 
 
 public interface AndroidFunctionality {
-
-	public String AccessOwnerInfo_getEmail(Context context);
-	
-	public String AccessOwnerInfo_getUsername(Context context);
-	
-	public int getDeviceRotation();
-	
+    final String TAG = AndroidFunctionality.class.getSimpleName();
+    String AccessOwnerInfo_getEmail(Context context);
+    String AccessOwnerInfo_getUsername(Context context);
+    int getDeviceRotation();
+    void applyWebSettings(WebView view);
 }

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

@@ -26,7 +26,12 @@
 
 package com.rhomobile.rhodes.osfunctionality;
 
+import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.RhoConf;
+
 import android.content.Context;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
 
 // Android 1.0
 class AndroidFunctionality01 implements AndroidFunctionality {
@@ -43,5 +48,37 @@ class AndroidFunctionality01 implements AndroidFunctionality {
 	public int getDeviceRotation() {
 		return -1;
 	}
+
+    @Override
+    public void applyWebSettings(WebView view) {
+        WebSettings settings = view.getSettings();
+
+        settings.setSavePassword(false);
+        settings.setSaveFormData(false);
+        settings.setJavaScriptEnabled(true);
+        settings.setJavaScriptCanOpenWindowsAutomatically(false);
+        if (RhoConf.getBool("enable_screen_zoom")) {
+            settings.setSupportZoom(true);
+            Logger.I(TAG, "Enable WebView zoom");
+        } else {
+            settings.setSupportZoom(false);
+            Logger.I(TAG, "Disable WebView zoom");
+        }
+        settings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
+        settings.setSupportMultipleWindows(false);
+        setWebPlugins(settings);
+    }
+    
+    @SuppressWarnings("deprecation")
+    protected void setWebPlugins(WebSettings settings) {
+        if(RhoConf.getBool("enable_web_plugins")) {
+            settings.setPluginsEnabled(true);
+            Logger.I(TAG, "Set web plugins enabled");
+        }
+        else {
+            settings.setPluginsEnabled(false);
+            Logger.I(TAG, "Set web plugins disabled");
+        }
+    }
 	
 }

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

@@ -26,8 +26,21 @@
 
 package com.rhomobile.rhodes.osfunctionality;
 
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+
+import com.rhomobile.rhodes.RhoConf;
+
 //Android 1.5
 class AndroidFunctionality03 extends AndroidFunctionality02 implements AndroidFunctionality {
 
-	
+    public void applyWebSettings(WebView view) {
+        super.applyWebSettings(view);
+        WebSettings settings = view.getSettings();
+        if (RhoConf.getBool("enable_screen_zoom")) {
+            settings.setBuiltInZoomControls(true);
+        } else {
+            settings.setBuiltInZoomControls(false);
+        }
+    }
 }