rhodes 3.3.3.beta.3 → 3.3.3.beta.4

data/Manifest.txt

@@ -938,6 +938,7 @@ lib/framework/rhom/rhom_object.rb
 lib/framework/rhom/rhom_object_factory.rb
 lib/framework/rhom/rhom_source.rb
 lib/framework/rhom.rb
+lib/framework/rhomotoapi.rb
 lib/framework/rhosystem.rb
 lib/framework/singleton.rb
 lib/framework/stringio.rb
@@ -973,6 +974,7 @@ platform/android/Rhodes/jni/Android.mk
 platform/android/Rhodes/jni/Application.mk
 platform/android/Rhodes/jni/genconfig.h
 platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc
+platform/android/Rhodes/jni/include/rhodes/fileapi.h
 platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_alert_Alert.h
 platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_alert_PopupActivity.h
 platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_bluetooth_RhoBluetoothManager.h
@@ -1106,12 +1108,13 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/event/Event.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/AbstractRhoExtension.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtData.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtension.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtManager.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtDataImpl.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManager.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerImpl.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerSingleton.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java
@@ -1879,6 +1882,8 @@ platform/iphone/Classes/DateTime.m
 platform/iphone/Classes/DateTimePicker.m
 platform/iphone/Classes/DateTimePickerDelegate.h
 platform/iphone/Classes/DateTimePickerDelegate.m
+platform/iphone/Classes/DateTimePickerViewController.h
+platform/iphone/Classes/DateTimePickerViewController.m
 platform/iphone/Classes/Dispatcher/Dispatcher.c
 platform/iphone/Classes/Dispatcher/Dispatcher.h
 platform/iphone/Classes/Event/Event.h
@@ -4478,6 +4483,8 @@ platform/wp7/rhodes/Properties/AssemblyInfo.cs
 platform/wp7/rhodes/Properties/WMAppManifest.xml
 platform/wp7/rhodes/Rhodes.csproj
 platform/wp7/rhodes/SplashScreenImage.jpg
+platform/wp7/rhodes/Toolkit.Content/ApplicationBar.Cancel.png
+platform/wp7/rhodes/Toolkit.Content/ApplicationBar.Check.png
 platform/wp7/rhodes.sln
 platform/wp7/RhoLogServer/Program.cs
 platform/wp7/RhoLogServer/Properties/AssemblyInfo.cs
@@ -4490,6 +4497,7 @@ platform/wp7/RhoRubyExtGen/RhoAsyncHttp.cs
 platform/wp7/RhoRubyExtGen/RhoCamera.cs
 platform/wp7/RhoRubyExtGen/RhoConfig.cs
 platform/wp7/RhoRubyExtGen/RhoDatabase.cs
+platform/wp7/RhoRubyExtGen/RhoDateTimePicker.cs
 platform/wp7/RhoRubyExtGen/RhoJSON.cs
 platform/wp7/RhoRubyExtGen/RhoNativeBar.cs
 platform/wp7/RhoRubyExtGen/RhoRubyExtGen.csproj
@@ -4548,6 +4556,7 @@ platform/wp7/RhoRubyLib/rubyext/RhoAsyncHttp.cs
 platform/wp7/RhoRubyLib/rubyext/RhoCamera.cs
 platform/wp7/RhoRubyLib/rubyext/RhoConfig.cs
 platform/wp7/RhoRubyLib/rubyext/RhoDatabase.cs
+platform/wp7/RhoRubyLib/rubyext/RhoDateTimePicker.cs
 platform/wp7/RhoRubyLib/rubyext/RhoJSON.cs
 platform/wp7/RhoRubyLib/rubyext/RhoKernelOps.cs
 platform/wp7/RhoRubyLib/rubyext/RhoNativeBar.cs
@@ -4562,6 +4571,8 @@ platform/wp7/RhoRubyLib/sync/SyncNotify.cs
 platform/wp7/RhoRubyLib/sync/SyncProtocol_3.cs
 platform/wp7/RhoRubyLib/sync/SyncSource.cs
 platform/wp7/RhoRubyLib/sync/SyncThread.cs
+platform/wp7/RhoRubyLib/views/RhoDateTimeDlg.xaml
+platform/wp7/RhoRubyLib/views/RhoDateTimeDlg.xaml.cs
 platform/wp7/RhoRubyLib/views/RhoTabHeader.xaml
 platform/wp7/RhoRubyLib/views/RhoTabHeader.xaml.cs
 platform/wp7/RhoRubyLib/views/RhoView.xaml
