rhodes 2.2.6 → 2.3.0.beta.1

data/platform/android/build/android.rake

@@ -39,9 +39,12 @@ ANDROID_PERMISSIONS = {
   'vibrate' => 'VIBRATE',
   'bluetooth' => ['BLUETOOTH_ADMIN', 'BLUETOOTH'],
   'calendar' => ['READ_CALENDAR', 'WRITE_CALENDAR'],
+  'sdcard' => 'WRITE_EXTERNAL_STORAGE',
   'push' => proc do |manifest| add_push(manifest) end
 }
 
+ANDROID_CAPS_ALWAYS_ENABLED = ['network_state']
+
 def add_push(manifest)
   element = REXML::Element.new('permission')
   element.add_attribute('android:name', "#{$app_package_name}.permission.C2D_MESSAGE")
@@ -130,7 +133,7 @@ def set_app_name_android(newname)
 
   caps_proc = []
   # Default permissions. Need to be always enabled.
-  caps = ['INTERNET', 'PERSISTENT_ACTIVITY', 'WAKE_LOCK', 'ACCESS_NETWORK_STATE']
+  caps = ['INTERNET', 'PERSISTENT_ACTIVITY', 'WAKE_LOCK']
   $app_config["capabilities"].each do |cap|
     cap = ANDROID_PERMISSIONS[cap]
     next if cap.nil?
@@ -235,21 +238,21 @@ namespace "config" do
 
     $androidsdkpath = $config["env"]["paths"]["android"]
     unless File.exists? $androidsdkpath
-      puts "Missing or invalid 'android' section in rhobuild.yml"
+      puts "Missing or invalid 'android' section in rhobuild.yml: '#{$androidsdkpath}'"
       exit 1
     end
 
     $androidndkpath = $config["env"]["paths"]["android-ndk"]
     unless File.exists? $androidndkpath
-      puts "Missing or invalid 'android-ndk' section in rhobuild.yml"
+      puts "Missing or invalid 'android-ndk' section in rhobuild.yml: '#{$androidndkpath}'"
       exit 1
     end
 
     errfmt = "WARNING!!! Path to Android %s contain spaces! It will not work because of the Google toolchain restrictions. Move it to another location and reconfigure rhodes."
-    if $androidsdkpath =~ /\s/
-      puts(errfmt % "SDK")
-      exit 1
-    end
+    #if $androidsdkpath =~ /\s/
+    #  puts(errfmt % "SDK")
+    #  exit 1
+    #end
     if $androidndkpath =~ /\s/
       puts(errfmt % "NDK")
       exit 1
@@ -272,7 +275,8 @@ namespace "config" do
     $vendor = $app_config["vendor"]
     $vendor = "rhomobile" if $vendor.nil?
     $vendor = $vendor.gsub(/^[^A-Za-z]/, '_').gsub(/[^A-Za-z0-9]/, '_').gsub(/_+/, '_').downcase
-    $app_package_name = "com.#{$vendor}." + $appname.downcase.gsub(/[^A-Za-z_0-9]/, '')
+    $app_package_name = $app_config["android"] ? $app_config["android"]["package_name"] : nil
+    $app_package_name = "com.#{$vendor}." + $appname.downcase.gsub(/[^A-Za-z_0-9]/, '') unless $app_package_name
 
     $rhomanifest = File.join $androidpath, "Rhodes", "AndroidManifest.xml"
     $appmanifest = File.join $tmpdir, "AndroidManifest.xml"
@@ -345,6 +349,8 @@ namespace "config" do
 
     if $androidplatform.nil?
       puts "+++ No required platform (API level >= #{ANDROID_API_LEVEL}) found, can't proceed"
+      puts "+++ Looks like you have no installed required Android platform package."
+      puts "+++ To solve that, please strictly follow instructions from http://wiki.rhomobile.com/index.php/BuildingRhodes#Prerequisites_5"
       exit 1
     else
       puts "+++ Platform found: #{$androidplatform}" if USE_TRACES
@@ -388,6 +394,7 @@ namespace "config" do
       $app_config["capabilities"] += $app_config["android"]["capabilities"]
       $app_config["android"]["capabilities"] = nil
     end
+    $app_config["capabilities"] += ANDROID_CAPS_ALWAYS_ENABLED
     $app_config["capabilities"].map! { |cap| cap.is_a?(String) ? cap : nil }.delete_if { |cap| cap.nil? }
     $use_google_addon_api = true unless $app_config["capabilities"].index("push").nil?
 
@@ -612,7 +619,7 @@ namespace "build" do
       objdir = $objdir["sqlite"]
       libname = $libname["sqlite"]
 
-      cc_build 'libsqlite', objdir, ["-I#{srcdir}"] or exit 1
+      cc_build 'libsqlite', objdir, ["-I#{srcdir}", "-I#{$shareddir}"] or exit 1
       cc_ar libname, Dir.glob(objdir + "/**/*.o") or exit 1
     end
 
