rhodes 1.5.5 → 2.0.0.beta1

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

@@ -20,11 +20,8 @@
  */
 package com.rhomobile.rhodes.uri;
 
-import android.net.Uri;
-
 public interface UriHandler {
 
-	public String scheme();
-	public void handle(Uri uri);
+	public boolean handle(String uri);
 	
 }

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

@@ -0,0 +1,61 @@
+/*
+ ============================================================================
+ Author	    : Dmitry Moskalchuk
+ Version	: 2.0
+ Copyright  : Copyright (C) 2008 Rhomobile. All rights reserved.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ============================================================================
+ */
+package com.rhomobile.rhodes.uri;
+
+import com.rhomobile.rhodes.Logger;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.webkit.MimeTypeMap;
+
+public class VideoUriHandler implements UriHandler {
+
+	private static final String TAG = "VideoUriHandler";
+	
+	private Context ctx;
+	
+	public VideoUriHandler(Context c) {
+		ctx = c;
+	}
+
+	public boolean handle(String url) {
+		String ext = MimeTypeMap.getFileExtensionFromUrl(url);
+		if (ext == null || ext.length() == 0)
+			return false;
+		
+		MimeTypeMap mt = MimeTypeMap.getSingleton();
+		String mimeType = mt.getMimeTypeFromExtension(ext);
+		if (mimeType == null)
+			return false;
+		
+		if (!mimeType.startsWith("video/"))
+			return false;
+		
+		Logger.D(TAG, "This is video url, handle it");
+		
+		Intent intent = new Intent(Intent.ACTION_VIEW);
+		intent.setDataAndType(Uri.parse(url), mimeType);
+		ctx.startActivity(Intent.createChooser(intent, "Choose video player"));
+		return true;
+	}
+
+}

data/platform/android/build/RhodesSRC_build.files

@@ -1,4 +1,5 @@
 platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Capabilities.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/HttpLog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java
@@ -6,6 +7,7 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.jav
 platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesInstance.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
@@ -40,3 +42,4 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/MailUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/TelUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/UriHandler.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/uri/VideoUriHandler.java

data/platform/android/build/android.rake

@@ -25,6 +25,15 @@ end
 # command "android list targets"
 ANDROID_API_LEVEL = 3
 
+ANDROID_PERMISSIONS = {
+  'camera' => 'CAMERA',
+  'gps' => 'ACCESS_FINE_LOCATION',
+  'network_state' => 'ACCESS_NETWORK_STATE',
+  'phone' => ['CALL_PHONE', 'READ_PHONE_STATE'],
+  'pim' => ['READ_CONTACTS', 'WRITE_CONTACTS'],
+  'vibrate' => 'VIBRATE'
+}
+
 def get_sources(name)
   File.read(File.join($builddir, name + '_build.files')).split("\n")
 end
@@ -47,10 +56,49 @@ def set_app_name_android(newname)
   doc.elements["resources/string[@name='app_name']"].text = newname
   File.open(appstrings, "w") { |f| doc.write f }
 
+  version = {'major' => 0, 'minor' => 0, 'patch' => 0}
+  if $app_config["version"]
+    if $app_config["version"] =~ /^(\d+)$/
+      version["major"] = $1.to_i
+    elsif $app_config["version"] =~ /^(\d+)\.(\d+)$/
+      version["major"] = $1.to_i
+      version["minor"] = $2.to_i
+    elsif $app_config["version"] =~ /^(\d+)\.(\d+)\.(\d+)$/
+      version["major"] = $1.to_i
+      version["minor"] = $2.to_i
+      version["patch"] = $3.to_i
+    end
+  end
+  
+  version = version["major"]*10000 + version["minor"]*100 + version["patch"]
+
   doc = REXML::Document.new(File.new($rhomanifest))
   doc.root.attributes['package'] = $app_package_name
+  if version > 0
+    doc.root.attributes['android:versionCode'] = version.to_s
+    doc.root.attributes['android:versionName'] = $app_config["version"]
+  end
   doc.elements.delete "manifest/application/uses-library[@android:name='com.google.android.maps']" unless $use_geomapping
-  File.open($appmanifest, "w") { |f| doc.write f }
+
+  caps = ['INTERNET']
+  $app_config["capabilities"].each do |cap|
+    cap = ANDROID_PERMISSIONS[cap]
+    next if cap.nil?
+    cap = [cap] if cap.is_a? String
+    cap = [] unless cap.is_a? Array
+    caps += cap
+  end
+  caps.uniq!
+
+  manifest = doc.elements["manifest"]
+  manifest.elements.each('uses-permission') { |e| manifest.delete e }
+  caps.each do |cap|
+    element = REXML::Element.new('uses-permission')
+    element.add_attribute('android:name', "android.permission.#{cap}")
+    manifest.add element
+  end
+
+  File.open($appmanifest, "w") { |f| doc.write f, 2 }
 
   buf = File.new($rho_android_r,"r").read.gsub(/^\s*import com\.rhomobile\..*\.R;\s*$/,"\nimport #{$app_package_name}.R;\n")
   File.open($app_android_r,"w") { |f| f.write(buf) }