@@ -4677,6 +4688,7 @@ res/build-tools/iphonesim/Source/main.m
 res/build-tools/iphonesim/Source/nsprintf.h
 res/build-tools/iphonesim/Source/nsprintf.m
 res/build-tools/make.exe
+res/build-tools/Microsoft.Phone.Controls.Toolkit.dll
 res/build-tools/RhoAppRunner.exe
 res/build-tools/rhodes_pid.key
 res/build-tools/RhoLogServer.exe
@@ -4698,6 +4710,8 @@ res/build-tools/swig_patch/README
 res/build-tools/wmdc_connect.exe
 res/build-tools/wp7explorer.exe
 res/build-tools/xruby-0.3.3.jar
+res/build-tools/yuicompressor-2.4.7.jar
+res/build-tools/YUICompressorLicense.txt
 res/generators/rhogen.rb
 res/generators/templates/application/app/application.rb
 res/generators/templates/application/app/helpers/application_helper.rb
@@ -4803,6 +4817,7 @@ res/generators/templates/application/public/js/jquery-wp7-patch.js
 res/generators/templates/application/public/js/rho.js
 res/generators/templates/application/public/js/rhogeolocation-wm.js
 res/generators/templates/application/public/js/rhogeolocation.js
+res/generators/templates/application/public/js/syncengine.js
 res/generators/templates/application/public/js/wp7.js
 res/generators/templates/application/Rakefile
 res/generators/templates/application/rhoconfig.txt

data/Rakefile

@@ -150,8 +150,6 @@ def make_application_build_capabilities_header_file
   Jake.modify_file_if_content_changed(File.join($startdir, "platform", "shared", "common", "app_build_capabilities.h"), f)
 end
 
-
-
 def make_application_build_config_java_file
 
     f = StringIO.new("", "w+")
@@ -265,15 +263,12 @@ namespace "config" do
 
     application_build_configs = {}
 
-    #Process motorola extensions
-    if capabilities.index("motorola")
-        $app_config["capabilities"] += ["webkit_browser"] if $app_config["extensions"].index("webkit-browser")
-        $app_config["extensions"] += ["rhoelements"]
-        
-        idx_barcode = $app_config["extensions"].index("barcode")
-        $app_config["extensions"][idx_barcode] = "barcode-moto" if idx_barcode
-
-        $app_config["capabilities"] += ["barcode"] if $app_config["extensions"].index("barcode-moto")
+    #Process rhoelements settings
+    if $app_config["app_type"] == 'rhoelements'
+        $app_config["capabilities"] += ["motorola"] unless $app_config["capabilities"].index("motorola")
+        $app_config["extensions"] += ["rhoelementsext"] if $current_platform == 'wm'
+        $app_config["extensions"] += ["motoapi"] #extension with plug-ins
+        $app_config["extensions"] += ['webkit-browser'] unless $app_config["extensions"].index("webkit-browser")
         
         #check for RE2 plugins
         plugins = ""
@@ -284,7 +279,20 @@ namespace "config" do
             end
         end
         
+        if plugins.length() == 0
+            plugins = "ALL"    
+        end
+        
         application_build_configs['moto-plugins'] = plugins if plugins.length() > 0
+        
+    end
+    
+    if $app_config["capabilities"].index("motorola")
+        if $app_config["extensions"].index("webkit-browser")
+            $app_config["capabilities"] += ["webkit_browser"]
+            $app_config["extensions"].delete("webkit-browser")
+        end    
+        $app_config["extensions"] += ["rhoelements"]
     end
 
     puts "$app_config['extensions'] : #{$app_config['extensions'].inspect}"   
@@ -318,6 +326,10 @@ namespace "config" do
     $rhologhostport = 52363 unless $rhologhostport
 	$rhologhostaddr = Jake.localip()
 
+    $obfuscate_js = (($app_config["obfuscate"].nil? || $app_config["obfuscate"]["js"].nil?) ? nil : 1 )
+    $obfuscate_css = (($app_config["obfuscate"].nil? || $app_config["obfuscate"]["css"].nil?) ? nil : 1 )
+    $obfuscate_exclude = ($app_config["obfuscate"].nil? ? nil : $app_config["obfuscate"]["exclude_dirs"] )
+    $obfuscator = 'res/build-tools/yuicompressor-2.4.7.jar'
   end
 
   task :qt do
