rhodes 3.3.2.beta.5 → 3.3.2.beta.6

data/platform/android/build/android.rake

@@ -60,7 +60,8 @@ ANDROID_PERMISSIONS = {
   'calendar' => ['READ_CALENDAR', 'WRITE_CALENDAR'],
   'sdcard' => 'WRITE_EXTERNAL_STORAGE',
   'push' => proc do |manifest| add_push(manifest) end,
-  'motorola' => nil,
+  'motorola' => ['SYSTEM_ALERT_WINDOW', 'BROADCAST_STICKY', proc do |manifest| add_motosol_sdk(manifest) end],
+  'motoroladev' => ['SYSTEM_ALERT_WINDOW', 'BROADCAST_STICKY', proc do |manifest| add_motosol_sdk(manifest) end],
   'webkit_browser' => nil
 }
 
@@ -109,6 +110,14 @@ def add_push(manifest)
   end
 end
 
+def add_motosol_sdk(manifest)
+  uses_library = REXML::Element.new 'uses-library'
+  uses_library.add_attribute 'android:name', 'com.motorolasolutions.scanner'
+  manifest.elements.each('application') do |app|
+    app.add uses_library
+  end  
+end
+
 def set_app_name_android(newname)
   puts "set_app_name"
   $stdout.flush
@@ -154,17 +163,22 @@ def set_app_name_android(newname)
 
   caps_proc = []
   # Default permissions. Need to be always enabled.
-  caps = ['INTERNET', 'PERSISTENT_ACTIVITY', 'WAKE_LOCK', 'SYSTEM_ALERT_WINDOW']
+  caps = ['INTERNET', 'PERSISTENT_ACTIVITY', 'WAKE_LOCK']
   $app_config["capabilities"].each do |cap|
     cap = ANDROID_PERMISSIONS[cap]
     next if cap.nil?
-    if cap.is_a? Proc
-      caps_proc << cap
-      next
+    cap = [cap] unless cap.is_a? Array
+
+    cap.each do |cap_item|
+      if cap_item.is_a? Proc
+        caps_proc << cap_item
+        next
+      end
+      if cap_item.is_a? String
+        caps << cap_item
+        next
+      end
     end
-    cap = [cap] if cap.is_a? String
-    cap = [] unless cap.is_a? Array
-    caps += cap
   end
   caps.uniq!
 
@@ -564,7 +578,11 @@ namespace "config" do
     $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?
-    $use_motosol_barcode_api = false #true unless $app_config["extensions"].index("barcode").nil?
+    
+    unless $app_config['capabilities'].index('motorola').nil? and $app_config['capabilities'].index('motoroladev').nil?
+      $use_motosol_barcode_api = true if $app_config['extensions'].index('barcode') or $app_config['extensions'].index('barcode-moto')
+      raise 'Cannot use Motorola SDK addon and Google SDK addon together!' if $use_google_addon_api
+    end
  
     $applog_path = nil
     $applog_file = $app_config["applog"]

data/platform/iphone/Classes/GeoLocation/LocationController.m

@@ -65,6 +65,7 @@ static LocationController *sharedLC = nil;
 		CFRunLoopTimerSetNextFireDate(_timer, CFAbsoluteTimeGetCurrent() + timeOutInSeconds);
 	}
 	
+    _locationManager.delegate = self; // Tells the location manager to send updates to this object
 	[_locationManager startUpdatingLocation];
 	return true;
 }
@@ -105,6 +106,7 @@ static LocationController *sharedLC = nil;
     if (!_locationManager)
         return;
 	[_locationManager stopUpdatingLocation];