@@ -125,6 +173,8 @@ namespace "config" do
     $rhores = File.join $androidpath, "Rhodes", "res"
     $appres = File.join $tmpdir, "res"
 
+    $appincdir = File.join $tmpdir, "include"
+
     $rho_android_r = File.join $androidpath, "Rhodes", "src", "com", "rhomobile", "rhodes", "AndroidR.java"
     $app_android_r = File.join $tmpdir, "AndroidR.java"
     $app_rjava_dir = File.join $tmpdir
@@ -291,11 +341,21 @@ namespace "config" do
 
     $extensionsdir = $bindir + "/libs/" + $confdir + "/extensions"
 
+    $app_config["extensions"] = [] if $app_config["extensions"].nil?
+    $app_config["extensions"] = [] unless $app_config["extensions"].is_a? Array
     if $app_config["android"] and $app_config["android"]["extensions"]
-      $app_config["extensions"] += $app_config["android"]["extensions"] if $app_config["extensions"]
+      $app_config["extensions"] += $app_config["android"]["extensions"]
       $app_config["android"]["extensions"] = nil
     end
 
+    $app_config["capabilities"] = [] if $app_config["capabilities"].nil?
+    $app_config["capabilities"] = [] unless $app_config["capabilities"].is_a? Array
+    if $app_config["android"] and $app_config["android"]["capabilities"]
+      $app_config["capabilities"] += $app_config["android"]["capabilities"]
+      $app_config["android"]["capabilities"] = nil
+    end
+    $app_config["capabilities"].map! { |cap| cap.is_a?(String) ? cap : nil }.delete_if { |cap| cap.nil? }
+
     mkdir_p $bindir if not File.exists? $bindir
     mkdir_p $rhobindir if not File.exists? $rhobindir
     mkdir_p $targetdir if not File.exists? $targetdir
@@ -328,7 +388,7 @@ namespace "build" do
 
     end
 #    desc "Build RhoBundle for android"
-    task :rhobundle => ["config:android","build:bundle:noxruby",:generate_sources,:extensions,:librhodes] do
+    task :rhobundle => ["config:android","build:bundle:noxruby",:extensions,:librhodes] do
 #      Rake::Task["build:bundle:noxruby"].execute
 
       assets = File.join(Jake.get_absolute($androidpath), "Rhodes", "assets")
@@ -345,62 +405,35 @@ namespace "build" do
       File.open(File.join(assets, "name"), "w") { |f| f.write($appname) }
     end
 
-    task :generate_sources => "config:android" do
-      # Generate gapikey.h
-      gapikey_h = File.join($androidpath, "Rhodes", "jni", "include", "gapikey.h")
-      gapi_defined = false
-      if File.file? gapikey_h
-        File.open(gapikey_h, 'r') do |f|
-          while line = f.gets
-            gapi_defined = true if line =~ /GOOGLE_API_KEY/
-            break if gapi_defined
-          end
-        end
-      end
-
-      if $use_geomapping != gapi_defined or not File.file? gapikey_h
-        File.open(gapikey_h, 'w') do |f|
-          f.puts "#ifndef RHO_GAPIKEY_H_411BFA4742CF4F2AAA3F6B411ED7514F"
-          f.puts "#define RHO_GAPIKEY_H_411BFA4742CF4F2AAA3F6B411ED7514F"
-          f.puts "#define GOOGLE_API_KEY \"#{$gapikey}\"" if $use_geomapping and !$gapikey.nil?
-          f.puts "#endif /* RHO_GAPIKEY_H_411BFA4742CF4F2AAA3F6B411ED7514F */"
-        end
-      end
-    end
-
     task :extensions => "config:android" do
 
+      ENV['RHO_PLATFORM'] = 'android'
       ENV["ANDROID_NDK"] = $androidndkpath
       ENV["ANDROID_API_LEVEL"] = ANDROID_API_LEVEL.to_s
       ENV["TARGET_TEMP_DIR"] = $extensionsdir
-      ENV["RHO_ROOT"] = $startdir
+      ENV["RHODES_ROOT_DIR"] = $startdir
       ENV["BUILD_DIR"] ||= $startdir + "/platform/android/build"
 
       mkdir_p $bindir + "/libs/" + $confdir + "/extensions" unless File.exist? $bindir + "/libs/" + $confdir + "/extensions"
 
       $app_config["extensions"].each do |ext|