@@ -730,6 +737,8 @@ namespace "build" do
       args = []
       args << "-I#{$shareddir}"
       args << "-I#{$shareddir}/curl/include"
+      args << "-I#{$shareddir}/ruby/include"
+      args << "-I#{$shareddir}/ruby/linux"
       args << "-I#{$std_includes}" unless $std_includes.nil?
       args << "-D__NEW__" if USE_OWN_STLPORT
       args << "-I#{$stlport_includes}" if USE_OWN_STLPORT
@@ -993,7 +1002,15 @@ namespace "build" do
         while line = f.gets
           line.chomp!
           next if line =~ /\/AndroidR\.java\s*$/
-          next if !$use_geomapping and line =~ /\/mapview\//
+
+		  if !$use_geomapping
+			next if line == "platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java"
+			next if line == "platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java"
+		  end
+
+          #next if !$use_geomapping and line =~ /\/GoogleMapView\//
+          #next if !$use_geomapping and line =~ /\/AnnotationsOverlay\//
+
           lines << line
         end
       end
@@ -1312,7 +1329,7 @@ def run_application (target_flag)
   args << "-a"
   args << "android.intent.action.MAIN"
   args << "-n"
-  args << $app_package_name + "/#{JAVA_PACKAGE_NAME}.Rhodes"
+  args << $app_package_name + "/#{JAVA_PACKAGE_NAME}.RhodesActivity"
   Jake.run($adb, args)
 end
 

data/platform/android/build/androidcommon.rb

@@ -199,6 +199,8 @@ def cc_compile(filename, objdir, additional = nil)
 
   args = get_def_args(filename)
   args << "-Wall"
+  args << "-Wextra"
+  args << "-Wno-unused"
   args += additional if additional.is_a? Array and not additional.empty?
   args << "-c"
   args << filename

data/platform/android/build/librhocommon_build.files

@@ -1,19 +1,23 @@
+platform/shared/common/app_build_configs.c
+platform/shared/common/AppMenu.cpp
 platform/shared/common/AppMenu.cpp
+platform/shared/common/map/ESRIMapEngine.cpp
+platform/shared/common/map/GoogleMapEngine.cpp
+platform/shared/common/map/MapEngine.cpp
 platform/shared/common/PosixThreadImpl.cpp
 platform/shared/common/RhoConf.cpp
 platform/shared/common/RhoFile.cpp
+platform/shared/common/RhoMath.cpp
+platform/shared/common/rhoparams.cpp
 platform/shared/common/RhoThread.cpp
-platform/shared/common/ThreadQueue.cpp
 platform/shared/common/SplashScreen.cpp
+platform/shared/common/ThreadQueue.cpp
 platform/shared/common/Tokenizer.cpp
-platform/shared/common/AppMenu.cpp
-platform/shared/common/rhoparams.cpp
-platform/shared/common/app_build_configs.c
 platform/shared/net/AsyncHttp.cpp
 platform/shared/net/CURLNetRequest.cpp
 platform/shared/net/HttpServer.cpp
-platform/shared/net/URI.cpp
 platform/shared/net/ssl.cpp
+platform/shared/net/URI.cpp
 platform/shared/rubyext/GeoLocation.cpp
 platform/shared/rubyext/RhoAppAdapter.cpp
 platform/shared/rubyext/System.cpp

data/platform/android/build/librhodes_build.files

@@ -23,3 +23,4 @@ platform/android/Rhodes/jni/src/socketimpl.cpp
 platform/android/Rhodes/jni/src/splashscreen.cpp
 platform/android/Rhodes/jni/src/sslimpl.cpp
 platform/android/Rhodes/jni/src/webview.cpp
+platform/android/Rhodes/jni/src/rhocryptimpl.cpp

data/platform/android/build/libruby_build.files

@@ -22,6 +22,7 @@ platform/shared/ruby/eval.c
 platform/shared/ruby/ext/alert/alert_wrap.c
 platform/shared/ruby/ext/asynchttp/asynchttp_wrap.c
 platform/shared/ruby/ext/bluetooth/bluetooth_wrap.c
+platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager_wrap.c
 platform/shared/ruby/ext/calendar/calendar_wrap.c
 platform/shared/ruby/ext/calendar/event_wrap.c
 platform/shared/ruby/ext/camera/camera_wrap.c

data/platform/bb/Hsqldb/Hsqldb.jdp

@@ -27,12 +27,10 @@ src\com\rho\db\HsqlDBResult.java
 src\com\rho\db\HsqlDBRowResult.java
 src\com\rho\db\HsqlDBStorage.java
 src\com\rho\db\Journal.java
-src\com\rho\file\FileAccessBB.java
 src\j2me\io\BufferedOutputStream.java
 src\j2me\io\FilterOutputStream.java
 src\j2me\math\BigDecimal.java
 src\j2me\math\BigInteger.java
-src\j2me\math\Number.java
 src\j2me\sql\Date.java
 src\j2me\sql\Time.java
 src\j2me\sql\Timestamp.java

data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java

@@ -23,6 +23,10 @@ public class HsqlDBResult implements IDBResult
 	
 	public HsqlDBResult(){
 	}
