rhodes 2.2.6 → 2.3.0.beta.1

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

@@ -42,7 +42,7 @@ public class RingtoneManager {
 	
 	private static void init() {
 		if (context == null)
-			context = RhodesService.getInstance().getContext();
+			context = RhodesService.getContext();
 		if (manager == null)
 			manager = new android.media.RingtoneManager(context);
 	}

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

@@ -2,136 +2,218 @@ package com.rhomobile.rhodes;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Map;
+
+import com.rhomobile.rhodes.mainview.MainView;
+import com.rhomobile.rhodes.mainview.SimpleMainView;
 
 import android.content.Context;
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
+import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
 import android.webkit.WebView;
 import android.widget.ImageView;
 
-public class SplashScreen {
+public class SplashScreen implements MainView {
+	
+	private static final String TAG = SplashScreen.class.getSimpleName();
+	
+	private static final boolean DEBUG = false;
 	
 	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 static final String TAG = "RhoSplashScreen";	
+	private View mContentView;
 	
-	private View view;
+	private WebView mWebView;
 	
 	private native void nativeStart();
 	private native void nativeHide();
+	private native int howLongWaitMs();
 	
-	public class SplashImageView extends ImageView {
-		public boolean setupExecuted = false;
-		
-		public SplashImageView(Context ctx) {
-			super(ctx);
-		}
-		
-		protected void onDraw (Canvas canvas) {
-			RhodesService.platformLog(TAG, "Splash Screen Image REAL DRAWING !");
-			super.onDraw(canvas);
-			if (!setupExecuted) {
-				Rhodes.runPostponedSetup();
-				setupExecuted = true;
+	public SplashScreen(Context context) {
+		AssetManager am = context.getResources().getAssets();
+		mContentView = createImageView(context, am);
+		if (mContentView == null)
+			mContentView = createHtmlView(context, am);
+	}
+	
+	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;
 
-	public SplashScreen(Context ctx) {
-		RhodesService.platformLog(TAG, "SplashScreen()");
-		AssetManager am = ctx.getResources().getAssets();
-		//RhodesService r = RhodesService.getInstance();
-		//boolean bc = r.isBundleChanged();
-		
-		String file = LOADING_ANDROID_PNG;
-		
-		boolean loading_android_ok = false;
-		
-		Bitmap bitmap = null;
+		String page = LOADING_PAGE;
+		InputStream is = null;
 		try {
-			InputStream is = am.open(file);
-			bitmap = BitmapFactory.decodeStream(is);
-			is.close();
-			
-			ImageView v = new SplashImageView(ctx);
-			v.setImageBitmap(bitmap);
-			v.setAdjustViewBounds(false);
-			v.setId(RhodesService.RHO_SPLASH_VIEW);
-			view = v;
-			loading_android_ok = true;
+			is = am.open(page);
+			hasNeededPage = true;
+		} catch (IOException e) {
+			if (DEBUG)
+				Log.d(TAG, "Can't load " + page, e);
+			hasNeededPage = false;
 		}
-		catch (IOException e) {
-		}
-		if (!loading_android_ok) { 
-			try {
-				file = LOADING_PNG;
-				InputStream is = am.open(file);
-				bitmap = BitmapFactory.decodeStream(is);
-				is.close();
-				
-				ImageView v = new SplashImageView(ctx);
-				v.setImageBitmap(bitmap);
-				v.setAdjustViewBounds(false);
-				v.setId(RhodesService.RHO_SPLASH_VIEW);
-				view = v;
-			}
-			catch (IOException e) {
-				
-				WebView v = RhodesService.createLoadingWebView(ctx);
-				
-				String page = LOADING_PAGE;
-				
-				boolean hasNeededPage;
+		finally {
+			if (is != null)
 				try {
-					InputStream is1 = am.open(page);
-					if (is1 != null)
-						is1.close();
-					hasNeededPage = true;
-				}
-				catch (IOException e1) {
-					hasNeededPage = false;
-				}
-				
-				if (hasNeededPage) {
-					v.loadUrl("file:///android_asset/" + page);
-				}
-				else {
-					v.loadData("<html><title>Loading</title><body>Loading...</body></html>", "text/html", "utf-8");
-				}
-				
-				v.setId(RhodesService.RHO_SPLASH_VIEW);
-				
-				view = v;
-			}
+					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;
+	}
+	
+	public void start() {
+		nativeStart();
+	}
+	
+	@Override
+	public View getView() {
+		return mContentView;
+	}
+	
+	@Override
+	public WebView getWebView(int index) {
+		if (mWebView == null) {
+			RhodesActivity ra = RhodesActivity.getInstance();
+			mWebView = ra.createWebView();
 		}
+		return mWebView;
+	}
+	
+	@Override
+	public void goBack() {
+		// Nothing here
+	}
+	
+	@Override
+	public void navigate(String url, int index) {
+		if (DEBUG)
+			Log.d(TAG, "navigate: url=" + url);
+
+        RhodesService r = RhodesService.getInstance();
+		MainView mainView = r.getMainView();
+		SimpleMainView v = new SimpleMainView(mainView);
+		r.setMainView(v);		
+		//getWebView(0).loadUrl(url);
+		v.navigate(url,0);
 	}
 	
+	@Override
+	public WebView detachWebView() {
+		return getWebView(0);
+	}
+	@Override
+	public void back(int index) 
+	{
+        RhodesActivity ra = RhodesActivity.getInstance();
+        if ( ra != null )
+            ra.moveTaskToBack(true);
+	}
+	
+	@Override
+	public void forward(int index) {
+		// TODO Auto-generated method stub
+		
+	}
+	@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
+	public void switchTab(int index) {
+		// TODO Auto-generated method stub
+		
+	}
+	@Override
+	public int activeTab() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+	@Override
+	public int getTabsCount() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+	@Override
+	public void loadData(String data, int index) {
+		// TODO Auto-generated method stub
+		
+	}
+	@Override
+	public void addNavBar(String title, Map<Object, Object> left,
+			Map<Object, Object> right) {
+		// TODO Auto-generated method stub
+		
+	}
+	@Override
+	public void removeNavBar() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	/*
 	public void start(ViewGroup outer) {
 		outer.removeAllViews();
 		if (view instanceof SplashImageView) {
 			((SplashImageView)view).setupExecuted = false;
 		}
 		outer.addView(view);
-		RhodesService.platformLog(TAG, " view was showed on screen");
+		RhoService.platformLog(TAG, " view was showed on screen");
 	}
 	
 	public void rho_start() {
 		nativeStart();
-		RhodesService.platformLog(TAG, " rho native loading splash screen started");
+		RhoService.platformLog(TAG, " rho native loading splash screen started");
 	}
 	
 	public void hide(ViewGroup outer) {
 		nativeHide();
 		outer.removeView(view);
-		RhodesService.platformLog(TAG, " splash screen closed");
+		RhoService.platformLog(TAG, " splash screen closed");
 	}
+	*/
 }

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

@@ -75,14 +75,40 @@ public class Utils {
 	}
 	
 	public static void deleteRecursively(File target) throws IOException {
+        if (!target.exists())	
+            return;
+        
 		if (target.isDirectory()) {
 			String[] children = target.list();
 			for(int i = 0; i != children.length; ++i)
 				deleteRecursively(new File(target, children[i]));
 		}
+		
+	    //platformLog("delete", target.getPath());
+		
 		if (!target.delete())
 			throw new IOException("Can not delete " + target.getAbsolutePath());
 	}
+
+	public static void deleteChildrenIgnoreFirstLevel(File target, String strIgnore) throws IOException {
+        if (!target.exists())	
+            return;
+	
+		if (target.isDirectory()) {
+			String[] children = target.list();
+			for(int i = 0; i != children.length; ++i)
+			{
+			    File f = new File(target, children[i]);
+			    if ( f.isDirectory())
+				    deleteRecursively(f);
+				else if ( !f.getName().startsWith(strIgnore))    
+				{
+		            if (!target.delete())
+			            throw new IOException("Can not delete " + target.getAbsolutePath());
+				}
+			}
+		}
+	}
 	
 	public static void copyRecursively(FileSource fs, String source, File target, boolean remove) throws IOException
 	{
@@ -169,7 +195,7 @@ public class Utils {
 			if (!hash.exists())
 				return true;
 			
-			FileSource as = new AssetsSource(r.getContext().getResources().getAssets());
+			FileSource as = new AssetsSource(r.getResources().getAssets());
 			FileSource fs = new FileSource();
 			return !Utils.isContentsEquals(as, "hash", fs, hash.getPath());
 		}
@@ -178,4 +204,13 @@ public class Utils {
 		}
 	}
 	
+	public static void platformLog(String tag, String message) {
+		StringBuilder s = new StringBuilder();
+		s.append("ms[");
+		s.append(System.currentTimeMillis());
+		s.append("] ");
+		s.append(message);
+		android.util.Log.v(tag, s.toString());
+	}
+	
 }

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

@@ -63,7 +63,8 @@ public class WebView {
 		}
 		
 		public void run() {
-			RhodesService.getInstance().getMainView().reload(index);
+			RhodesService r = RhodesService.getInstance();
+			r.getMainView().reload(index);
 		}
 	};
 	
@@ -112,7 +113,8 @@ public class WebView {
 	
 	public static int activeTab() {
 		try {
-			return RhodesService.getInstance().getMainView().activeTab();
+			RhodesService r = RhodesService.getInstance();
+			return r.getMainView().activeTab();
 		}
 		catch (Exception e) {
 			reportFail("activeTab", e);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java

@@ -46,6 +46,7 @@ import android.widget.TextView;
 import com.rhomobile.rhodes.AndroidR;
 import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.file.RhoFileApi;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
@@ -102,16 +103,17 @@ public class Alert {
 
 	private static class ShowStatusDialog implements Runnable 
 	{
+	    private String m_strTitle;
 	    private String m_strMessage;
         private String m_strHide;
         
-		public ShowStatusDialog(String strMessage, String strHide) 
+		public ShowStatusDialog(String strTitle, String strMessage, String strHide) 
 		{
 			m_strMessage = strMessage;
 			m_strHide = strHide;
+			m_strTitle = strTitle;
 		}
 		
-		@SuppressWarnings("unchecked")
 		public void run() 
 		{
 			if ( currentAlert != null )
@@ -123,7 +125,7 @@ public class Alert {
 			Vector<CustomButton> buttons = new Vector<CustomButton>();
 			buttons.addElement(new CustomButton(m_strHide));
 			
-			makeDialog( "", m_strMessage, null, buttons, null);
+			makeDialog( m_strTitle, m_strMessage, null, buttons, null);
         }
     }
 	
@@ -142,7 +144,7 @@ public class Alert {
 			String callback = null;
 			Vector<CustomButton> buttons = new Vector<CustomButton>();
 			
-			Context ctx = RhodesService.getInstance().getContext();
+			Context ctx = RhodesActivity.getContext();
 			
 			if (params instanceof String) 
 			{
@@ -219,25 +221,33 @@ public class Alert {
 
 	private static void makeDialog( String title, String message, Drawable icon, Vector<CustomButton> buttons, String callback)
 	{
-		if (message == null)
-			return;
+		//if (message == null)
+		//	return;
 
-        Context ctx = RhodesService.getInstance().getContext();
+        Context ctx = RhodesActivity.getInstance();
+        int nTopPadding = 10;
         
 		Dialog dialog = new Dialog(ctx);
-		dialog.setTitle(title);
+		if ( title == null || title.length() == 0 )
+		    dialog.requestWindowFeature(dialog.getWindow().FEATURE_NO_TITLE);
+		else    
+		{
+		    dialog.setTitle(title);
+		    nTopPadding = 0;
+		}
+		    
 		dialog.setCancelable(false);
 		dialog.setCanceledOnTouchOutside(false);
 		
 		LinearLayout main = new LinearLayout(ctx);
 		main.setOrientation(LinearLayout.VERTICAL);
 		main.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
-		main.setPadding(10, 10, 10, 10);
+		main.setPadding(10, nTopPadding, 10, 10);
 		
 		LinearLayout top = new LinearLayout(ctx);
 		top.setOrientation(LinearLayout.HORIZONTAL);
 		top.setGravity(Gravity.CENTER);
-		top.setPadding(10, 10, 10, 10);
+		top.setPadding(10, nTopPadding, 10, 10);
 		top.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
 		main.addView(top);
 		
@@ -245,16 +255,19 @@ public class Alert {
 			ImageView imgView = new ImageView(ctx);
 			imgView.setImageDrawable(icon);
 			imgView.setScaleType(ImageView.ScaleType.CENTER);
-			imgView.setPadding(10, 10, 10, 10);
+			imgView.setPadding(10, nTopPadding, 10, 10);
 			top.addView(imgView);
 		}
 		
-		TextView textView = new TextView(ctx);
-		s_textView = textView;
-		textView.setText(message);
-		textView.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
-		textView.setGravity(Gravity.CENTER);
-		top.addView(textView);
+		if ( message != null )
+		{
+		    TextView textView = new TextView(ctx);
+		    s_textView = textView;
+		    textView.setText(message);
+		    textView.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
+		    textView.setGravity(Gravity.CENTER);
+		    top.addView(textView);
+        }
 		
 		LinearLayout bottom = new LinearLayout(ctx);
 		bottom.setOrientation(buttons.size() > 3 ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL);
@@ -312,10 +325,10 @@ public class Alert {
 		}
 	}
 
-	public static void showStatusPopup(String message, String hide) {
+	public static void showStatusPopup(String title, String message, String hide) {
 		try {
 			Logger.I(TAG, "showStatusPopup");
-			PerformOnUiThread.exec(new ShowStatusDialog(message, hide), false);
+			PerformOnUiThread.exec(new ShowStatusDialog(title, message, hide), false);
 		}
 		catch (Exception e) {
 			reportFail("showStatusPopup", e);
@@ -327,7 +340,7 @@ public class Alert {
 			if (!Capabilities.VIBRATE_ENABLED)
 				throw new IllegalAccessException("VIBRATE disabled");
 			Logger.T(TAG, "vibrate: " + duration);
-			Context ctx = RhodesService.getInstance().getContext();
+			Context ctx = RhodesService.getContext();
 			Vibrator vibrator = (Vibrator)ctx.getSystemService(Context.VIBRATOR_SERVICE);
 			vibrator.vibrate(duration);
 		}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java

@@ -1,10 +1,6 @@
 package com.rhomobile.rhodes.bluetooth;
 
-import com.rhomobile.rhodes.util.PerformOnUiThread;
-
-import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
-import android.util.Log;
 
 public interface IRhoBluetoothManager {
 	
@@ -32,9 +28,9 @@ public interface IRhoBluetoothManager {
 
 	public void session_write_string(String connected_device_name, String str);
 	
-	public int session_read_data(String connected_device_name, Byte[] buf, int max_length);
+	public int session_read_data(String connected_device_name, byte[] buf, int max_length);
 
-	public void session_write_data(String connected_device_name, Byte[] buf, int length);
+	public void session_write_data(String connected_device_name, byte[] buf, int length);
 	
 	// access from DeviceListActivity
 	   

data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java

@@ -1,32 +1,10 @@
 package com.rhomobile.rhodes.bluetooth;
 
-import java.security.BasicPermission;
-import java.security.Permission;
-
-import android.app.Activity;
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
-import android.content.pm.FeatureInfo;
-import android.content.pm.PackageManager;
 import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
 import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-import com.rhomobile.rhodes.RhodesService;
-import com.rhomobile.rhodes.phonebook.ContactAccessor;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 
-
 public class RhoBluetoothManager {
 
 	public static String BTC_OK = "OK";
@@ -130,11 +108,11 @@ public class RhoBluetoothManager {
 		sharedInstance().session_write_string(connected_device_name, str);
 	}
 	
-	public static int session_read_data(String connected_device_name, Byte[] buf, int max_length) {
+	public static int session_read_data(String connected_device_name, byte[] buf, int max_length) {
 		return sharedInstance().session_read_data(connected_device_name, buf, max_length);
 	}
 
-	public static void session_write_data(String connected_device_name, Byte[] buf, int length) {
+	public static void session_write_data(String connected_device_name, byte[] buf, int length) {
 		sharedInstance().session_write_data(connected_device_name, buf, length);
 	}