rhodes 5.5.2 → 5.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca79afe2871dc844140855c5c576cde2e543561f
-  data.tar.gz: 205d5827bdf76a53bacd15aecbbe94ef1eafe2fd
+  metadata.gz: de39ae2813ad387575d40e304bb9696641b8e52e
+  data.tar.gz: eebd20c085d3e593c09a975378cd221731743776
 SHA512:
-  metadata.gz: 6bbd7b25acd92e68ed940b77f4687fe92ce3044d65380183f9595e68b5ca1a82c20db7866ec2ea8334fc2c5d7ee5780196972cd1368a24a0365489b1ad10672e
-  data.tar.gz: 9368726e9ccadcc979254160487ee1a36e3d39413be60c3de7691cf6ac0dcb05e07764e48da2faa52deba9664bb76f8416db09cc970707f85efc3ba18c22836e
+  metadata.gz: 803d56e2968beaaf18a0cc03ec469cc81e34fcb3cb7c75629b571b3d920bbb6019d553f24ce249445f1ffce1b15de507b6100e9c421da8dfd575aa5607610610
+  data.tar.gz: 74a4425fdd6002fea82c959c46a34ac9b9fb23b9170a914b04aa5153ff11f8ddb2bf6867c4830616fcd2cd48686f84b10633ab9a9e593e6cd73952af9fcfece7

data/CONTRIBUTING.md

@@ -4,7 +4,7 @@ Found an issue with Rhodes, give feedback or provide a patch?  Here's how!
 
 ## Reporting issues
 