+    _locationManager.delegate = nil;
 	
     // Get rid of the timer, if it still exists
     if (_timer != NULL) {
@@ -277,6 +279,7 @@ int rho_geo_known_position() {
 
 void rho_geoimpl_settimeout(int nTimeoutSec)
 {
+    
 }
 
 void rho_geoimpl_turngpsoff()

data/platform/iphone/rbuild/iphone.rake

@@ -1061,6 +1061,7 @@ namespace "run" do
 
          mkdir_p File.join($simrhodes, "Documents")
          mkdir_p File.join($simrhodes, "Library", "Preferences")
+         mkdir_p File.join($simrhodes, "Library", "Caches", "Private Documents")
 
          rm_rf File.join($simrhodes, 'rhorunner.app')
          cp_r rhorunner, $simrhodes
@@ -1101,7 +1102,8 @@ namespace "run" do
     rhorunner = File.join($startdir, $config["build"]["iphonepath"],"build/#{$configuration}-iphonesimulator/rhorunner.app")
     commandis = iphonesim + ' launch "' + rhorunner + '" ' + $sdkver.gsub(/([0-9]\.[0-9]).*/,'\1') + ' ' + $emulatortarget
 
-    Thread.new {
+    thr = Thread.new do
+       puts 'start thread with execution of application' 
        if ($emulatortarget != 'iphone') && ($emulatortarget != 'ipad')
            puts  'use old execution way - just open iPhone Simulator'
            system("open \"#{$sim}/iPhone Simulator.app\"")
@@ -1109,7 +1111,9 @@ namespace "run" do
            puts 'use iphonesim tool - open iPhone Simulator and execute our application, also support device family (iphone/ipad)'
            system(commandis)
        end
-    }
+    end
+    
+    thr.join
   
     puts "end build iphone app"  
     exit

data/platform/shared/common/RhodesApp.cpp

@@ -85,6 +85,7 @@ public:
 
 public:
     CAppCallbacksQueue();
+	CAppCallbacksQueue(LogCategory logCat);
 	~CAppCallbacksQueue();
 
     //void call(callback_t type);
@@ -303,7 +304,9 @@ CRhodesApp::CRhodesApp(const String& strRootPath, const String& strUserPath)
 #endif
 
     initAppUrls();
-    
+
+   	LOGCONF().initRemoteLog();
+
     initHttpServer();
 
     getSplashScreen().init();
@@ -357,6 +360,8 @@ CRhodesApp::~CRhodesApp(void)
 {
     stopApp();
 
+	LOGCONF().closeRemoteLog();
+
 #ifdef OS_WINCE
     WSACleanup();
 #endif

data/platform/shared/common/ThreadQueue.cpp

@@ -28,9 +28,12 @@
 
 //1. when stop thread - cancel current command. Add cancelCurrentCommand to ThreadQueue and call it from stop
 
+
 namespace rho {
 namespace common {
 
+unsigned int CThreadQueue::m_logThreadId = 0;
+
 CThreadQueue::CThreadQueue() : CRhoThread()
 {
     m_nPollInterval = QUEUE_POLL_INTERVAL_SECONDS;
@@ -68,7 +71,7 @@ int CThreadQueue::getCommandsCount() {
     
 void CThreadQueue::addQueueCommandInt(IQueueCommand* pCmd)
 {
-    LOG(INFO) + "addCommand: " + pCmd->toString();
+	LOG(INFO) + "addCommand: " + pCmd->toString();
 
     synchronized(m_mxStackCommands);
 
@@ -136,6 +139,9 @@ void CThreadQueue::processCommandBase(IQueueCommand* pCmd)
 
 void CThreadQueue::run()
 {
+    if(__rhoCurrentCategory.getName() == "NO_LOGGING")
+		m_logThreadId = getThreadID();
+
 	LOG(INFO) + "Starting main routine...";
 
 	int nLastPollInterval = getLastPollInterval();

data/platform/shared/common/ThreadQueue.h

@@ -62,10 +62,12 @@ private:
     IQueueCommand* m_pCurCmd;
 
     boolean m_bNoThreaded;
+	static unsigned int  m_logThreadId;
+
 public:
     CThreadQueue();
 
-    ~CThreadQueue(void);
+    virtual ~CThreadQueue(void);
 
     virtual void addQueueCommand(IQueueCommand* pCmd);
     virtual void addQueueCommandToFront(IQueueCommand* pCmd);
@@ -84,6 +86,8 @@ public:
     LinkedListPtr<IQueueCommand*>& getCommands(){ return m_stackCommands; }
 
     int getCommandsCount();	
+
+	static unsigned int getLogThreadId() {return m_logThreadId;}
 protected:
     virtual int getLastPollInterval(){ return 0;}
     virtual void processCommand(IQueueCommand* pCmd) = 0;

data/platform/shared/logging/RhoLog.cpp

@@ -28,6 +28,7 @@
 #include "common/RhoFilePath.h"
 #include "common/RhoTime.h"
 #include "common/RhoSystem.h"
+#include "common/ThreadQueue.h"
 
 rho::LogCategory __rhoCurrentCategory;
 
@@ -44,7 +45,9 @@ LogMessage::LogMessage(const char* file, int line, LogSeverity severity, LogSett
 }
 
 bool LogMessage::isEnabled()const{
-    if ( m_severity >= getLogConf().getMinSeverity() ){
+	if(m_category.getName() == "NO_LOGGING" || common::CThreadQueue::getLogThreadId() == common::CSystem::getThreadID()) return false;
+	
+	if ( m_severity >= getLogConf().getMinSeverity() ){
         if ( m_category.isEmpty() || m_severity >= L_ERROR )
             return true;
 

data/platform/shared/logging/RhoLogConf.cpp

@@ -51,7 +51,7 @@ LogSettings::LogSettings(){
     m_nMaxLogFileSize = 0; 
     m_bLogPrefix = true; 
 
-    m_strLogHost = "PPP_PEER";
+    //m_strLogHost = "PPP_PEER";
 
     m_pFileSink = new CLogFileSink(*this);
     m_pOutputSink = new CLogOutputSink(*this);
@@ -62,17 +62,34 @@ LogSettings::LogSettings(){
 LogSettings::~LogSettings(){
     delete m_pFileSink;
     delete m_pOutputSink;
-    delete m_pSocketSink;
+	if(m_pSocketSink)
+		delete m_pSocketSink;
 }
 
-void LogSettings::setLogPort(const char* szLogPort) 
+void LogSettings::closeRemoteLog()
 {
-	setLogToSocket(true);
+	if(m_pSocketSink)
+	{
+		delete m_pSocketSink;
+	    m_pSocketSink = 0;
+	}
+}
 
-	m_strLogPort = rho::String(szLogPort); 
+void LogSettings::initRemoteLog()
+{
+#ifdef OS_PLATFORM_MOTCE
+    //TODO: remote log prevent loading app - stuck on loading.png
+    OSVERSIONINFO osv = {0};
+	osv.dwOSVersionInfoSize = sizeof(osv);
+	if (GetVersionEx(&osv) && osv.dwMajorVersion == 5)
+		return;
+#endif
 
-	delete m_pSocketSink;
-    m_pSocketSink = new CLogSocketSink(*this);
+	m_strLogHost = RHOCONF().getString("rhologhost"); 
+	m_strLogPort = RHOCONF().getString("rhologport"); 
+
+	if(!m_pSocketSink && m_strLogHost != "" && m_strLogPort != "")
+		m_pSocketSink = new CLogSocketSink(*this);
 }
 
 void LogSettings::getLogTextW(StringW& strTextW)
@@ -173,7 +190,7 @@ void LogSettings::sinkLogMessage( String& strMsg ){
     if ( isLogToOutput() )
         m_pOutputSink->writeLogMessage(strMsg);
 
-    if ( isLogToSocket() )
+	if (m_pSocketSink)
         m_pSocketSink->writeLogMessage(strMsg);
 }
 
@@ -266,9 +283,6 @@ void rho_logconf_Init_with_separate_user_path(const char* szRootPath, const char
     rho_conf_Init_with_separate_user_path(szRootPath, szUserPath);
     
     LOGCONF().loadFromConf(RHOCONF());
-    if ( szLogPort != NULL && *szLogPort ) 
-        LOGCONF().setLogPort(szLogPort);
-
 }
     
 void rho_logconf_Init(const char* szRootPath, const char* szLogPort){

data/platform/shared/logging/RhoLogConf.h

@@ -39,6 +39,7 @@ namespace common{ class RhoSettings; }
 class LogCategory;
 
 struct ILogSink{
+    virtual ~ILogSink(){}
     virtual void writeLogMessage( String& strMsg ) = 0;
     virtual int getCurPos() = 0;
     virtual void clear() = 0;
@@ -102,8 +103,9 @@ public:
 	void setLogHost(const char* szLogHost) { m_strLogHost = rho::String(szLogHost); }
 
 	const String& getLogPort() const { return m_strLogPort; }
-	void setLogPort(const char* szLogPort);
-	
+	void initRemoteLog();
+	void closeRemoteLog();
+
     void setEnabledCategories( const char* szCatList );
     void setDisabledCategories( const char* szCatList );
     const String& getEnabledCategories(){ return m_strEnabledCategories; }

data/platform/shared/logging/RhoLogSink.cpp

@@ -163,27 +163,33 @@ void CLogOutputSink::writeLogMessage( String& strMsg )
 #endif
 }
 
-CLogSocketSink::CLogSocketSink(const LogSettings& oSettings) 
-	: m_oLogConf(oSettings)
-	, m_logNetClient(0)
+CLogSocketSink::CLogSocketSink(const LogSettings& oSettings)
 {
-	m_hostName = oSettings.getLogHost();
-    m_hostPort = oSettings.getLogPort(); 
+	m_addrHost = "http://"+oSettings.getLogHost() + ":" + oSettings.getLogPort();
+
+	CThreadQueue::setLogCategory(LogCategory("NO_LOGGING"));
+    setPollInterval(QUEUE_POLL_INTERVAL_INFINITE);
+    start(epLow);
+}
+
+CLogSocketSink::~CLogSocketSink()
+{
+    //wait till all commands will be sent to server
+    CRhoThread::stop(-1);
 }
 
 void CLogSocketSink::writeLogMessage( String& strMsg )
 {
-    if (!m_logNetClient)
-    {
-		m_logNetClient = new rho::net::RawSocket(m_hostName, m_hostPort);
-    }
-    
-    if (!m_logNetClient->isInit())
-    {
-         m_logNetClient->init();
-    }
+	addQueueCommand(new LogCommand(m_addrHost.c_str(), strMsg.c_str()));
+}
+
+void CLogSocketSink::processCommand(IQueueCommand* pCmd)
+{
+    LogCommand *cmd = (LogCommand *)pCmd;
+    if (!cmd)
+        return;
 
-    m_logNetClient->send(strMsg);
+	getNetRequest().doRequest( "POST", cmd->m_url, cmd->m_body, 0, 0 );
 }
         
 }

data/platform/shared/logging/RhoLogSink.h

@@ -29,6 +29,7 @@
 
 #include "RhoLogConf.h"
 #include "net/RawSocket.h"
+#include "common/RhodesApp.h"
 
 namespace rho {
 namespace common {
@@ -68,21 +69,29 @@ public:
     void clear(){}
 };
 
+class CLogSocketSink : public ILogSink, common::CThreadQueue{
+    String m_addrHost;
 
-class CLogSocketSink : public ILogSink{
-    const LogSettings& m_oLogConf;
-
-    rho::net::RawSocket *m_logNetClient;
-
-	String m_hostName;
-	String m_hostPort;
 public:
     CLogSocketSink(const LogSettings& oSettings); 
-	virtual ~CLogSocketSink() { delete m_logNetClient; }
+	virtual ~CLogSocketSink();
 
     void writeLogMessage( String& strMsg );
     int getCurPos(){ return -1; }
     void clear(){}
+
+    struct LogCommand : public IQueueCommand
+    {
+        String m_url;
+		String m_body;
+		LogCommand(String url, String body) : m_url(url), m_body(body) {}
+
+		boolean equals(IQueueCommand const &) {return false;}
+        String toString() {return "";}
+    };
+
+private:
+	void processCommand(IQueueCommand* pCmd);
 };
   
 }

data/platform/shared/net/AsyncHttp.cpp

@@ -58,7 +58,7 @@ CAsyncHttp* CAsyncHttp::m_pInstance = 0;
 
 CAsyncHttp::CAsyncHttp() : CThreadQueue()
 {
-    CThreadQueue::setLogCategory(getLogCategory());
+	CThreadQueue::setLogCategory(getLogCategory());
 
     setPollInterval(QUEUE_POLL_INTERVAL_INFINITE);
 }
@@ -71,17 +71,18 @@ CAsyncHttp::~CAsyncHttp(void)
 
 unsigned long CAsyncHttp::addHttpCommand(IQueueCommand* pCmd)
 {
-    if ( ((CHttpCommand*)pCmd)->m_strCallback.length()==0)
+	if (((CHttpCommand*)pCmd)->m_strCallback.length()==0)
     {
         processCommandBase(pCmd);
         unsigned long ret = ((CHttpCommand*)pCmd)->getRetValue();
         delete pCmd;
         return ret;
     }
+		
+	CThreadQueue::addQueueCommand(pCmd);
 
-    CThreadQueue::addQueueCommand(pCmd);
-    start(epLow);
-
+	start(epLow);
+    
     return ((CHttpCommand*)pCmd)->getRetValue();
 }
 
@@ -145,9 +146,9 @@ void CAsyncHttp::CHttpCommand::execute()
         resp = getNet().doRequest( m_params.getString("http_command", "GET").c_str(),
             m_params.getString("url"), m_params.getString("body"), null, &m_mapHeaders);
         break;
-    case hcPost:
+	case hcPost:
         resp = getNet().doRequest(m_params.getString("http_command", "POST").c_str(),
-            m_params.getString("url"), m_params.getString("body"), null, &m_mapHeaders);
+			m_params.getString("url"), m_params.getString("body"), null, &m_mapHeaders);
         break;
 
     case hcDownload:
@@ -215,8 +216,13 @@ void CAsyncHttp::CHttpCommand::execute()
 
 unsigned long CAsyncHttp::CHttpCommand::getRetValue()
 {
-    if ( m_strCallback.length() == 0 )
-        return rho_ruby_create_string(m_strResBody.c_str());
+	if ( m_strCallback.length() == 0 )
+	{
+		if(getLogCategory().getName() == "NO_LOGGING")
+			return atoi(m_strResBody.c_str());
+		else
+			return rho_ruby_create_string(m_strResBody.c_str());
+	}
 
     return rho_ruby_get_NIL();
 }
@@ -241,7 +247,7 @@ String CAsyncHttp::CHttpCommand::makeHeadersString()
 
 void CAsyncHttp::CHttpCommand::callNotify(NetResponse& resp, int nError )
 {
-    m_strResBody = "rho_callback=1";
+	m_strResBody = "rho_callback=1";
     m_strResBody += "&status=";
     if ( nError > 0 )
     {