@@ -401,6 +413,8 @@ def set_linker_flags
 end
 
 def add_extension(path,dest)
+  puts 'add_extension - ' + path.to_s + " - " + dest.to_s
+  
   start = pwd
   chdir path if File.directory?(path)
 
@@ -417,6 +431,8 @@ def init_extensions(startdir, dest)
     
   puts 'init extensions'
   $app_config["extensions"].each do |extname|  
+    puts 'ext - ' + extname
+    
     extpath = nil
     extpaths.each do |p|
       ep = File.join(p, extname)
@@ -425,19 +441,24 @@ def init_extensions(startdir, dest)
         break
       end
     end    
+    
+    puts '1'
 
     if extpath.nil?
       begin
         $rhodes_extensions = nil
         require extname
-        extpath = $rhodes_extensions[0] unless $rhodes_extensions.nil?        
-        $app_config["extpaths"] << extpath 
+        puts '1-2'
+        if $rhodes_extensions
+            extpath = $rhodes_extensions[0]
+            $app_config["extpaths"] << extpath
+        end    
       rescue Exception => e      
         puts "exception"  
       end
     end
-    
-    unless extpath.nil?
+        
+    unless extpath.nil?      
       add_extension(extpath, dest) unless dest.nil?
 
       if $config["platform"] != "bb"
@@ -469,8 +490,10 @@ def init_extensions(startdir, dest)
             extlibs += libs
           end
         end
-      end    
+      end
+      
     end
+    
   end
   
   exts = File.join($startdir, "platform", "shared", "ruby", "ext", "rho", "extensions.c")
@@ -519,6 +542,8 @@ def init_extensions(startdir, dest)
     nativelib.each { |lib| add_linker_library(lib) }
 
     set_linker_flags
+    
+    #exit
   end
   
   unless $app_config["constants"].nil?
@@ -539,6 +564,28 @@ def init_extensions(startdir, dest)
 
 end
 
+def public_folder_cp_r(src_dir,dst_dir,level,obfuscate)
+  mkdir_p dst_dir if not File.exists? dst_dir
+  Dir.foreach(src_dir) do |filename|
+    next if filename.eql?('.') || filename.eql?('..')
+    filepath = src_dir + '/' + filename
+    dst_path = dst_dir + '/' + filename
+    if File.directory?(filepath)
+      public_folder_cp_r(filepath,dst_path,(level+1),((obfuscate==1) && ((level>0) || $obfuscate_exclude.nil? || !$obfuscate_exclude.include?(filename)) ? 1 : 0))
+    else
+      if (obfuscate==1) && (((!$obfuscate_js.nil?) && File.extname(filename).eql?(".js")) || ((!$obfuscate_css.nil?) && File.extname(filename).eql?(".css")))
+        puts Jake.run('java',['-jar', $obfuscator, filepath, '-o', dst_path])
+        unless $? == 0
+          puts "Obfuscation error"
+          exit 1
+        end
+      else
+        cp filepath, dst_path, :preserve => true
+      end
+    end
+  end
+end
+
 def common_bundle_start(startdir, dest)
   puts "common_bundle_start"
   
@@ -569,8 +616,14 @@ def common_bundle_start(startdir, dest)
   chdir startdir
   #throw "ME"
   cp_r app + '/app',File.join($srcdir,'apps'), :preserve => true
-  cp_r app + '/public', File.join($srcdir,'apps'), :preserve => true if File.exists? app + '/public'
-  cp   app + '/rhoconfig.txt', File.join($srcdir,'apps'), :preserve => true
+  if File.exists? app + '/public'
+    if $obfuscate_js.nil? && $obfuscate_css.nil?
+      cp_r app + '/public', File.join($srcdir,'apps'), :preserve => true 
+    else
+      public_folder_cp_r app + '/public', File.join($srcdir,'apps/public'), 0, 1
+    end
+  end
+  cp app + '/rhoconfig.txt', File.join($srcdir,'apps'), :preserve => true
 
   app_version = "\r\napp_version='#{$app_config["version"]}'"  
   File.open(File.join($srcdir,'apps/rhoconfig.txt'), "a"){ |f| f.write(app_version) }
@@ -601,7 +654,7 @@ def common_bundle_start(startdir, dest)
       end
       
       Dir.glob("**/*.wm.*").each { |f| rm f }