-        ENV['TEMP_FILES_DIR'] = ENV["TARGET_TEMP_DIR"] + "/#{ext}"
-
-        rhoextpath = "lib/extensions/" + ext + "/ext"
-        appextpath = $app_path + "/extensions/" + ext + "/ext"
-        extpath = ""
+        $app_config["extpaths"].each do |p|
+          extpath = File.join(p, ext, 'ext')
+          if RUBY_PLATFORM =~ /(win|w)32$/
+            next unless File.exists? File.join(extpath, 'build.bat')
+          else
+            next unless File.executable? File.join(extpath, 'build')
+          end
 
-        puts appextpath
-        puts rhoextpath
+          ENV['TEMP_FILES_DIR'] = File.join(ENV["TARGET_TEMP_DIR"], ext)
 
-        if File.exists? appextpath
-          extpath = appextpath
-        elsif File.exists? rhoextpath
-          extpath = rhoextpath
-        end
-        
-        if RUBY_PLATFORM =~ /(win|w)32$/
-          puts Jake.run('build.bat', [], extpath) if File.exists? File.join(extpath, 'build.bat')
-        else
-          puts Jake.run('./build', [], extpath) if File.executable? File.join(extpath, 'build')
+          if RUBY_PLATFORM =~ /(win|w)32$/
+            puts Jake.run('build.bat', [], extpath)
+          else
+            puts Jake.run('./build', [], extpath)
+          end
+          exit 1 unless $? == 0
         end
-        exit 1 unless $? == 0
-        
       end
 
     end
@@ -586,13 +619,94 @@ namespace "build" do
 
     task :libs => [:libsqlite, :libcurl, :libruby, :libjson, :libstlport, :librhodb, :librhocommon, :librhomain, :librhosync, :librholog]
 
-    task :librhodes => :libs do
+    task :genconfig => "config:android" do
+      mkdir_p $appincdir unless File.directory? $appincdir
+
+      # Generate genconfig.h
+      genconfig_h = File.join($appincdir, 'genconfig.h')
+
+      gapi_already_enabled = false
+      caps_already_enabled = {}
+      ANDROID_PERMISSIONS.keys.each do |k|
+        caps_already_enabled[k] = false
+      end
+      if File.file? genconfig_h
+        File.open(genconfig_h, 'r') do |f|
+          while line = f.gets
+            if line =~ /^\s*#\s*define\s+RHO_GOOGLE_API_KEY\s+"[^"]*"\s*$/
+              gapi_already_enabled = true
+            else
+              ANDROID_PERMISSIONS.keys.each do |k|
+                re = /^\s*#\s*define\s+RHO_CAP_#{k.upcase}_ENABLED\s+true\s*$/
+                caps_already_enabled[k] = true if line =~ re
+              end
+            end
+          end
+        end
+      end
+
+      regenerate = false
+      regenerate = true unless File.file? genconfig_h
+      regenerate = $use_geomapping != gapi_already_enabled unless regenerate
+
+      caps_enabled = {}
+      ANDROID_PERMISSIONS.keys.each do |k|
+        caps_enabled[k] = $app_config["capabilities"].index(k) != nil
+        regenerate = true if caps_enabled[k] != caps_already_enabled[k]
+      end
+
+      if regenerate
+        puts "Need to regenerate genconfig.h"
+        $stdout.flush
+        File.open(genconfig_h, 'w') do |f|
+          f.puts "#ifndef RHO_GENCONFIG_H_411BFA4742CF4F2AAA3F6B411ED7514F"
+          f.puts "#define RHO_GENCONFIG_H_411BFA4742CF4F2AAA3F6B411ED7514F"
+          f.puts ""
+          f.puts "#define RHO_GOOGLE_API_KEY \"#{$gapikey}\"" if $use_geomapping and !$gapikey.nil?
+          caps_enabled.each do |k,v|
+            f.puts "#define RHO_CAP_#{k.upcase}_ENABLED #{v ? "true" : "false"}"
+          end
+          f.puts ""
+          f.puts "#endif /* RHO_GENCONFIG_H_411BFA4742CF4F2AAA3F6B411ED7514F */"
+        end
+      else
+        puts "No need to regenerate genconfig.h"
+        $stdout.flush
+      end
+
+      # Generate rhocaps.inc
+      rhocaps_inc = File.join($appincdir, 'rhocaps.inc')
+      caps_already_defined = []
+      if File.exists? rhocaps_inc
+        File.open(rhocaps_inc, 'r') do |f|
+          while line = f.gets
+            next unless line =~ /^\s*RHO_DEFINE_CAP\s*\(\s*([A-Z_]*)\s*\)\s*\s*$/
+            caps_already_defined << $1.downcase
+          end
+        end
+      end
+
+      if caps_already_defined.sort.uniq != ANDROID_PERMISSIONS.keys.sort.uniq
+        puts "Need to regenerate rhocaps.inc"
+        $stdout.flush
+        File.open(rhocaps_inc, 'w') do |f|
+          ANDROID_PERMISSIONS.keys.each do |k|
+            f.puts "RHO_DEFINE_CAP(#{k.upcase})"
+          end
+        end
+      else
+        puts "No need to regenerate rhocaps.inc"
+        $stdout.flush
+      end
+   end
+
+    task :librhodes => [:libs, :genconfig] do
       srcdir = File.join $androidpath, "Rhodes", "jni", "src"
