rhodes 5.5.0.7 → 5.5.0.22

data/platform/shared/qt/rhodes/qkineticscroller_p.h

@@ -53,7 +53,7 @@
 #include <QTime>
 #include <QPointer>
 #include <QObject>
-#include <qkineticscroller.h>
+#include "qkineticscroller.h"
 #include <QEvent>
 #if QT_VERSION < 0x040700
 #  include <QTime>

data/platform/shared/qt/rhodes/qtscrollerfilter.cpp

@@ -1,6 +1,6 @@
-#include <qtscrollerfilter_p.h>
-#include <qtscrollevent.h>
-#include <qtscroller.h>
+#include "qtscrollerfilter_p.h"
+#include "qtscrollevent.h"
+#include "qtscroller.h"
 #include <QAbstractItemView>
 #include <QScrollBar>
 #include <QGestureEvent>

data/platform/shared/qt/rhodes/qtscrollevent.cpp

@@ -1,5 +1,5 @@
-#include <qtscrollevent.h>
-#include <qtscrollevent_p.h>
+#include "qtscrollevent.h"
+#include "qtscrollevent_p.h"
 
 /*!
     \class QtScrollPrepareEvent

data/platform/shared/qt/rhodes/qwebviewkineticscroller.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qwebviewkineticscroller.h>
+#include "qwebviewkineticscroller.h"
 #include <QApplication>
 #include <QGraphicsView>
 #include <QWebView>

data/platform/shared/qt/rhodes/qwebviewkineticscroller.h

@@ -42,7 +42,7 @@
 #ifndef QWEBVIEWKINETICSCROLLER_H
 #define QWEBVIEWKINETICSCROLLER_H
 
-#include <qkineticscroller.h>
+#include "qkineticscroller.h"
 #include <QWebView>
 
 QT_BEGIN_HEADER

data/platform/wm/build/wm.rake

@@ -135,8 +135,10 @@ module WM
     $build_persistent_cab = Jake.getBuildBoolProp("persistent")
     $run_on_startup = Jake.getBuildBoolProp("startAtBoot")
     $build_cab = true
-    $is_webkit_engine = $app_config["wm"]["webengine"] == "Webkit" if !$app_config["wm"]["webengine"].nil?
-    $is_webkit_engine = true if $is_webkit_engine.nil?
+    $is_webkit_engine = false
+    #$is_webkit_engine = true if !$app_config["wm"]["extensions"]["webkit"].nil? 
+    #$app_config["wm"]["webengine"] == "webkit" if !$app_config["wm"]["webengine"].nil?
+    #$is_webkit_engine = false if $is_webkit_engine.nil?
 
     if $wk_data_dir.nil?
       $wk_data_dir = File.join($startdir, "libs/data") #"/Program Files" # its fake value for running without symbol extensions. do not delete
@@ -572,15 +574,17 @@ def build_cab
     makePersistentFiles($srcdir, additional_dlls_persistent_paths, nil, $webkit_out_of_process, reg_keys_filename)
   end
 
+=begin
   webkit = 'none'
   if $is_webkit_engine && $webkit_capability 
     webkit = $webkit_out_of_process ? 'out_of_process' : 'in_process'
   end
+=end
 
   #TODO TAU
   webkit = 'none'
   
-  if $is_webkit_engine && $webkit_capability 
+  if $is_webkit_engine #&& $webkit_capability 
     webkit = 'in_process'
   end
   

data/platform/wm/rhodes/browser/BrowserFactory.cpp

@@ -85,7 +85,7 @@ IBrowserEngine* BrowserFactory::create(HWND hwndParent)
     //TODO TAU
 	//String             xmlConfigType   = rho_wmimpl_get_webengine();
 	String             xmlConfigType;
-    String             rhoConfigType   = RHOCONF().getString("webengine");  
+    String             rhoConfigType   = RHOCONF().getString("webengine");
     
     if (get_app_build_config_item("webengine"))
     {
@@ -110,12 +110,10 @@ IBrowserEngine* BrowserFactory::create(HWND hwndParent)
 
     if (selBrowserType == eNone)
     {
-        selBrowserType = eWebkit;
-        LOG(INFO) + "Browser engine was not set in config`s. Selected Webkit engine automatically.";
+        selBrowserType = eIE;
+        LOG(INFO) + "WebKit extension missing. Selected Internet Explorer engine automatically.";
     } 
 
-	//TAU
-	selBrowserType = eWebkit;
     m_selBrowserType = selBrowserType;
 
     switch (selBrowserType)
@@ -158,4 +156,4 @@ EBrowserEngineType BrowserFactory::getCurrentBrowserType()
 extern "C" bool rho_wmimpl_is_browser_ieforwm()
 {
     return (bool)(rho::eIE == rho::BrowserFactory::getCurrentBrowserType());
-}
+}

data/platform/wm/rhodes/browser/stubs.cpp

@@ -0,0 +1,5 @@
+// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!
+#include "StdAfx.h"
+#include "common/RhoStd.h"
+#include "IBrowserEngine.h"
+rho::IBrowserEngine* rho_wmimpl_get_webkitBrowserEngine(HWND hwndParent, HINSTANCE rhoAppInstance) {return 0;}

data/platform/wm/rhodes/rhodes.vcproj

@@ -454,7 +454,7 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\sas"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\Kitchen Sink"
 				RegisterOutput="0"
 				AdditionalFiles=""
 			/>
@@ -1095,7 +1095,7 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\sas"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\Kitchen Sink"
 				RegisterOutput="0"
 				AdditionalFiles=""
 			/>
@@ -2031,6 +2031,31 @@
 		</Configuration>
 	</Configurations>
 	<References>
+		<AssemblyReference
+			RelativePath="System.dll"
+			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.Data.dll"
+			AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.Drawing.dll"
+			AssemblyName="System.Drawing, Version=2.0.0.0, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.Windows.Forms.dll"
+			AssemblyName="System.Windows.Forms, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.XML.dll"
+			AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
 	</References>
 	<Files>
 		<Filter
@@ -2999,6 +3024,10 @@
 				RelativePath=".\browser\IEBrowserEngine.h"
 				>
 			</File>
+			<File
+				RelativePath=".\browser\stubs.cpp"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

data/rakefile.rb

@@ -74,6 +74,7 @@ end
 #------------------------------------------------------------------------
 
 $app_basedir = pwd
+$is_webkit_engine = false
 $startdir = File.dirname(__FILE__)
 $startdir.gsub!('\\', '/')
 
@@ -2125,6 +2126,8 @@ namespace "config" do
     #    $app_config["extensions"].delete("audiocapture")
     #end
 
+    $app_config['extensions'].delete('barcode') if ( $app_config['extensions'].index('enterprise-barcode') || $app_config['extensions'].index('allbarcode') )
+
     $hidden_app = $app_config["hidden_app"].nil?() ? "0" : $app_config["hidden_app"]
 
     #application build configs
@@ -2484,6 +2487,10 @@ def init_extensions(dest, mode = "")
 
   $app_config["extensions"].each do |extname|
     puts 'ext - ' + extname
+    
+    if extname == "webkit"
+		$is_webkit_engine = true
+    end
 
     extpath = nil
     extpaths.each do |p|
@@ -2668,6 +2675,23 @@ def init_extensions(dest, mode = "")
 
   end
 
+  stubs = File.join($startdir, "platform", "wm", "rhodes", "browser", "stubs.cpp")
+  if $is_webkit_engine == false
+	File.open(stubs, "w+") do |f|
+        f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
+        f.puts "#include \"StdAfx.h\""
+        f.puts "#include \"common/RhoStd.h\""
+        f.puts "#include \"IBrowserEngine.h\""
+        f.puts "rho::IBrowserEngine* rho_wmimpl_get_webkitBrowserEngine(HWND hwndParent, HINSTANCE rhoAppInstance) {return 0;}"
+        Jake.modify_file_if_content_changed( stubs, f )
+    end
+  else
+	File.open(stubs, "w+") do |f|
+        f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
+        f.puts "#include \"StdAfx.h\""
+        Jake.modify_file_if_content_changed( stubs, f )
+    end
+  end
 
   if ($ruby_only_extensions_list)
     BuildOutput.warning([

data/res/generators/templates/application/app/Settings/home.erb

@@ -14,7 +14,7 @@
         </div>
         <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
           <%% if SyncEngine::logged_in > 0 %>
-          <a href="<%%= url_for :controller => :Settings, :action => :logout %" class="btn btn-default btn-sm pull-right">
+          <a href="<%%= url_for :controller => :Settings, :action => :logout %>" class="btn btn-default btn-sm pull-right">
             Logout
           </a>
           <%% else %>

data/res/generators/templates/application/build.yml

@@ -1,13 +1,43 @@
+## Note: sdk is full path to Rhodes root. If not defined - automatically find latest installed Rhodes gem
 #sdk: "<%=@sdk_path%>"
 sdkversion: <%=Rhodes::VERSION%>
 name: <%=@app_name%>
 version: 1.0
 vendor: rhomobile
+## Note: rho_app_id send to RhoConnect server for identify application (used in multi-push configuration only)
+## we recommend make it same with BundleIdentifier
+rho_app_id: com.rhomobile.<%=@app_name_cleared%>
 build: debug
 applog: rholog.txt
+
+## Note: enable specific device capabilities for aplication
+#capabilities:
+  ## allows use of audio hardware (record audio, modify audio settings)
+  #- audio
+  ## allows use of hardware camera
+  #- camera
+  ## allows use of geo location service
+  #- gps
+  ## allows read device network state (connected/disconnected)
+  #- network_state
+  ## allow make calls/read phone state
+  #- phone
+  ## allow read/modify personal information and contacts
+  #- pim
+  ## allows use of PUSH on device
+  #- push
+  ## allows use of hardware vibration mechanism
+  #- vibrate
+  ## allows use of bluetooth hardware
+  #- bluetooth
+  ## allows access to default device calendar
+  #- calendar
+  ## allows writing to the SD card on Android devices
+  #- sdcard
+
 iphone:
   configuration: Release
-  sdk: iphonesimulator10.0
+  sdk: iphonesimulator10.2
   #provisionprofile:
   #codesignidentity:
   #entitlements:
@@ -15,14 +45,41 @@ iphone:
   BundleURLScheme: <%=@app_name_cleared%>
   production:
     ipa_itunesartwork_image: "./production/iTunesArtwork.png"
-  # Note: Specifies the URL schemes the app is able to call using Rho.System.runApplication
-  #ApplicationQueriesSchemes: ["scheme1", "scheme2"]
+  ## Note: Specifies the URL schemes the app is able to call using Rho.System.runApplication
+  #ApplicationQueriesSchemes: ['scheme1', 'scheme2']
+  ## Note: Specifies list of HTTP domains for connect from application
+  #http_connection_domains: ['domain1.com', 'domain2.org']
+  ## Note: Specify remove of Info.plist keys - use this if you need to remove some keys from Info.plist
+  ## This example remove two keys with unsupported screen orientation and also remove UIRequiredDeviceCapabilities key
+  #info_plist_data_remove:
+  #- UIRequiredDeviceCapabilities
+  #- UISupportedInterfaceOrientations: ['UIInterfaceOrientationLandscapeLeft', 'UIInterfaceOrientationLandscapeRight']
+  ## Note: Specifies set/modify of Info.plist keys with content(hash) - all of this items will be apply to final Info.plist of application. You can specify any Ino.plist data in this parameter.
+  ## this example content is equal of two upper parameters content (URLS schemes and HTTP domains) - you can use manually setup this parameters for more detailed setup instead default.
+  ## in this example we show additional disable of perfect forward secrecy (PFS) for domain3(https)
+  #info_plist_data:
+  #  LSApplicationQueriesSchemes: ['scheme1', 'scheme2']
+  #  NSAppTransportSecurity:
+  #    NSAllowsArbitraryLoads: true
+  #    NSExceptionDomains:
+  #      domain1.com:
+  #        NSIncludesSubdomains: true
+  #        NSTemporaryExceptionAllowsInsecureHTTPLoads: true
+  #        NSTemporaryExceptionMinimumTLSVersion: 'TLSv1.0'
+  #      domain2.org:
+  #        NSIncludesSubdomains: true
+  #        NSTemporaryExceptionAllowsInsecureHTTPLoads: true
+  #        NSTemporaryExceptionMinimumTLSVersion: 'TLSv1.0'
+  #      domain3.com:
+  #        NSExceptionRequiresForwardSecrecy: false
+
 wp8:
   productid: '<%=@productid%>'
+
 android:
   #manifest_template: 'AndroidManifest.erb'
   version: 4.1.0
-  # Note: in order to simplify debugging only app messages and system channels with priority informative and higher, and any errors are enabled by default
+  ## Note: in order to simplify debugging only app messages and system channels with priority informative and higher, and any errors are enabled by default
   logcatFilter: APP:I StrictMode:I DEBUG:I *:E
 
 wm:

data/res/generators/templates/iphone_project/Bremen7.xcodeproj/project.pbxproj

@@ -381,6 +381,7 @@
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {enabled = 1;};
 							com.apple.Push = {enabled = 1;};
+							com.apple.Keychain = {enabled = 1;};
 						};
 					};
 				};

data/res/generators/templates/iphone_project/buildRhoBundle

@@ -1,26 +1,42 @@
 #!/bin/sh
 
+echo "START buildRhoBundle script"
 
-if [ "$RHO_BUNDLE_ALREADY_BUILDED" = "YES" ]; then
+if [ "$RHO_BUNDLE_ALREADY_BUILDED" = "YES" ]
+then
 
 RHO_BUNDLE_ALREADY_BUILDED="NO"
+echo "RhoBundle already builded !" 
 
-echo "RhoBundle already builded !"
+else
 
-elif [ "$ACTION" = "build" -o "$ACTION" = "" ]; then
+echo "RhoBundle should BUILD !"
 
-source ~/.profile
+RHO_BUNDLE_ALREADY_BUILDED="NO"
+
+. ~/.profile
 cd ../..
 
-RHO_BUNDLE_ALREADY_BUILDED="NO"
+echo "START Prepare build bundle - switch app"
+
+ruby --version 
+
 rake switch_app
+
+echo "FINISH Prepare build bundle - switch app"
+
 TARGET_RHODESLIBS_DIR=${SRCROOT}
+
 cd <%= rhodes_root_path %>
+
+echo "START build bundle ..."
+
 rake build:iphone:rhobundle
 
+echo "FINISH build bundle ..."
+
 RHO_BUNDLE_ALREADY_BUILDED="NO"
 
 fi
 
-
-
+echo "FINISH buildRhoBundle script"

data/res/generators/templates/iphone_project/root/Info.plist

@@ -151,8 +151,6 @@
      <dict>
           <key>NSAllowsArbitraryLoads</key>
 		  <true/>
-		  <key>NSAllowsArbitraryLoadsInWebContent</key>
-    	  <true/>
      </dict>
      <key>UIRequiresFullScreen</key>
      <true/>