-	  Dir.glob("**/*.wp7.*").each { |f| rm f }
+	    Dir.glob("**/*.wp7.*").each { |f| rm f }
       Dir.glob("**/*.iphone.*").each { |f| rm f }
       Dir.glob("**/*.bb.*").each { |f| rm f }
       Dir.glob("**/*.bb6.*").each { |f| rm f }
@@ -637,11 +690,11 @@ def process_exclude_folders
       excl << $config["excludedirs"][exclude_platform] if $config["excludedirs"][exclude_platform]
   end  
   
-  if excl
-      chdir File.join($srcdir, 'apps')
+  if excl.size() > 0
+      chdir File.join($srcdir)#, 'apps')
   
       excl.each do |mask|
-        Dir.glob(mask).each {|f| rm_rf f}
+        Dir.glob(mask).each {|f| puts "f: #{f}"; rm_rf f}
       end
   end
 
@@ -824,21 +877,17 @@ namespace "build" do
         sh %{zip -r upgrade_bundle.zip .}
       end
 
-      
       cp   new_zip_file, $bindir
       
       rm   new_zip_file
       
-      
-      
     end
     
-    
-    
+
     task :noiseq do
       app = $app_path
       rhodeslib = File.dirname(__FILE__) + "/lib/framework"
-	  compileERB = "lib/build/compileERB/bb.rb"
+	    compileERB = "lib/build/compileERB/bb.rb"
       startdir = pwd
       dest = $srcdir + "/lib"      
 

data/doc/build.txt

@@ -1,4 +1,4 @@
-# Build Rhodes Application
+# Build Rhodes Application
 
 This page describes how to build Rhodes Application on all of our supported platforms: iPhone, RIM Blackberry, Windows Mobile and Android.
 