-      incdir = File.join $androidpath, "Rhodes", "jni", "include"
-      objdir = File.join $rhobindir, $confdir, "librhodes"
+      objdir = File.join $bindir, "libs", $confdir, "librhodes"
       libname = File.join $bindir, "libs", $confdir, "librhodes.so"
 
       args = []
+      args << "-I#{$appincdir}"
       args << "-I#{srcdir}/../include"
       args << "-I#{$shareddir}"
       args << "-I#{$shareddir}/sqlite"
@@ -936,27 +1050,26 @@ namespace "run" do
       puts `"#{$adb}" -e wait-for-device`
 
       puts "Loading package into emulator"
-      theoutput = `"#{$adb}" -e install -r "#{apkfile}"`
       count = 0
       done = false
-      while count < 15
-        theoutput = `"#{$adb}" -e install -r "#{apkfile}"`
-        puts theoutput.to_s
-        $stdout.flush
+      while count < 20
+        f = Jake.run2($adb, ["-e", "install", "-r", apkfile], {:nowait => true})
+        theoutput = ""
+        while c = f.getc
+          $stdout.putc c
+          $stdout.flush
+          theoutput << c
+        end
+        f.close
 
         if theoutput.to_s.match(/Success/)
           done = true
           break
         end
 
-        if theoutput.to_s.match(/Failure/)
-          done = false
-          break
-        end
-
         puts "Failed to load (possibly because emulator not done launching)- retrying"
         $stdout.flush
-        sleep 5
+        sleep 1
         count += 1
       end
       puts "Loading complete, you may now run the application" if done

data/platform/android/build/androidcommon.rb

@@ -117,8 +117,7 @@ def cc_run(command, args, chdir = nil)
   end
   ret = $?
   FileUtils.cd save_cwd
-  puts "FAIL: #{command} failed with status #{ret.inspect.to_s}" unless ret.success?
-  ret.success?
+  ret == 0
 end
 
 def cc_compile(filename, objdir, additional = nil)

data/platform/android/build/librhocommon_build.files

@@ -1,9 +1,11 @@
+platform/shared/common/AppMenu.cpp
 platform/shared/common/PosixThreadImpl.cpp
 platform/shared/common/RhoConf.cpp
 platform/shared/common/RhoFile.cpp
 platform/shared/common/RhoThread.cpp
 platform/shared/common/SplashScreen.cpp
 platform/shared/common/Tokenizer.cpp
+platform/shared/common/AppMenu.cpp
 platform/shared/common/rhoparams.c
 platform/shared/net/AsyncHttp.cpp
 platform/shared/net/CURLNetRequest.cpp
@@ -11,5 +13,8 @@ platform/shared/net/HttpServer.cpp
 platform/shared/net/URI.cpp
 platform/shared/net/ssl.cpp
 platform/shared/rubyext/GeoLocation.cpp
+platform/shared/rubyext/RhoRuby.cpp
 platform/shared/rubyext/System.cpp
+platform/shared/rubyext/RhoRuby.cpp
 platform/shared/statistic/RhoProfiler.cpp
+platform/shared/unzip/unzip.cpp

data/platform/android/build/librhodes_build.files

@@ -7,7 +7,9 @@ platform/android/Rhodes/jni/src/geolocation.cpp
 platform/android/Rhodes/jni/src/logconf.cpp
 platform/android/Rhodes/jni/src/logger.cpp
 platform/android/Rhodes/jni/src/mapview.cpp
+platform/android/Rhodes/jni/src/menu.cpp
 platform/android/Rhodes/jni/src/nativebar.cpp
+platform/android/Rhodes/jni/src/navbar.cpp
 platform/android/Rhodes/jni/src/phonebook.cpp
 platform/android/Rhodes/jni/src/rhoconf.cpp
 platform/android/Rhodes/jni/src/rhodes.cpp