rhodes 2.0.2 → 2.0.3

data/CHANGELOG

@@ -1,3 +1,13 @@
+## 2.0.3
+* #4317065 - App store requires 3 icons now for iphone
+* #4356949 - iPhone simulator: rake run:iphone open simulator but there is no
+  application
+* #4394846 - Android: no application screen when go to background and switch back
+* #4365316 - build.yml should default to iPhoneSimulator 4.0
+
+## 2.0.2
+* #4223112 - fixed problem with script order in iphone build
+
 ## 2.0.1
 * #4049590 - Android 2.2, rhodes rc2: take picture hangs
 * #4103477 - Android 2.2: can't write to DB

data/lib/framework/rho/rhoerror.rb

@@ -24,6 +24,10 @@ module Rho
         ::Rho::RhoError.err_message(code)        
     end
     
+    def unknown_client?(msg)
+       code ==  ERR_REMOTESERVER && msg && msg.downcase == 'unknown client'
+    end
+    
   end # RhoError
 end # Rho
 

data/lib/framework/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.0.2'
+    VERSION = '2.0.3'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '2.0.2'
+    DBVERSION = '2.0.3'
   end
   
 end

data/lib/framework/rhom/rhom.rb

@@ -40,6 +40,26 @@ module Rhom
         c_id = ::Rho::RHO.get_user_db().select_from_table('client_info','client_id')[0]
         c_id.nil? ? nil : c_id['client_id']
       end
+
+      def database_client_reset
+        SyncEngine.stop_sync
+        
+        params = ["", "", 0]
+        ::Rho::RHO.get_user_db().execute_sql("UPDATE client_info SET client_id=?, token=?, token_sent=?", params)
+        
+        if ( Rho::RhoConfig.exists?('bulksync_state') )
+            Rho::RhoConfig.bulksync_state='0'
+        end    
+        ::Rho::RHO.get_user_db().execute_sql("UPDATE sources SET token=0")
+        
+        ::Rho::RHO.get_db_partitions().each_value do |db|
+            db.destroy_tables(
+             :exclude => (['sources','client_info']) )
+        end
+      
+        hash_migrate = {}
+        ::Rho::RHO.init_schema_sources(hash_migrate) 
+      end
       
       def database_full_reset(reset_client_info=false)
         SyncEngine.stop_sync
@@ -68,7 +88,7 @@ module Rhom
         database_full_reset(true)
         SyncEngine.logout
       end
-      
+
         def search(args)
           searchParams = ""
           

data/lib/framework/version.rb

@@ -1,8 +1,8 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '2.0.2'
+    VERSION = '2.0.3'
   end
   unless defined? RhodesFramework::DBVERSION
-    DBVERSION = '2.0.2'
+    DBVERSION = '2.0.3'
   end
 end

data/lib/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.0.2'
+    VERSION = '2.0.3'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '2.0.2'
+    DBVERSION = '2.0.3'
   end
   
 end

data/platform/android/Rhodes/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.rhomobile.rhodes"
-      android:versionCode="22"
-      android:versionName="2.0.2">
+      android:versionCode="23"
+      android:versionName="2.0.3">
     <uses-sdk android:minSdkVersion="3" />
     <application android:icon="@drawable/icon"
           android:multiprocess="true"

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