@@ -1103,7 +1103,7 @@ Rholog.txt is placed in `<rhodes folder>\platform\wm\bin\win32\rhodes\Debug\rho`
 * Follow [All Platforms Prerequisites](#all-platforms-prerequisites)
 * Windows 7 OS
 * Visual Studio 2010 installed or VS Express for Windows Phone and VS Express for C#
-    * [Windows Phone Developer Tools 7.1 Beta](http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=11321)
+    * [Windows Phone SDK 7.1](http://www.microsoft.com/download/en/details.aspx?id=27570)
     
 * Add path to `msbuild` to `rhobuild.yml` in rhodes folder. For example:
 
@@ -1161,7 +1161,9 @@ NOTE: in form action when using url_for specify :action => :create to call creat
 
         $rake run:wp
 
-* Run application device:    
+NOTE: You may use your computer keyboard with Windows Phone 7 emulator. By default it is disabled, but you can enable it pressing **PgUp** key. While it is enabled a device rotation simulation is not supported. To rotate device you need to disable keyboard support pressing **PgDown** key.  Look [MSDN page](http://msdn.microsoft.com/en-us/library/ff754352(v=vs.92).aspx) for much more details on this topic.
+
+* Run application device:
 
         $rake run:wp:device
 

data/doc/configuration.txt

@@ -46,6 +46,19 @@ Run application with special parameter:
 	:::ruby
 	System::run_app( 'app_name', "security_token=123" )
 
+### JavaScript and CSS Obfuscation
+
+To enable JavaScript and/or CSS code obfuscation at `public` folder of Rhodes application just add the following lines to the build.yml:
+
+	obfuscate:
+	  js: yes
+	  css: yes
+	  exclude_dirs: ["jqmobile", "jqtouch", "jquery"]
+
+If JavaScript or CSS code obfuscation is not required, then just omit `js` or `css` line accordingly.
+
+NOTE: The `jqmobile`, `jqtouch`, and `jquery` folders <b>must</b> be excluded when obfuscation is enabled, because the obfuscated versions of these libraries are there already.
+
 ## Run time configuration
 Each Rhodes application contains a configuration file called "rhoconfig.txt".  A typical rhoconfig.txt will look like the following when an app is generated:
 

data/doc/device-caps.txt

@@ -191,7 +191,7 @@ See the [Configuration](configuration#build-time-configuration) section for more
 
 The GPS receiver consumes a significant amount of energy, and should be switched off most of the time in order to preserve the device's battery life.
 Any call to GeoLocation method or notification call back will power up the GPS receiver.
-The GPS receiver will be switched off authomatically after some time (see [Configuration](configuration#run-time-configuration) for parameters) or explicitly by GeoLocation.turnoff.
+The GPS receiver will be switched off automatically after some time (see [Configuration](configuration#run-time-configuration) for parameters) or explicitly by GeoLocation.turnoff.
 Also note that it usually takes a while to acquire the device's current position; in some cases, it may take several minutes and may not work at all indoors.
 
 Note that in old rhodes versions (up to 2.3.1) this feature uses only GPS location provider. In more recent rhodes, it also uses network based location determination. Network based location
@@ -200,7 +200,7 @@ Rhodes will update location using network data until the GPS signal has been rec
 
 There are two ways to use GeoLocation.
 
- * Syncronous call to GeoLocation module for particular value.
+ * Synchronous call to GeoLocation module for particular value.
  * Set GeoLocation notification and track location by call back. In this case all location values are passed to notification as parameters.
 
 Note that GeoLocation is switched off automatically when the application goes into the background, and is switched on as the application goes back to foreground.
@@ -246,18 +246,28 @@ Set callback to track location changes.
 		callback, callback_param="", ping_gpssystem_timeout=0)
 
 * callback - callback url; after the callback has been called once, it will be automatically called repeatedly with the current location coordinates passed to the callback as parameters. (You need not reset the callback within the callback.)
+* callback_param: known_position, latitude, longitude, available, status, error_code, accuracy
 * ping_gpssystem_timeout - optional, if 0 system timeout used, use to redefine timeout in sec for gps system reading
-* callback params: known_position, latitude, longitude, available, status('error', 'ok'), error_code(from RhoError), accuracy(horizontal radius in meters; iOS and Android)
+
+Here are the callback parameters for the set_notification callback.
+
+* known_position - 1 or 0.
+* latitude
+* longitude
+* available - 1 or 0. Availability of GeoLocation: not only does the hardware exist, but also the user can turn GPS off in phone settings, or not allowed GPS activity on iPhone, etc.)
+* status - 'error' or 'ok'
+* error_code - from RhoError.
+* accuracy - horizontal radius in meters; iOS and Android.
 
 **NOTE: You should call GeoLocation.set_notification only once. The current behavior of the callback is that it will be called forever until it is stopped; you need to call `GeoLocation.turnoff` to stop it. The previous behavior was that the callback was called once and needed to be reset.**
 
 Also there are two parameters you can set in rhoconfig.txt:
 
-Geo location update period (in seconds). Used as the default value for the third parameter (ping_gpssystem_timeout) of GeoLocation.set_notification method. This value is passed to OS API and behaviour and is OS dependent (it should be used by system as a tip on how often to call notification back). Ignored on iOS.
+GeoLocation update period (in seconds): `gps_ping_timeout_sec`. Used as the default value for the third parameter (ping_gpssystem_timeout) of GeoLocation.set_notification method. This value is passed to OS API and behaviour and is OS dependent (it should be used by system as a tip on how often to call notification back). Ignored on iOS.
 
 	gps_ping_timeout_sec = 30
 
-Geo location inactivity timeout (in seconds). This parameter controls the time after that location service is switched off in case there are no calls to the service. It is also used as the time period to drop cached location value.
+GeoLocation inactivity timeout (in seconds): `geo_location_inactivity_timeout`. This parameter controls the time after that location service is switched off in case there are no calls to the service. It is also used as the time period to drop cached location value.
 	
 	geo_location_inactivity_timeout = gps_ping_timeout_sec * 10
 
@@ -275,7 +285,7 @@ Get the distance between two points in miles.
 
 GeoCoding: You can use any free web service for direct and reverse geocoding. See our complete example of using Google geocoding web service in [Rhodes-System-Api-Samples example](http://github.com/rhomobile/rhodes-system-api-samples/tree/master/app/GeoCoding).
 
-**NOTE: On iOS, real GPS starts working after the first access to the GeoLocation module. Real GPS hardware is switched off after a call to GeoLocation.turnoff. But keep in mind - any call to GeoLocation, such as getting latitude, starts the hardware GPS again!**
+**NOTE: On iOS and Android, real GPS starts working after the first access to the GeoLocation module. Real GPS hardware is switched off after a call to GeoLocation.turnoff. But keep in mind - any call to GeoLocation, such as getting latitude, starts the hardware GPS again!**
 
 #### Testing GeoLocation
 
@@ -1035,9 +1045,10 @@ Automatic push message parameters handling takes its place in case no custom pus
       "rho_push"
     end
 
-
 ### iPhone
-iPhone PUSH support uses the Apple Push Notification Service (APNS) introduced in iPhone SDK 3.0.  In order to use the service, you will need to obtain a push-enabled provisioning profile and a server-side push certificate used for encrypting RhoConnect->APNS traffic.
+<a id="iphone-push-setup"></a>iPhone PUSH support uses the Apple Push Notification Service (APNS) introduced in iPhone SDK 3.0.  In order to use the service, you will need to obtain a push-enabled provisioning profile and a server-side push certificate used for encrypting RhoConnect->APNS traffic.
+
+In case of iPhone, regardless of the operation, the user will be presented with the option to activate the application if it is not running.
 
 **NOTE: For testing push, you will need to build and deploy your application to a physical iPhone (or iPad) device. Apple does not support testing push on simulators.**
 
@@ -1063,10 +1074,13 @@ Setting up the device is the same process as [building any normal Rhodes applica
 
 	2010-08-19 10:14:22.627 rhorunner[1486:307] Device token is <10fd92ab fa8ee481 55d9af6e 73290863 22b323fd 0d18fdbd 19e92d03 c0fef7c8>
 
-This confirms that your application is running with push enabled. Once you login to the RhoConnect application and sync, you will see the device registered on the RhoConnect console under the user id you used to login. Now you are ready to [test push from your RhoConnect application](/rhoconnect/push#testing-push-in-the-web-console).
+This confirms that your application is running with push enabled. Once you login to the RhoConnect application and sync, you will see the device registered on the RhoConnect console under the user id you used to login. Now you are ready to [test push from your RhoConnect application](/rhoconnect/push-server-setup#testing-push-in-the-rhoconnect-web-console).
+
+#### Alert Audio File Setup for iPhone
+In case of iPhone, audio files for the push alert should be placed in the `/public/alerts` folder and build script will copy them into root of the application main bundle (iPhone wouldn't play file from any other place).
 
 ### Android
-Android PUSH support uses the Android Cloud to Device Messaging (AC2DM) system introduced in Android 2.2 (Froyo). In order to use the service, you will need to register your role-based google account (or use existing one) and then register this account in [Google C2DM program](http://code.google.com/android/c2dm/signup.html).
+<a id="android-push-setup"></a>Android PUSH support uses the Android Cloud to Device Messaging (AC2DM) system introduced in Android 2.2 (Froyo). In order to use the service, you will need to register your role-based google account (or use existing one) and then register this account in [Google C2DM program](http://code.google.com/android/c2dm/signup.html).
 
 Here are some guidelines for developing and testing an Android application that uses the C2DM feature:
 
@@ -1086,7 +1100,7 @@ Then modify your application's build.yml and specify there google account used t
 	    sender: push-app@gmail.com
         
 
-This is the same address used by RhoConnect to retrieve authtoken. See [here](/rhoconnect/push#android) for more information.
+This is the same address used by RhoConnect to retrieve authtoken. See [here](/rhoconnect/push-server-setup#testing-push-in-the-rhoconnect-web-console) for more information.
 
 **NOTE: WARNING! This e-mail address MUST NOT be the same as origin of google account on phone! This mean that google account registered on your phone/emulator MUST NOT be push-app@gmail.com; it MUST be another one. This is known bug in Android C2DM implementation - if sender and receiver are the same, underlying android service crash and lose message. More details [here](http://groups.google.com/group/android-c2dm/browse_thread/thread/128790789c4e9d6a/67aca1e1764724d4). This is actual not for all Android versions.**
 
@@ -1100,15 +1114,16 @@ If no push notification mode is specified in build.yml then no notifications are
 	android:
 	  push:
 	    notification: background
-        
 
 ### BlackBerry
-Notifications to BlackBerry are sent using PAP 2.0 message through a BES/MDS server.  
+<a id="blackberry-push-setup"></a>Notifications to BlackBerry are sent using PAP 2.0 message through a BES/MDS server.
 
 On the simulator, this is done via the MDS simulator tool (which you've probably already seen in the form of a console window everytime you do 'rake run:bb'). On the device, this is done through the BES/MDS server that the phone is configured to use.  
 
 These instructions assume you are familiar with BES/MDS concepts (for more information please see [here](http://na.blackberry.com/eng/services/business/server/full/)).
 
+In case of Blackberry, if the application is in the background, an alert operation will bring the application upfront; other operations will not. 
+
 #### Setup MDS Simulator
 <i>Make sure you close the BlackBerry simulator and MDS simulator before continuing for your changes to take effect!</i>
 
@@ -1125,7 +1140,7 @@ To listen for incoming messages on BlackBerry, the Rhodes application will start
 
 **NOTE: For testing push, the BlackBerry simulator requires a 'kickstart' process.  When the simulator starts, open the web browser on the simulator and navigate to any web page (i.e. http://m.google.com/). Now your simulator is ready to receive push messages.**
 
-Now you are ready to [testing Push in the RhoConnect Web Console](/rhoconnect/push#testing-push-in-the-web-console).
+Now you are ready to [testing Push in the RhoConnect Web Console](/rhoconnect/push-server-setup#testing-push-in-the-rhoconnect-web-console).
 
 #### Setup BlackBerry Device
 To test push on a BlackBerry device, you will need to use a device that is configured with a BES server. Then, all you need to do is [build your Rhodes application for the device](build#build-for-blackberry).
@@ -1144,6 +1159,9 @@ These parameters from [PushApplicationDescriptor](http://www.blackberry.com/deve
 	push_service_appname = 'RhoTest'
 	push_service_type = 'BPAS'
 
+#### Alert Audio File Setup for Blackberry
+In case of Blackberry, if the audio file is in the public folder, the file name will be `/apps/public/alerts/test-file.mp3`.
+
 ### Push Callback
 Rhodes applications can also handle PUSH notifications that didn't come from a RhoConnect application. 
 
@@ -1175,10 +1193,7 @@ Example:
 ### Push Payload
 The Rhodes push payload allows more than one operation in a single message. 
  
-There are no required operations. There are default operations - if operation is not specified, no default operation will be performed. 
-
-In case of Blackberry if application in background, alert operation will bring application upfront; other operations will not. 
-In case of iPhone, regardless of operation, user will be presented with option to activate application if it is not running.
+There are no required operations. There are default operations - if operation is not specified, no default operation will be performed.
 
 Payload may include following operations which client will perform when it receives the PUSH message:
 
@@ -1193,24 +1208,22 @@ alert - bring app upfront and show specified message
 
 vibrate - vibrate for the specified number of milliseconds, up to 25500; if 0 or no duration is specified, it will vibrate for 2500 millisecond.
 
-    To enable vibrate in your rhodes application in build.yml:
+To enable vibrate in your rhodes application in build.yml:
 
-	    capabilities:
-	      - vibrate
+	capabilities:
+	 - vibrate
     	  
-    Example of vibrate call:
+Example of vibrate call:
      
-	    vibrate = 2000 #=> duration in milliseconds
+	vibrate = 2000 #=> duration in milliseconds
 
 sound - play specified file if media type supported by the phone. iPhone will ignore media-type parameter.
 	:::ruby
 	sound = "hello.mp3"
 
-File should be included to the application bundle in `/public/alerts` folder
+File should be included to the application bundle in `/public/alerts` folder.
 
-In case of Blackberry, if file is in public folder, file name will be `/apps/public/alerts/test-file.mp3` Media type should be either specified explicitly or may be recognized from file extension. Known file extensions are: .mp3 - audio/mpeg; .wav - audio/x-wav   
-
-In case of iPhone, audio files should be placed in the `/public/alerts` folder and build script will copy them into root of the application main bundle (iPhone wouldn't play file from any other place).
+Media type should be either specified explicitly or may be recognized from file extension. Known file extensions are: .mp3 - audio/mpeg; .wav - audio/x-wav.
 
 ## Alerts
 
@@ -1469,6 +1482,12 @@ Annotations - array of map annotation objects (list of pins on the map). Annotat
 * image_y_offset - int vertical coordinate of image anchor (ancor point placed to annotation point on map). Set image height/2 for center
 * pass_location  - then true, location coordinates added to url in the format: latitude=xx.xxx&longitude=xx.xxx
 
+Map settings in rhoconfig.txt :
+
+* ESRI_map_url_roadmap - URL of ESRI roadmap tile map server (example:  'http://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/')
+* ESRI_map_url_satellite - URL of ESRI satellite tile map server (example:  'http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/')
+* OSM_map_url_roadmap - URL of OSM tile map server (example:  'http://tile.openstreetmap.org/')
+
 Enable file caching for map tiles - file cache can use for offline map browsing:
 	:::ruby
 	MapView.set_file_caching_enable(1)