-We only accept issues that are bug reports or feature requests. Bugs must be isolated and reproducible problems that we can fix within Rhodes. For application-specific or API-related questions, please visit our [Launchpad Disscussion Area](https://developer.zebra.com/community/rhomobile-suite/discussions/rhomobile-discussions). Please read the following guidelines before opening any issue.
+We only accept issues that are bug reports or feature requests. Bugs must be isolated and reproducible problems that we can fix within Rhodes. For application-specific or API-related questions, please visit our [Forums](http://forums.tau-technologies.com). Please read the following guidelines before opening any issue.
 
 1. **Search for existing issues.** We sometimes get duplicate issues, and you'd help us out a lot by first checking if someone else has reported the same issue. Moreover, the issue may have already been resolved with a fix available.
 2. **Create an isolated and reproducible test case.** Be sure the problem exists in Rhodes' code.

data/CREDITS

@@ -1,4 +1,4 @@
-This media, software or hardware ("Product") obtained from Tau, Inc. ("Tau") may include Tau? 
+This media, software or hardware ("Product") obtained from Tau Technologies, Inc. ("Tau") may include Tau? 
 Software, Third Party Software (defined below), and/or Open Source Software 
 (defined below).
 
@@ -9,9 +9,9 @@ more agreements in force between the purchaser of the Tau
 Product or licensee of the Tau Software and Tau.  SOFTWARE IS PROTECTED BY U.S. COPYRIGHT LAWS AND INTERNATIONAL 
 LAWS AND TREATIES. UNAUTHORIZED COPYING, DISTRIBUTION OR OTHER USE OF
 THIS PRODUCT IS STRICTLY PROHIBITED. ANY DISTRIBUTION OR USE NOT 
-SPECIFICALLY APPROVED BY ZEBRA IS STRICTLY PROHIBITED.
+SPECIFICALLY APPROVED BY TAU IS STRICTLY PROHIBITED.
 
-Tau? Software is subject to the commercial terms and 
+Tau Software is subject to the commercial terms and 
 conditions entered into with Tau, any other use is strictly 
 prohibited.  Commercial Software licensed for redistribution by Tau ("Third Party Software") is subject to the terms and conditions 
 in force between Tau and the licensor of the Third party 

data/LICENSE

@@ -2,7 +2,7 @@
 
 Copyright (c) 2008-2010 Rhomobile, Inc.
 Copyright (c) 2011-2016 Symbol Technologies LLC
-Copyright (c) 2016 Tau Technologies, Inc.
+Copyright (c) 2016-2017 Tau Technologies, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.html

@@ -262,7 +262,7 @@ Instructions for installing RhoMobile Suite including all its components (Rhodes
 
 <hr class="clsSectionBreak" />
 <p>
-<i>Copyright &copy; 2015-2016<br>
+<i>Copyright &copy; 2015-2017<br>
 Tau Technologies, Inc.
 
 

data/Rakefile

@@ -74,6 +74,7 @@ end
 #------------------------------------------------------------------------
 
 $app_basedir = pwd
+$is_webkit_engine = false
 $startdir = File.dirname(__FILE__)
 $startdir.gsub!('\\', '/')
 
@@ -156,7 +157,7 @@ namespace "framework" do
   end
 end
 
-$application_build_configs_keys = ['security_token', 'encrypt_database', 'android_title', 'iphone_db_in_approot', 'iphone_set_approot', 'iphone_userpath_in_approot', "iphone_use_new_ios7_status_bar_style", "iphone_full_screen", "webkit_outprocess", "webengine"]
+$application_build_configs_keys = ['security_token', 'encrypt_database', 'android_title', 'iphone_db_in_approot', 'iphone_set_approot', 'iphone_userpath_in_approot', "iphone_use_new_ios7_status_bar_style", "iphone_full_screen", "webkit_outprocess", "webengine", "iphone_enable_startup_logging"]
 
 $winxpe_build = false
 
@@ -832,7 +833,7 @@ def cloud_url_git_match(str)
   # else
     server = res[1]; user = res[2]; app = res[3]
   end
- 
+
   (server.nil? || app.nil?) ? {} : { :str => "#{server}:#{user}/#{app}", :server => server,  :user => user, :app => app }
 end
 
@@ -2019,9 +2020,9 @@ namespace "config" do
 
           $app_config["capabilities"] += ["symbol"] unless $app_config["capabilities"].index("symbol")
           if $current_platform == "wm"
-			$app_config["extensions"] += ["webkit"] 
+			$app_config["extensions"] += ["webkit"]
           else
-			$app_config["extensions"] += ["rhoelementsext"] 
+			$app_config["extensions"] += ["rhoelementsext"]
 			$app_config["extensions"] += ["symbolapi"] #extension with plug-ins
 
 			#check for RE2 plugins
@@ -2038,7 +2039,7 @@ namespace "config" do
 			end
 
 			application_build_configs['moto-plugins'] = plugins if plugins.length() > 0
-		end	
+		end
 
 
         if !$app_config["capabilities"].index('native_browser') && $current_platform != "android"
@@ -2099,7 +2100,7 @@ namespace "config" do
         $app_config['extensions'] = $app_config['extensions'] | ['hardwarekeys']
         $app_config['extensions'] = $app_config['extensions'] | ['sensor']
       end
-      
+
       if $current_platform == "wp8"
         $app_config['extensions'] = $app_config['extensions'] | ['barcode']
       end
@@ -2294,6 +2295,10 @@ def add_linker_library(libraryname)
   $ldflags << "#{tmpdir}/#{libraryname}\n" unless $ldflags.nil?
 end
 
+def add_inker_library_absolute(fulllibraryfilepath)
+    $ldflags << fulllibraryfilepath + "\n" unless $ldflags.nil?
+end
+
 def set_linker_flags
   if $config["platform"] == "iphone"
     simulator = $sdk =~ /iphonesimulator/
@@ -2486,6 +2491,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|
@@ -2539,6 +2548,19 @@ def init_extensions(dest, mode = "")
             end
           end
 
+          # add additional libraries
+          link_libraries = []
+          if (!extconf["link_libraries"].nil?) && (extconf["link_libraries"].is_a? Array)
+              link_libraries += extconf["link_libraries"]
+          end
+          if (!extconf[$config["platform"]].nil?) && (!extconf[$config["platform"]]["link_libraries"].nil?) && (extconf[$config["platform"]]["link_libraries"].is_a? Array)
+              link_libraries += extconf[$config["platform"]]["link_libraries"]
+          end
+          link_libraries.each do |linklib|
+              fulllibpath = File.join(extpath, linklib)
+              add_inker_library_absolute(fulllibpath)
+          end
+
           if entry && entry.length() > 0
             if xml_api_paths.nil? #&& !(("rhoelementsext" == extname || "dominjector" == extname ) && ($config["platform"] == "wm"||$config["platform"] == "android"))
 
@@ -2547,7 +2569,7 @@ def init_extensions(dest, mode = "")
 
               if (("rhoelementsext" == extname || "dominjector" == extname) && ($config["platform"] == "wm"||$config["platform"] == "android"))
                 extentries << entry
-                extentries_init << entry             
+                extentries_init << entry
               elsif !$js_application
                 extentries << entry
                 entry =  "if (rho_ruby_is_started()) #{entry}"
@@ -2670,6 +2692,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([
@@ -4151,7 +4190,7 @@ namespace "wm_gem" do
       $neon_root = $config["env"]["paths"]["neon"] unless $config["env"]["paths"]["neon"].nil?
       $rhoelementsext_main_dir = File.join($startdir, 'extensions/rhoelementsext/ext')
       $rhoelementsext_wm_dir = File.join($rhoelementsext_main_dir, "rhoelementsext/platform/wm")
-      
+
       $re_version = $config['version']
     end
 
@@ -4161,23 +4200,23 @@ namespace "wm_gem" do
 
 				dest_dir = "./libs/data"
 				mkdir_p dest_dir
-			
+
 				src_dir = File.join($startdir, "neon/R2D1/Build" )
-			
+
 				cp_r File.join(src_dir, "Config"), dest_dir, :preserve => true
 				cp_r File.join(src_dir, "Windows/NPAPI"), dest_dir, :preserve => true
 				cp_r File.join(src_dir, "Windows/Plugins"), File.join(dest_dir, 'Plugin'), :preserve => true
 
 				Dir.glob(File.join(src_dir, "Windows/Binaries/*.*")).each { |f| cp_r f, dest_dir }
 				Dir.glob(File.join(src_dir, "Windows/WebKit/*.*")).each { |f| cp_r f, dest_dir }
-				
+
 				chdir File.dirname(__FILE__)
 				chmod_R 0777, "./libs/data"
 			  end
 			end
-		end	
+		end
 end
-namespace "build" do  
+namespace "build" do
   task :set_neon, :neon_dir do |t, args|
     Jake.edit_yml(File.join(File.dirname(__FILE__), 'rhoelements.yml')) do |yml|
       yml['env']['paths']['neon'] = args[:neon_dir]
@@ -4209,7 +4248,7 @@ namespace :run do
   desc "start rholog(webrick) server"
   task :webrickrhologserver, :app_path  do |t, args|
     require 'webrick'
-    
+
     puts "Args were: #{args}"
     $app_path = args[:app_path]
 

data/extensions/rhoconnect-push/ext/rhoconnect-push/platform/android/Rakefile

@@ -21,7 +21,7 @@ ARGS = [
     "-I\"#{$rootdir}/platform/android/Rhodes/jni/include\"",
     "-I\"#{$rootdir}/platform/android/Rhodes/jni/include/rhodes/details\"",
     "-I\"#{$rootdir}/platform/shared/ruby/include\"",
-    "-I\"#{$rootdir}/lib/commonApi/coreapi/ext/shared\"",
+    "-I\"#{$rootdir}/lib/commonAPI/coreapi/ext/shared\"",
     "-I\"#{$rootdir}/platform/shared\"",
     "-I\"#{$rootdir}/platform/shared/common\"",
     "-I\"#{$rootdir}/platform/shared/api_generator\"",

data/lib/build/jake.rb

@@ -876,6 +876,17 @@ class Jake
     app_version += "\r\napp_name='#{$app_config["name"]}'"
     app_version += "\r\ntitle_text='#{$app_config["name"]}'"  if $current_platform == "win32"
     app_version += "\r\norg_name='#{$app_config["vendor"]}'"  if $current_platform == "win32"
+    app_version += "\r\nrho_app_id='#{$app_config["rho_app_id"]}'" if $app_config['rho_app_id']
+
+    #store Rhodes version to rhoconfig
+    version_path = File.join($startdir, 'version')
+    version = ""
+    File.open( version_path, 'rb' ){ |f| version = f.read() }
+    app_version += "\r\nrhodes_gem_version='#{version}'"
+
+    if $is_webkit_engine == true
+		  File.open(File.join($srcdir,'apps/rhoconfig.txt'), "a"){ |f| f.write("\r\nwebengine=webkit") }
+	  end
 
     File.open(File.join($srcdir,'apps/rhoconfig.txt'), "a"){ |f| f.write(app_version) }
     File.open(File.join($srcdir,'apps/rhoconfig.txt.timestamp'), "w"){ |f| f.write(Time.now.to_f().to_s()) }

data/lib/commonAPI/barcode/ext/platform/iphone/impl/BarcodeFactory.m

@@ -10,7 +10,8 @@
 
     [obj setProperty:@"ID" propertyValue:ID methodResult:nil];
     [obj setProperty:@"friendlyName" propertyValue:@"ZBar S/W Scanner" methodResult:nil];
+    [obj setProperty:@"scannerType" propertyValue:@"Camera" methodResult:nil];
 
     return obj;
 }
-@end
+@end

data/lib/commonAPI/coreapi/ext/NativeTabbar.xml

@@ -102,6 +102,10 @@ Be sure to review the [Ruby API Usage](/guide/api_ruby) guide for important info
                                 <PLATFORM>Android</PLATFORM>
                                 <DESC>Place TabBar to bottom instead of default top - only for Android.</DESC>
                             </PARAM>
+                            <PARAM name="invisibleTabControl" type="BOOLEAN">
+                                <PLATFORM>iOS</PLATFORM>
+                                <DESC>Make TabBar control invisible. Application developer should switch between tabs programatically.</DESC>
+                            </PARAM>
                         </PARAMS>
                     </PARAM>
                 </PARAMS>

data/lib/commonAPI/coreapi/ext/platform/iphone/cpp_based_impl/SystemImpl.mm

@@ -96,6 +96,7 @@ namespace rho {
         //oResult.setError("supported only set IconBadge !");
         int r = (int)([UIApplication sharedApplication].applicationIconBadgeNumber);
         //NSLog(@"badge number is %d", r);
+        RAWLOG_INFO1("badge number is %d", r);
         oResult.set(r);
     }
     

data/lib/commonAPI/coreapi/ext/platform/iphone/impl/NativeTabbarSingleton.m

@@ -1,6 +1,11 @@
 
 #import "NativeTabbarSingleton.h"
 
+#import "logging/RhoLog.h"
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "NativeTabbar"
+
+
 extern void rho_create_tabbar(NSArray* items, NSDictionary* properties, id<IMethodResult>callback);
 extern BOOL nativetabbar_started();
 extern void remove_native_tabbar();
@@ -14,7 +19,7 @@ extern void native_tabbar_switch_tab(int index);
 
 -(void) create:(NSArray*)tabElements tabBarProperties:(NSDictionary*)tabBarProperties methodResult:(id<IMethodResult>)methodResult {
     if (![tabElements isKindOfClass:[NSArray class]]) {
-        NSLog(@"Tabbar.create ERROR - tabElements parameter should be Array !");
+        RAWLOG_ERROR("Tabbar.create ERROR - tabElements parameter should be Array !");
         return;
     }
     rho_create_tabbar(tabElements, tabBarProperties, methodResult);
@@ -46,4 +51,4 @@ extern void native_tabbar_switch_tab(int index);
 
 
 
-@end
+@end

data/lib/commonAPI/coreapi/ext/platform/iphone/impl/NativeToolbarSingleton.m

@@ -1,6 +1,10 @@
 
 #import "NativeToolbarSingleton.h"
 
+#import "logging/RhoLog.h"
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "NativeToolbar"
+
 extern void rho_create_toolbar(NSArray* items, NSDictionary* properties);
 extern BOOL nativetoolbar_started();
 extern void remove_native_toolbar();
@@ -11,7 +15,7 @@ extern void remove_native_toolbar();
 
 -(void) create:(NSArray*)toolbarElements toolBarProperties:(NSDictionary*)toolBarProperties methodResult:(id<IMethodResult>)methodResult{
     if (![toolbarElements isKindOfClass:[NSArray class]]) {
-        NSLog(@"Toolbar.create ERROR - elements parameter should be Array !");
+        RAWLOG_ERROR("Toolbar.create ERROR - elements parameter should be Array !");
         return;
     }
     rho_create_toolbar(toolbarElements, toolBarProperties);
@@ -28,4 +32,4 @@ extern void remove_native_toolbar();
 
 
 
-@end
+@end

data/lib/commonAPI/coreapi/ext/platform/iphone/impl/NavbarSingleton.m

@@ -1,6 +1,12 @@
 
 #import "NavbarSingleton.h"
 
+
+#import "logging/RhoLog.h"
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "Navbar"
+
+
 extern void create_navbar(NSDictionary *p);
 extern void remove_navbar();
 extern BOOL navbar_started();
@@ -12,7 +18,7 @@ extern BOOL navbar_started();
 
 -(void) create:(NSDictionary*)navBarProperties methodResult:(id<IMethodResult>)methodResult{
     if (![navBarProperties isKindOfClass:[NSDictionary class]]) {
-        NSLog(@"Navbar.create ERROR - parameter should be HASH !");
+        RAWLOG_ERROR("Navbar.create ERROR - parameter should be HASH !");
         return;
     }
     create_navbar(navBarProperties);
@@ -29,4 +35,4 @@ extern BOOL navbar_started();
 
 
 
-@end
+@end

data/lib/commonAPI/coreapi/ext/shared/ApplicationImpl.cpp

@@ -176,6 +176,9 @@ public:
             String dbRootFolder = CFilePath::join( rho_native_rhodbpath(), RHO_EMULATOR_DIR);
             if ( !String_startsWith(relativePath, dbRootFolder) )
                 oResult.set( CFilePath::join( dbRootFolder, relativePath ) );
+            else {
+                oResult.set(relativePath);
+            }
         }
     }
 

data/lib/commonAPI/coreapi/ext/shared/NetworkImpl.cpp

@@ -412,6 +412,7 @@ void CNetworkImpl::createResult( NetResponse& resp, Hashtable<String,String>& ma
         mapRes["error_code"] = convertToStringA(RhoAppAdapter.getErrorFromResponse(resp));
         if ( resp.isResponseRecieved())
             mapRes["http_error"] = convertToStringA(resp.getRespCode());
+        mapRes["error_message"] = resp.getErrorMessage();
     }
 
     String cookies = resp.getCookies();

data/lib/commonAPI/coreapi/ext/shared/TimerImpl.cpp

@@ -11,35 +11,41 @@
 
 extern "C" void rho_ios_log_console_output(const char* message);
 
-namespace rho 
-{    
+
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "TimerImpl"
+
+
+namespace rho
+{
 	class CTimerFactory;
 
     using namespace apiGenerator;
     using namespace common;
-    
+
     class CTimerSingletonImpl: public CTimerSingletonBase
     {
 		static unsigned int createdTimers;
 
     public:
-        
+
         CTimerSingletonImpl(): CTimerSingletonBase(){}
-        
+
         //methods
-        // create Create a timers objects. 
-        virtual void create(rho::apiGenerator::CMethodResult& oResult) 
+        // create Create a timers objects.
+        virtual void create(rho::apiGenerator::CMethodResult& oResult)
 		{
 			++createdTimers;
 
 			char buf[10];
             sprintf(buf, "%d", createdTimers);
 			oResult.set(buf);
-        } 
-        // enumerate This is documentation 
-        virtual void enumerate(rho::apiGenerator::CMethodResult& oResult) { } 
+        }
+        // enumerate This is documentation
+        virtual void enumerate(rho::apiGenerator::CMethodResult& oResult) { }
     };
-    
+
 	unsigned int  CTimerSingletonImpl::createdTimers = 0;
 
     class CTimerImpl : public CTimerBase, public common::CRhoTimer::ICallback
@@ -55,7 +61,7 @@ namespace rho
 
 			virtual void run()
 			{
-				
+
 				while ( !RHODESAPP().isApplicationActive() ) {
 					wait(10);
 				}
@@ -71,37 +77,40 @@ namespace rho
 
     public:
 		CTimerImpl(const rho::String& timerID) : m_timerID(timerID), m_answerThread(0) {}
-		virtual ~CTimerImpl() 
+		virtual ~CTimerImpl()
 		{
 			if (!m_answerThread)
 				delete m_answerThread;
 		}
 
         //methods
-        virtual void start( int interval, rho::apiGenerator::CMethodResult& oResult) 
+        virtual void start( int interval, rho::apiGenerator::CMethodResult& oResult)
 		{
 			if (interval <= 0)
 			{
+                LOG(ERROR) + "$NetRequestProcess$ PRE SET ERROR CTimerImpl::start";
 				oResult.setError("invalid interval");
-				return;
+                LOG(ERROR) + "$NetRequestProcess$ POST SET ERROR CTimerImpl::start";
+
+                return;
 			}
 
 			m_oResult = oResult;
 			common::CRhoTimer& timerManager = RHODESAPP().getTimer();
 			timerManager.addNativeTimer(interval, this);
-        } 
+        }
 
         virtual void stop(rho::apiGenerator::CMethodResult& oResult)
 		{
 			common::CRhoTimer& timerManager = RHODESAPP().getTimer();
 			timerManager.stopNativeTimer(this);
-        } 
+        }
 
-        virtual void isAlive(rho::apiGenerator::CMethodResult& oResult) 
+        virtual void isAlive(rho::apiGenerator::CMethodResult& oResult)
 		{
 			common::CRhoTimer& timerManager = RHODESAPP().getTimer();
 			oResult.set(timerManager.isNativeTimerExist(this));
-        } 
+        }
 
 		virtual bool onTimer()
 		{
@@ -114,20 +123,20 @@ namespace rho
 			return true;
 		}
     };
-    
+
     ////////////////////////////////////////////////////////////////////////
-    
-    class CTimerFactory: public CTimerFactoryBase    
+
+    class CTimerFactory: public CTimerFactoryBase
 	{
     public:
         CTimerFactory(){}
-        
+
         ITimerSingleton* createModuleSingleton()
-        { 
+        {
             return new CTimerSingletonImpl();
         }
-        
-        virtual ITimer* createModuleByID(const rho::String& strID){ 
+
+        virtual ITimer* createModuleByID(const rho::String& strID){
 			return new CTimerImpl(strID);
 		};
 
@@ -136,7 +145,7 @@ namespace rho
 			return m_hashModules.size();
 		}
     };
-    
+
 }
 
 extern "C" void Init_Timer_extension()