@@ -41,6 +41,7 @@ import com.rhomobile.rhodes.uri.VideoUriHandler;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -84,9 +85,11 @@ public class Rhodes extends Activity {
 	public static int WINDOW_FLAGS = WindowManager.LayoutParams.FLAG_FULLSCREEN;
 	public static int WINDOW_MASK = WindowManager.LayoutParams.FLAG_FULLSCREEN;
 	
-	private static int MAX_PROGRESS = 10000;
+	public static int MAX_PROGRESS = 10000;
 	
-	private static boolean ENABLE_LOADING_INDICATION = true;
+	public static boolean ENABLE_LOADING_INDICATION = true;
+	
+	private static boolean ownActivityActivated;
 	
 	private boolean needGeoLocationRestart = false;
 	
@@ -481,8 +484,9 @@ public class Rhodes extends Activity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		
-		Logger.T(TAG, "+++ onCreate");
+
+		// Here Log should be used, not Logger. It is because Logger is not initialized yet.
+		Log.v(TAG, "+++ onCreate");
 		
 		Thread ct = Thread.currentThread();
 		ct.setPriority(Thread.MAX_PRIORITY);
@@ -571,13 +575,16 @@ public class Rhodes extends Activity {
 	protected void onStart() {
 		super.onStart();
 		Logger.T(TAG, "+++ onStart");
+		ownActivityActivated = false;
+		if (needGeoLocationRestart) {
+			GeoLocation.isKnownPosition();
+			needGeoLocationRestart = false;
+		}
 	}
 	
 	@Override
 	protected void onResume() {
 		super.onResume();
-		if (needGeoLocationRestart)
-			GeoLocation.isKnownPosition();
 		Logger.T(TAG, "+++ onResume");
 	}
 	
@@ -592,6 +599,8 @@ public class Rhodes extends Activity {
 		Logger.T(TAG, "+++ onStop");
 		needGeoLocationRestart = GeoLocation.isAvailable();
 		GeoLocation.stop();
+		if (!ownActivityActivated)
+			stopSelf();
 		super.onStop();
 	}
 		
@@ -765,6 +774,12 @@ public class Rhodes extends Activity {
 		Process.killProcess(Process.myPid());
 	}
 	
+	@Override
+	public void startActivity(Intent intent) {
+		ownActivityActivated = true;
+		super.startActivity(intent);
+	}
+	
 	static {
 		NativeLibraries.load();
 	}

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

@@ -29,7 +29,7 @@ public class RhodesInstance {
 	}
 
 	public static void setInstance(Rhodes instance) {
-		if ( RhodesInstance.instance == null )
+		if ( RhodesInstance.instance != instance )
 			RhodesInstance.instance = instance;
 	}
 	

data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java

@@ -111,6 +111,16 @@ public class RhoRubyHelper implements IRhoRubyHelper {
 		return netCallback.m_response;
 	}
 	
+	public void navigateUrl(String url)
+	{
+		WebView.navigate(url);
+	}
+	
+	public void navigateBack()
+	{
+		RhodesApplication.getInstance().navigateBack();
+	}
+	
 	static Hashtable m_appProperties = new Hashtable(); 
 	public String getAppProperty(String name)
 	{

data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java

@@ -205,7 +205,7 @@ public class NetworkAccess implements INetworkAccess {
 			
 			try {
 				String url = strUrl;
-				if (!ignoreSuffix)
+				if ( RhoConf.getInstance().getBool("bb_sim_use_deviceside") || !ignoreSuffix )
 					url += URLsuffix;
                 if (url.startsWith("https"))
 					url += ";EndToEndDesired;RdHTTPS";

data/platform/bb/rhodes/src/com/rho/rubyext/GeoLocation.java

@@ -138,9 +138,9 @@ public class GeoLocation extends RhoThread{
 	{
 		LOG.INFO( "Starting main routine..." );
 
-		while(!m_bStop)
+		while(!isStopping())
 		{
-			if (!m_bStop)
+			if (!isStopping())
 				checkAlive();
 			
 			wait( 10*10000);

data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java

@@ -5,6 +5,7 @@ import java.util.Vector;
 
 import javax.microedition.io.*;
 
+import com.rho.FilePath;
 import com.rho.RhoEmptyLogger;
 import com.rho.RhoLogger;
 import com.rho.RhodesApp;
@@ -268,10 +269,11 @@ public class PushListeningThread extends Thread {
             			op = splitOnce(ops[loop],"=");
             			if (op.length>1) {
             				op = splitOnce(op[1],",");
+            				String fileName = FilePath.join("/public/alerts/", op[0]);
             				if (op.length>1) {
-            					play_file(op[0],op[1]);
+            					play_file(fileName,op[1]);
             				} else {
-            					play_file(op[0],null);
+            					play_file(fileName,null);
             				}
             			}            			
             		}

data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java

@@ -86,7 +86,8 @@ final public class RhodesApplication extends UiApplication implements SystemList
 				/*if ( m_bSkipKeyPress )
 					m_bSkipKeyPress = false;
 				else*/	
-					back();
+					//back();
+				RHODESAPP().navigateBack();
 				return true;
 			}
 
@@ -123,11 +124,12 @@ final public class RhodesApplication extends UiApplication implements SystemList
     	_mainScreen.addCustomMenuItem(label, value);
     }
     
-	private String m_strAppBackUrl ="";
+	//private String m_strAppBackUrl ="";
 	
     public void resetMenuItems() {
     	_mainScreen.setMenuItems(new Vector());
-    	m_strAppBackUrl = "";
+    	//m_strAppBackUrl = "";
+    	RHODESAPP().setAppBackUrl("");
     }
 
     public void postUrl(String url, String body, HttpHeaders headers) {
@@ -194,7 +196,35 @@ final public class RhodesApplication extends UiApplication implements SystemList
 		return false;
     }
    
-    void back(){
+    public void navigateBack()
+    {
+    	if ( RHODESAPP().isCloseBack() )
+    	{
+    		_mainScreen.close();
+    		return;
+    	}
+    	
+    	String url = "";
+    	if ( _history.size() <= 1 )
+    	{
+    		if ( RhoConf.getInstance().getBool("bb_disable_closebyback"))
+    			return;
+    		
+    		_mainScreen.close();
+    		return;
+       	}	
+    	int nPos = _history.size()-2;
+    	url = (String)_history.elementAt(nPos);
+    	_history.removeElementAt(nPos+1);
+
+//		this.m_oBrowserAdapter.goBack();
+    	
+    	saveCurrentLocation(url);
+    	navigateUrl(url);
+    }
+/*    
+    void back()
+    {
     	String url = m_strAppBackUrl;
     	if ( url.length() == 0)
     	{
@@ -220,7 +250,7 @@ final public class RhodesApplication extends UiApplication implements SystemList
     	
     	saveCurrentLocation(url);
     	navigateUrl(url);
-    }
+    }*/
 
     String removeSemicolon(String str)
     {
@@ -673,7 +703,8 @@ final public class RhodesApplication extends UiApplication implements SystemList
 			};
 		private MenuItem backItem = new MenuItem("", 200000, 10) {
 			public void run() {
-					back();
+					//back();
+					RHODESAPP().navigateBack();
 				}
 			};
 		private MenuItem syncItem = new MenuItem("", 200000, 10) {
@@ -748,7 +779,9 @@ final public class RhodesApplication extends UiApplication implements SystemList
 			menu.add(contextMenu);
 		}
 		
-		public void addCustomMenuItem(String label, final String value) {
+		public void addCustomMenuItem(String label, final String value) 
+		{
+			final String _label = label;
 			// Is this a default item? If so, use the existing menu item we have.
     	    if (value.equalsIgnoreCase(RhodesApplication.LABEL_HOME)) {
     	    	setDefaultItemToMenuItems(label, homeItem);
@@ -772,13 +805,21 @@ final public class RhodesApplication extends UiApplication implements SystemList
     	    	menuItems = null;
     	    } else {
     	    	if ( label.equalsIgnoreCase("back") )
-    	    		m_strAppBackUrl = value;
+    	    		//m_strAppBackUrl = value;
+    	    		RHODESAPP().setAppBackUrl(value);
     	    	else
     	    	{
-					MenuItem itemToAdd = new MenuItem(label, 200000, 10) {
+					MenuItem itemToAdd = new MenuItem(label, 200000, 10) 
+					{
 						public void run() 
 						{
-							if (value != null && value.startsWith("callback:") )
+							try{
+								RHODESAPP().loadUrl(value);
+							}catch(Exception exc)
+							{
+								LOG.ERROR("Execute menu item: '" + _label + "' failed.", exc);
+							}
+/*							if (value != null && value.startsWith("callback:") )
 							{
 								String url = RHODESAPP().canonicalizeRhoUrl(value.substring(9));
 								RhoRubyHelper helper = new RhoRubyHelper();
@@ -788,7 +829,7 @@ final public class RhodesApplication extends UiApplication implements SystemList
 						    	String url = RHODESAPP().canonicalizeRhoUrl(value);
 								addToHistory(url, null );
 								navigateUrl(url);
-							}
+							}*/
 						}
 					};
 					menuItems.addElement(itemToAdd);

data/platform/iphone/Classes/NativeBar.m

@@ -34,27 +34,46 @@ static int started = 0;
     Rhodes *r = [Rhodes sharedInstance];
     
     id mainView = [r mainView];
-    
+    UIWindow* w = r.window;
+
+	SimpleMainView* smv = nil;
+    if ([mainView isKindOfClass:[SimpleMainView class]]) {
+	    smv = (SimpleMainView*)mainView;
+	}
     switch (type) {
-    case NOBAR_TYPE:
-        view = [[SimpleMainView alloc] initWithMainView:mainView];
-        started = 0;
-        break;
-    case TOOLBAR_TYPE:
-        view = [[SimpleMainView alloc] initWithMainView:mainView toolbar:items];
-        started = 1;
-        break;
-    case TABBAR_TYPE:
-        view = [[TabbedMainView alloc] initWithMainView:mainView tabs:items];
-        started = 1;
-        break;
-    default:
-        RAWLOG_ERROR1("Unknown bar type passed: %d", type);
+		case NOBAR_TYPE:
+			if (smv != nil) {
+				[smv removeToolbar];
+			}
+			else {
+				view = [[SimpleMainView alloc] initWithMainView:mainView parent:w ];
+				[r setMainView:view];
+				[view release];
+			}
+			started = 0;
+			break;
+		case TOOLBAR_TYPE:
+			if (smv != nil) {
+				[smv addToolbar:items];
+			}
+			else {
+				view = [[SimpleMainView alloc] initWithMainView:mainView parent:w toolbar:items];
+				[r setMainView:view];
+				[view release];
+			}
+			started = 1;
+			break;
+		case TABBAR_TYPE:
+			view = [[TabbedMainView alloc] initWithMainView:mainView parent:w tabs:items];
+			started = 1;
+			[r setMainView:view];
+			[view release];
+			break;
+		default:
+			RAWLOG_ERROR1("Unknown bar type passed: %d", type);
         return;
     }
-    
-    [r setMainView:view];
-    [view release];
+ 
 }
 @end