+	
+	public void close()
+	{
+	}
 /*	
 	public int getCount(){ 
 		return m_result != null ? m_result.getSize() : 0; 
@@ -192,8 +196,12 @@ public class HsqlDBResult implements IDBResult
     {
     	return m_current == null;
     }
+    public boolean isOneEnd()
+    {
+    	return m_current == null;
+    }
     
-    public void next()
+    public void next() throws DBException
     {
     	if ( m_current != null )
     		m_current = m_current.next;
@@ -204,7 +212,7 @@ public class HsqlDBResult implements IDBResult
     	return m_current.data[nCol];
     }
 
-    public Object[] getCurData()
+    public Object[] getCurData() throws DBException
     {
     	return m_current.data;
     }

data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java

@@ -1,12 +1,17 @@
 package com.rho.db;
 
+import com.rho.RhoEmptyLogger;
+import com.rho.RhoLogger;
 import com.rho.db.DBException;
 import com.rho.db.IDBResult;
 import com.rho.db.IDBStorage;
 import org.hsqldb.*;
 import org.hsqldb.persist.*;
 
-public class HsqlDBStorage implements IDBStorage, Session.IDBCallback{
+public class HsqlDBStorage implements IDBStorage, Session.IDBCallback
+{
+	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
+		new RhoLogger("HsqlStorage");
 
 	private Session m_dbSess;
 	private FileUtilBB m_fs;
@@ -104,11 +109,11 @@ public class HsqlDBStorage implements IDBStorage, Session.IDBCallback{
 	}
 
 	public void onAfterInsert(Table table, Row row) {
-		if ( m_dbCallback == null )
-			return;
+		//if ( m_dbCallback == null )
+		//	return;
 		
-		m_rowResult.init(table, row);
-		m_dbCallback.onAfterInsert(table.getName().name, m_rowResult );
+		//m_rowResult.init(table, row);
+		//m_dbCallback.onAfterInsert(table.getName().name, m_rowResult );
 	}
 	
 	public void onBeforeUpdate(Table table, Row row, int[] cols) {
@@ -152,6 +157,8 @@ public class HsqlDBStorage implements IDBStorage, Session.IDBCallback{
 			if ( m_dbSess == null )
 				throw new RuntimeException("executeSQL: m_dbSess == null");
 			
+			LOG.TRACE(strStatement);// + "; Values: " + values);
+			
 			CompiledStatement st = m_dbSess.compiledStatementManager.compile(m_dbSess, strStatement);
 			Result res = m_dbSess.sqlExecuteCompiledNoPreChecksSafe(st, values, bReportNonUnique);
 			if ( m_dbSess.isAutoCommit() )
@@ -174,6 +181,16 @@ public class HsqlDBStorage implements IDBStorage, Session.IDBCallback{
 			throw new DBException(exc);
 		}
 	}
+
+	public void onBeforeCommit() throws DBException
+	{
+		
+	}
+	
+	public void createTriggers() throws DBException
+	{
+		
+	}
 	
 	public void commit()throws DBException
 	{
@@ -203,6 +220,21 @@ public class HsqlDBStorage implements IDBStorage, Session.IDBCallback{
 		
 		return vecTables;
 	}
+	
+	public boolean isTableExists(String strName)throws DBException
+	{
+		org.hsqldb.lib.HsqlArrayList arTables = m_dbSess.getDatabase().schemaManager.getAllTables();
+		
+		for ( int i = 0; i< arTables.size(); i++ )
+		{
+			String tableName = ((Table)arTables.get(i)).getName().name;
+			if ( tableName.equalsIgnoreCase(strName) )
+				return true;
+		}
+		
+		return false;
+	}
+	
 /*	
 	private String createInsertStatement(HsqlDBResult res)
 	{

data/platform/bb/Hsqldb/src/org/hsqldb/Column.java

@@ -693,15 +693,15 @@ public class Column {
 
             case Types.VARCHAR :
             case Types.LONGVARCHAR :
-                return collation.compare((String) a, (String) b);
+                return collation.compare(/*(String)*/ a.toString(), /*(String)*/ b.toString());
 
             case Types.CHAR :
-                return collation.compare(Library.rtrim((String) a),
-                                         Library.rtrim((String) b));
+                return collation.compare(Library.rtrim(/*(String)*/ a.toString()),
+                                         Library.rtrim(/*(String)*/ b.toString()));
 
             case Types.VARCHAR_IGNORECASE :
-                return collation.compareIgnoreCase(((String) a),
-                                                   ((String) b));
+                return collation.compareIgnoreCase((/*(String)*/ a.toString()),
+                                                   (/*(String)*/ b.toString()));
 
             case Types.TINYINT :
             case Types.SMALLINT :

data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java

@@ -2053,7 +2053,7 @@ public class Expression {
             case FUNCTION :
                 function.resolveType(session);
 
-                dataType = 0;//function.getReturnType();
+                dataType = function.getReturnType();
                 break;
 
             case QUERY : {