rhoconnect-client 5.5.18 → 7.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70e7838cc028fbe406fe5edfb46a192c0dbbfa6b
-  data.tar.gz: a12a51d1644ad3a762e04645b9be356fc1daa128
+  metadata.gz: a76b1027a569cee7360e2640ffe2b47e6362babd
+  data.tar.gz: 0714d4f39f6e893f3f8a51cc0042f935199251d7
 SHA512:
-  metadata.gz: c5c8fd314ad7cc61358488b9b2f4f215126f94aceec126b4b0adbdc3c1fb49a9bbe27b3fe2a4e2e98c323e1351b3ac067b0de58a297a112829b76e2361207ef5
-  data.tar.gz: e6a874bfb89dc2a0b8a2de32ba44c077d2feaa28eacc08c8daa0016e2752b439d78d0c5a68125be9dd6c4f6d2e67b466531399a7daf48864abec2899461a5d91
+  metadata.gz: 6258bca04cdca6484e9d4dd6d7d4427ce3eff45e0a774b9b9a8231d0c6f3bb6574897484d6f756c9226059658078123d571150bd769b5fc782ec1c31dd0a12fd
+  data.tar.gz: eeef5492a9b85571217f0836176ca57f7a1c3a7baf017d6586e9062965c8a5d7f67de66c49f4d97d5702c8728fa4b30fd3a6d54f46e4cedfda47c68643559b52

data/ext/extconf-chmod.rb

@@ -0,0 +1,17 @@
+require 'fileutils'
+include FileUtils
+
+#Hack for linux (we should have a writable dirs in the gem subdirs)
+chmod_R 0777, File.dirname(__FILE__) + "/.."
+
+#This is the hack, we make all the things to make it look like an extension has compiled
+
+File.open('Makefile', 'w') { |f| f.write "all:\n\ninstall:\n\n" }
+File.open('make', 'w') do |f|
+  f.write '#!/bin/sh'
+  f.chmod f.stat.mode | 0111
+end
+File.open('rhodes_postinstallhack' + '.so', 'w') { |f| f.chmod 0777}
+File.open('rhodes_postinstallhack' + '.dll', 'w') { |f| f.chmod 0777}
+File.open('nmake.bat', 'w') { |f| f.write "ECHO \"Done\""
+	f.chmod 0777}

data/ext/rhoconnect-client/ext/build

@@ -16,6 +16,11 @@ elif [ "$RHO_PLATFORM" = "osx" ]; then
 cd platform/qt
 rake --trace
 
+elif [ "$RHO_PLATFORM" = "linux" ]; then
+
+cd platform/qt
+rake --trace
+
 else
 
 rake --trace

data/ext/rhoconnect-client/ext/platform/iphone/Rakefile

@@ -1,74 +1,20 @@
 require 'fileutils'
 
-USE_STLPORT = true
-
-puts "Rhoconnect-client extension !"
-
 namespace "build" do
+    task :all do
+        rhorootdir = ENV['RHO_ROOT']
+        raise "RHO_ROOT is not set" if rhorootdir.nil?
 
-  task :config do
-
-    $targetdir = ENV['TARGET_TEMP_DIR']
-    raise "TARGET_TEMP_DIR is not set" if $targetdir.nil?
-
-    $tempdir = ENV['TEMP_FILES_DIR']
-    raise "TEMP_FILES_DIR is not set" if $tempdir.nil?
-
-    $rootdir = ENV['RHO_ROOT']
-    raise "RHO_ROOT is not set" if $rootdir.nil?
-
-    $xcodebuild = ENV['XCODEBUILD']	
-    raise "XCODEBUILD is not set" if $xcodebuild.nil?
- 
-    $configuration = ENV['CONFIGURATION']	
-    raise "CONFIGURATION is not set" if $configuration.nil?
-
-    $sdk = ENV['SDK_NAME']	
-    raise "SDK_NAME is not set" if $sdk.nil?
-
-    $bindir = ENV['PLATFORM_DEVELOPER_BIN_DIR']
-    raise "PLATFORM_DEVELOPER_BIN_DIR is not set" if $bindir.nil?
-    
-    $sdkroot = ENV['SDKROOT']
-    raise "SDKROOT is not set" if $sdkroot.nil?
-
-    $arch = ENV['ARCHS']
-    raise "ARCHS is not set" if $arch.nil?
-    
-    $gccbin = $bindir + '/gcc-4.2'
-    $arbin = $bindir + '/ar'
-
-  end
+        require File.join(rhorootdir, 'platform','iphone','rbuild','buildextension')
 
-  task :all => :config do
+        IPhoneBuild.load_env_for_build_rhodes_ios_extension
 
-    iphone_path = '.'
+        extension_name = "Rhoconnect-client"
+        extension_lib_name = extension_name
+        extension_xcode_target_name = extension_name
 
-    simulator = $sdk =~ /iphonesimulator/
-
-    if $configuration == 'Distribution'
-       $configuration = 'Release'
+        ret= IPhoneBuild.build_rhodes_ios_extension(extension_name, extension_lib_name, extension_xcode_target_name)
     end
-
-    result_lib = iphone_path + '/build/' + $configuration + '-' + ( simulator ? "iphonesimulator" : "iphoneos") + '/libRhoconnect-client.a'
-    target_lib = $targetdir + '/libRhoconnect-client.a'
-
-    rm_rf 'build'
-    rm_rf target_lib
-
-    args = ['build', '-target', 'Rhoconnect-client', '-configuration', $configuration, '-sdk', $sdk]
-
-    require   $rootdir + '/lib/build/jake.rb'
-
-    puts Jake.run($xcodebuild,args)
-    ret = $?
-
-    # copy result to $targetdir
-    cp result_lib,target_lib
-
-  end
-
-
 end
 
 task :default => "build:all"

data/ext/rhoconnect-client/ext/platform/iphone/RhoconnectClient.xcodeproj/project.pbxproj

@@ -266,6 +266,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_C_LANGUAGE_STANDARD = c99;
+				CLANG_CXX_LIBRARY = "libc++";
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
@@ -276,7 +277,7 @@
 					"$(RHO_ROOT)/platform/shared/ruby/iphone",
 					"$(RHO_ROOT)/platform/shared",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
 				SDKROOT = iphonesimulator4.1;
@@ -288,6 +289,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_C_LANGUAGE_STANDARD = c99;
+				CLANG_CXX_LIBRARY = "libc++";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
@@ -297,7 +299,7 @@
 					"$(RHO_ROOT)/platform/shared/ruby/iphone",
 					"$(RHO_ROOT)/platform/shared",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
 				SDKROOT = iphonesimulator4.1;
@@ -311,6 +313,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = NO;
 				DSTROOT = "/tmp/Rhoconnect-client.dst";
+				CLANG_CXX_LIBRARY = "libc++";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
@@ -329,7 +332,7 @@
 					../../shared/sync,
 				);
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PRODUCT_NAME = "Rhoconnect-client";
 				SDKROOT = iphoneos;
@@ -343,6 +346,7 @@
 				DSTROOT = "/tmp/Rhoconnect-client.dst";
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				CLANG_CXX_LIBRARY = "libc++";
 				GCC_PREFIX_HEADER = RhoconnectClient_Prefix.pch;
 				HEADER_SEARCH_PATHS = (
 					"$(RHO_ROOT)/platform/shared/common",
@@ -356,7 +360,7 @@
 					../../shared/sync,
 				);
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PRODUCT_NAME = "Rhoconnect-client";
 				SDKROOT = iphoneos;

data/ext/rhoconnect-client/ext/platform/qt/rhoconnect-client.pro

@@ -1,5 +1,12 @@
 QT -= core
 
+    equals(QT_MAJOR_VERSION, 5) {
+        equals(QT_MINOR_VERSION, 6) {
+            DEFINES += OS_SAILFISH OS_LINUX
+            QT += core
+        }
+    }
+
 TARGET = rhoconnect-client
 TEMPLATE = lib
 
@@ -20,6 +27,7 @@ $$RHODES_ROOT/platform/shared\
 ../../shared\
 ../../shared/sync
 
+
 macx {
   DESTDIR = $$RHODES_ROOT/platform/osx/bin/extensions
   OBJECTS_DIR = $$RHODES_ROOT/platform/osx/bin/extensions/rhoconnect-client
@@ -28,7 +36,7 @@ macx {
 win32 {
   DESTDIR = $$RHODES_ROOT/platform/win32/bin/extensions
   OBJECTS_DIR = $$RHODES_ROOT/platform/win32/bin/extensions/rhoconnect-client
-  DEFINES += WIN32 _WINDOWS _LIB _UNICODE UNICODE
+  DEFINES += WIN32 _WINDOWS _LIB _UNICODE UNICODE WIN32_LEAN_AND_MEAN
   debug {
     DEFINES += _DEBUG DEBUG
   }
@@ -49,6 +57,8 @@ DEFINES += RHODES_QT_PLATFORM _XOPEN_SOURCE _DARWIN_C_SOURCE
   QMAKE_CXXFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
   # QMAKE_CFLAGS += -fvisibility=hidden
   # QMAKE_CXXFLAGS += -fvisibility=hidden
+  #QMAKE_CFLAGS_DEBUG -= -O2
+  #QMAKE_CXXFLAGS_DEBUG -= -O2
 }
 win32 {
   QMAKE_CFLAGS_WARN_ON += /wd4996 /wd4100 /wd4005
@@ -57,6 +67,25 @@ win32 {
   QMAKE_CXXFLAGS_RELEASE += /O2
 }
 
+unix:!macx {
+    DEFINES += OS_LINUX
+    OBJECTS_DIR = $$RHODES_ROOT/platform/linux/bin/extensions/rhoconnect-client
+    DESTDIR = $$RHODES_ROOT/platform/linux/bin/extensions
+    INCLUDEPATH += $$RHODES_ROOT/platform/shared/ruby/linux
+
+    contains(DEFINES, OS_SAILFISH)  {
+        INCLUDEPATH += $$RHODES_ROOT/platform/shared/qt/sailfish/src
+        INCLUDEPATH += $$RHODES_ROOT/platform/shared/qt/sailfish
+        INCLUDEPATH += $$RHODES_ROOT/platform/shared/ruby/sailfish
+    }
+
+    DEFINES += HAVE_CONFIG_H OS_LINUX
+    QMAKE_CFLAGS += -fvisibility=hidden
+    QMAKE_CXXFLAGS += -fvisibility=hidden
+
+}
+
+
 HEADERS += \
 ../../shared/RhoConnectClientImpl.h\
 ../../shared/RhoConnectClientSingletonImpl.h\

data/ext/rhoconnect-client/ext/platform/qt/rhoconnect-client.pro.erb

@@ -0,0 +1,79 @@
+QT -= core
+DEFINES += OS_SAILFISH OS_LINUX
+QT += core
+
+
+TARGET = rhoconnect-client
+TEMPLATE = lib
+
+CONFIG += staticlib warn_on
+
+INCLUDEPATH += \
+<%= @rhoRoot %>/lib/commonAPI/coreapi/ext/shared\
+<%= @rhoRoot %>/platform/shared/common\
+<%= @rhoRoot %>/platform/shared/rubyext\
+<%= @rhoRoot %>/platform/shared/ruby/include\
+<%= @rhoRoot %>/platform/shared\
+<%= @rhoRoot %>/platform/shared/sync\
+<%= @rhoRoot %>/platform/shared\
+<%= @extRoot %>/ext/shared\
+<%= @extRoot %>/ext/shared/sync
+
+DEFINES += RHODES_QT_PLATFORM _XOPEN_SOURCE _DARWIN_C_SOURCE
+
+!isEmpty(RHOSIMULATOR_BUILD) {
+  DEFINES += RHODES_EMULATOR
+}
+
+!win32 {
+  QMAKE_CFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
+  # QMAKE_CFLAGS += -fvisibility=hidden
+  # QMAKE_CXXFLAGS += -fvisibility=hidden
+}
+
+unix:!macx {
+  OBJECTS_DIR = $$PWD/bin/tmp
+  INCLUDEPATH += <%= @rhoRoot %>/platform/shared/ruby/sailfish
+
+  DESTDIR = $$PWD/../extensions
+  contains(DEFINES, OS_SAILFISH)  {
+      INCLUDEPATH += <%= @rhoRoot %>/platform/shared/qt/sailfish/src
+      INCLUDEPATH += <%= @rhoRoot %>/platform/shared/qt/sailfish
+  }
+
+  DEFINES += HAVE_CONFIG_H OS_LINUX
+  QMAKE_CFLAGS += -fvisibility=hidden
+  QMAKE_CXXFLAGS += -fvisibility=hidden
+}
+
+
+HEADERS += \
+<%= @extRoot %>/ext/shared/RhoConnectClientImpl.h\
+<%= @extRoot %>/ext/shared/RhoConnectClientSingletonImpl.h\
+<%= @extRoot %>/ext/shared/generated/cpp/IRhoConnectClient.h\
+<%= @extRoot %>/ext/shared/generated/cpp/RhoConnectClientBase.h\
+<%= @extRoot %>/ext/shared/sync/ClientRegister.h\
+<%= @extRoot %>/ext/shared/sync/ISyncProtocol.h\
+<%= @extRoot %>/ext/shared/sync/SyncEngine.h\
+<%= @extRoot %>/ext/shared/sync/SyncNotify.h\
+<%= @extRoot %>/ext/shared/sync/SyncProtocol_3.h\
+<%= @extRoot %>/ext/shared/sync/SyncProtocol_4.h\
+<%= @extRoot %>/ext/shared/sync/SyncSource.h\
+<%= @extRoot %>/ext/shared/sync/SyncThread.h
+
+SOURCES += \
+<%= @extRoot %>/ext/shared/RhoConnectClientImpl.cpp\
+<%= @extRoot %>/ext/shared/initRhoconnectClient.cpp\
+<%= @extRoot %>/ext/shared/rhoconnectclient.c\
+<%= @extRoot %>/ext/shared/generated/rhoconnectclient_api_init.cpp\
+<%= @extRoot %>/ext/shared/generated/rhoconnectclient_js_api.cpp\
+<%= @extRoot %>/ext/shared/generated/rhoconnectclient_ruby_api.c\
+<%= @extRoot %>/ext/shared/generated/cpp/RhoConnectClientBase.cpp\
+<%= @extRoot %>/ext/shared/generated/cpp/RhoConnectClient_js_wrap.cpp\
+<%= @extRoot %>/ext/shared/generated/cpp/RhoConnectClient_ruby_wrap.cpp\
+<%= @extRoot %>/ext/shared/sync/ClientRegister.cpp\
+<%= @extRoot %>/ext/shared/sync/SyncEngine.cpp\
+<%= @extRoot %>/ext/shared/sync/SyncNotify.cpp\
+<%= @extRoot %>/ext/shared/sync/SyncSource.cpp\
+<%= @extRoot %>/ext/shared/sync/SyncThread.cpp

data/ext/rhoconnect-client/ext/shared/sync/ClientRegister.cpp

@@ -134,7 +134,7 @@ CClientRegister::CClientRegister() : m_nPollInterval(POLL_INTERVAL_SECONDS), m_s
 CClientRegister::~CClientRegister()
 {
     doStop();
-    m_pInstance = null;
+    m_pInstance = 0;
 }
 void CClientRegister::setRhoconnectCredentials(const String& user, const String& pass, const String& session)
 {
@@ -209,7 +209,7 @@ void CClientRegister::run()
 	{
         i++;
         LOG(INFO)+"Try to (un)register: " + i;
-        if ( CSyncThread::getInstance() != null )
+        if ( CSyncThread::getInstance() != 0 )
 		{
             EnState state = getState();
 			if ( (stRegister==state) && doRegister(CSyncThread::getSyncEngine()) )
@@ -231,7 +231,11 @@ void CClientRegister::run()
 
 String CClientRegister::getRegisterBody(const String& strClientID)
 {
+#if !defined(OS_SAILFISH) && !defined(OS_LINUX)
     String strPushType = rho::push::CPushManager::getInstance()->getDefaultID();
+#else
+    String strPushType = "";
+#endif
     if(strPushType == "rhoconnect")
     {
         strPushType = "rhoconnect_push";

data/ext/rhoconnect-client/ext/shared/sync/SyncEngine.cpp

@@ -124,14 +124,14 @@ void CSyncEngine::CSourceOptions::setProperty(int nSrcID, const char* szPropName
     synchronized(m_mxSrcOptions)
     {
         Hashtable<String,String>* phashOptions = m_hashSrcOptions.get(nSrcID);
-        if ( phashOptions == null )
+        if ( phashOptions == 0 )
         {
             phashOptions = new Hashtable<String,String>();
             m_hashSrcOptions.put( nSrcID, phashOptions );
         }
 
         Hashtable<String,String>& hashOptions = *phashOptions;
-        hashOptions.put(szPropName,szPropValue!=null?szPropValue:"");
+        hashOptions.put(szPropName,szPropValue!=0?szPropValue:"");
     }
 }
 
@@ -141,7 +141,7 @@ String CSyncEngine::CSourceOptions::getProperty(int nSrcID, const char* szPropNa
     synchronized(m_mxSrcOptions)
     {
         Hashtable<String,String>* phashOptions = m_hashSrcOptions.get(nSrcID);
-        if ( phashOptions != null )
+        if ( phashOptions != 0 )
         {
             Hashtable<String,String>& hashOptions = *phashOptions;
             res = hashOptions.get(szPropName);
@@ -198,11 +198,11 @@ void CSyncEngine::prepareSync(ESyncState eState, const CSourceID* oSrcID)
     }else
         m_nErrCode = RhoAppAdapter.ERR_CLIENTISNOTLOGGEDIN;
 
-    CSyncSource* src = null;
-    if ( oSrcID != null )
+    CSyncSource* src = 0;
+    if ( oSrcID != 0 )
     	src = findSource(*oSrcID);
 
-	if ( src != null )
+	if ( src != 0 )
 	{
         src->m_nErrCode = m_nErrCode;
         src->m_strError = m_strError;
@@ -217,7 +217,7 @@ void CSyncEngine::prepareSync(ESyncState eState, const CSourceID* oSrcID)
 
 void CSyncEngine::doSyncAllSources(const String& strQueryParams, boolean bSyncOnlyChangedSources)
 {
-    prepareSync(esSyncAllSources, null);
+    prepareSync(esSyncAllSources, 0);
 
     if ( isContinueSync() )
     {
@@ -304,7 +304,7 @@ bool CSyncEngine::recoverSearch(const String& strUrl, const String& strBody, int
 
         String strSrcName = oSrcArr.getCurItem().getString("source");
         CSyncSource* pSrc = findSourceByName(strSrcName);
-        if ( pSrc == null )
+        if ( pSrc == 0 )
         {
             LOG(ERROR) + "Sync server send search data for unknown source name:" + strSrcName;
             errorCode = RhoAppAdapter.ERR_UNEXPECTEDSERVERRESPONSE;
@@ -323,7 +323,7 @@ bool CSyncEngine::recoverSearch(const String& strUrl, const String& strBody, int
 
 void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams, const String& strFrom, boolean bSearchSyncChanges, int nProgressStep)
 {
-    prepareSync(esSearch, null);
+    prepareSync(esSearch, 0);
     if ( !isContinueSync() )
     {
         if ( getState() != esExit )
@@ -339,7 +339,7 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
         for ( int i = 0; i < (int)arSources.size(); i++ )
         {
             CSyncSource* pSrc = findSourceByName(arSources.elementAt(i));
-            if ( pSrc != null )
+            if ( pSrc != 0 )
                 pSrc->syncClientChanges();
         }
     }
@@ -374,7 +374,7 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
         for ( int i = 0; i < (int)arSources.size(); i++ )
         {
             CSyncSource* pSrc = findSourceByName(arSources.elementAt(i));
-            if ( pSrc != null )
+            if ( pSrc != 0 )
             {
                 String source_token;
                 if ( !pSrc->isTokenFromDB() && pSrc->getToken() > 1 )
@@ -416,7 +416,7 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
             continue;
         }
 
-        const char* szData = null;
+        const char* szData = 0;
         if ( strTestResp.length() > 0 )
         {
             szData = strTestResp.c_str();
@@ -466,7 +466,7 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
 
             String strSrcName = oSrcArr.getCurItem().getString("source");
             CSyncSource* pSrc = findSourceByName(strSrcName);
-            if ( pSrc == null )
+            if ( pSrc == 0 )
             {
                 LOG(ERROR) + "Sync server send search data for unknown source name:" + strSrcName;
                 stopSync();
@@ -487,7 +487,7 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
             for ( int i = 0; i < (int)arSources.size(); i++ )
             {
                 CSyncSource* pSrc = findSourceByName(arSources.elementAt(i));
-                if ( pSrc != null )
+                if ( pSrc != 0 )
                     pSrc->processToken(0);
             }
 
@@ -506,7 +506,7 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
     for ( int i = 0; i < (int)arSources.size(); i++ )
     {
         CSyncSource* pSrc = findSourceByName(arSources.elementAt(i));
-        if ( pSrc == null )
+        if ( pSrc == 0 )
             continue;
         CSyncSource& oSrc = *pSrc;
         oSrc.getDB().executeSQL("UPDATE sources set last_updated=?,last_inserted_size=?,last_deleted_size=?, \
@@ -529,7 +529,7 @@ void CSyncEngine::doSyncSource(const CSourceID& oSrcID, const String& strQueryPa
     if ( isContinueSync() )
     {
         CSyncSource* pSrc = findSource(oSrcID);
-        if ( pSrc != null )
+        if ( pSrc != 0 )
         {
             CSyncSource& src = *pSrc;
             LOG(INFO) +"Started synchronization of the data source: " + src.getName();
@@ -564,7 +564,7 @@ CSyncSource* CSyncEngine::findSource(const CSourceID& oSrcID)
             return &src;
     }
 
-    return null;
+    return 0;
 }
 
 CSyncSource* CSyncEngine::findSourceByName(const String& strSrcName)
@@ -581,7 +581,7 @@ CSyncSource* CSyncEngine::findSourceById(int srcId)
             return &src;
     }
 
-    return null;
+    return 0;
 }
 
 
@@ -609,7 +609,7 @@ void CSyncEngine::loadAllSources()
             RhoAppAdapter.loadAllSyncSources();
         else
         {
-            NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/loadallsyncsources"), "", null );
+            NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/loadallsyncsources"), "", 0 );
         }
     }else
         RhoAppAdapter.loadAllSyncSources();
@@ -748,7 +748,7 @@ void CSyncEngine::processServerSources(String strSources)
                 RhoAppAdapter.loadServerSources(strSources);
             else
             {
-                NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null );
+                NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, 0 );
             }
         }else
             RhoAppAdapter.loadServerSources(strSources);
@@ -762,7 +762,7 @@ void CSyncEngine::processServerSources(String strSources)
 boolean CSyncEngine::resetClientIDByNet(const String& strClientID)//throws Exception
 {
     NetResponse resp = getNetClientID().doRequest(getProtocol().getClientResetMethod(),
-        getProtocol().getClientResetUrl(strClientID), getProtocol().getClientResetBody(), this, null );
+        getProtocol().getClientResetUrl(strClientID), getProtocol().getClientResetBody(), this, 0 );
     if ( !resp.isOK() )
     {
         m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
@@ -777,8 +777,8 @@ String CSyncEngine::requestClientIDByNet()
 {
     String clientCreateBody;
     NetResponse resp = getNetClientID().doRequest(getProtocol().getClientCreateMethod(),
-        getProtocol().getClientCreateUrl(), "", this, null);
-    if ( resp.isOK() && resp.getCharData() != null )
+        getProtocol().getClientCreateUrl(), "", this, 0);
+    if ( resp.isOK() && resp.getCharData() != 0 )
     {
         const char* szData = resp.getCharData();
 
@@ -906,7 +906,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
         reqHeaders.put(getProtocol().getClientIDHeader(), getClientID());
         NetResponse resp = getNet().doRequest(getProtocol().getServerBulkDataMethod(), strUrl, strBody, this, &reqHeaders);
         const char* szData = resp.getCharData();
-        if ( !resp.isOK() || szData == null || *szData == 0)
+        if ( !resp.isOK() || szData == 0 || *szData == 0)
         {
     	    LOG(ERROR) + "Bulk sync failed: server return an error.";
     	    stopSync();
@@ -950,7 +950,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
     String strSqlDataUrl = CFilePath::join(getHostFromUrl(serverUrl), strDataUrl) +strZip;
     LOG(INFO) + "Bulk sync: download data from server: " + strSqlDataUrl;
     {
-        NetResponse resp1 = getNet().pullFile(strSqlDataUrl, fDataName+strZip, this, null, true, false);
+        NetResponse resp1 = getNet().pullFile(strSqlDataUrl, fDataName+strZip, this, 0, true, false);
         if ( !resp1.isOK() )
         {
 	        LOG(ERROR) + "Bulk sync failed: cannot download database file.";
@@ -1057,7 +1057,7 @@ void CSyncEngine::syncAllSources(const String& strQueryParams, boolean bSyncOnly
     }
 
     if ( !isSchemaChanged() && getState() != CSyncEngine::esStop )
-    	getNotify().fireSyncNotification(null, true, RhoAppAdapter.ERR_NONE, RhoAppAdapter.getMessageText("sync_completed"));
+    	getNotify().fireSyncNotification(0, true, RhoAppAdapter.ERR_NONE, RhoAppAdapter.getMessageText("sync_completed"));
 }
 
 void CSyncEngine::login(String name, String password, const CSyncNotification& oNotify)
@@ -1121,7 +1121,7 @@ void CSyncEngine::login(String name, String password, const CSyncNotification& o
                         RhoAppAdapter.resetDBOnSyncUserChanged();
                     else
                     {
-                        NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/resetDBOnSyncUserChanged"), "", null );
+                        NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/resetDBOnSyncUserChanged"), "", 0 );
                     }
                 }
             }

data/ext/rhoconnect-client/ext/shared/sync/SyncNotify.cpp

@@ -73,7 +73,7 @@ void CSyncNotify::addObjectNotify(int nSrcID, const String& strObject)
     synchronized(m_mxObjectNotify)
     {
         Hashtable<String,int>* phashObject = m_hashSrcIDAndObject.get(nSrcID);
-        if ( phashObject == null )
+        if ( phashObject == 0 )
         {
             phashObject = new Hashtable<String,int>();
             m_hashSrcIDAndObject.put( nSrcID, phashObject );
@@ -198,7 +198,7 @@ void CSyncNotify::onObjectChanged(int nSrcID, const String& strObject, int nType
         processSingleObject();
 
         Hashtable<String,int>* phashObject = m_hashSrcIDAndObject.get(nSrcID);
-        if ( phashObject == null )
+        if ( phashObject == 0 )
             return;
 
         Hashtable<String,int>& hashObject = *phashObject;
@@ -212,7 +212,7 @@ void CSyncNotify::addCreateObjectError(int nSrcID, const String& strObject, cons
     synchronized(m_mxObjectNotify)
     {
         Hashtable<String,String>* phashErrors = m_hashCreateObjectErrors.get(nSrcID);
-        if ( phashErrors == null )
+        if ( phashErrors == 0 )
         {
             phashErrors = new Hashtable<String,String>();
             m_hashCreateObjectErrors.put( nSrcID, phashErrors );
@@ -232,7 +232,7 @@ void CSyncNotify::appendCreateObjectErrorInfo(int nSrcID, Hashtable< String, Has
         Hashtable<String,String>* phashErrors = m_hashCreateObjectErrors.get(nSrcID);
 		
 		
-        if ( phashErrors == null )
+        if ( phashErrors == 0 )
             return ;
 
         Hashtable<String,String>& hashErrors = *phashErrors;
@@ -266,7 +266,7 @@ void CSyncNotify::onSyncSourceEnd( int nSrc, VectorPtr<CSyncSource*>& sources )
 /*    if ( getSync().getState() == CSyncEngine::esStop && src.m_nErrCode != RhoAppAdapter.ERR_NONE )
     {
 		CSyncNotification* pSN = getSyncNotifyBySrc(&src);
-		if ( pSN != null )
+		if ( pSN != 0 )
 			fireSyncNotification(&src, true, src.m_nErrCode, "");
 		else
 			fireAllSyncNotifications(true, src.m_nErrCode, src.m_strError, "" );
@@ -297,7 +297,7 @@ void CSyncNotify::setSyncNotification(int source_id, CSyncNotification* pNotify
 }
 
 CSyncNotification::CSyncNotification(const apiGenerator::CMethodResult& callbackData, boolean bRemoveAfterFire) :
-    m_callbackData(callbackData), m_cCallback(null), m_cCallbackData(null), m_bRemoveAfterFire(bRemoveAfterFire)
+    m_callbackData(callbackData), m_cCallback(0), m_cCallbackData(0), m_bRemoveAfterFire(bRemoveAfterFire)
 {
 //    if ( m_callbackData.strUrl.length() > 0 )
 //        m_callbackData.strUrl = RHODESAPPBASE().canonicalizeRhoUrl(m_callbackData.strUrl);
@@ -322,7 +322,7 @@ String CSyncNotification::toString()const
 }
     
 CObjectNotification::CObjectNotification(const apiGenerator::CMethodResult& callbackData) :
-   m_callbackData(callbackData), m_cCallback(null), m_cCallbackData(null)
+   m_callbackData(callbackData), m_cCallback(0), m_cCallbackData(0)
 {
 }
 
@@ -366,7 +366,7 @@ void CSyncNotify::reportSyncStatus(String status, int error, String strDetails)
 {
 	synchronized(m_mxSyncNotifications)
 	{    	
-    	if (/*m_syncStatusListener != null && */(isReportingEnabled() || error == RhoAppAdapter.ERR_SYNCVERSION) ) {
+    	if (/*m_syncStatusListener != 0 && */(isReportingEnabled() || error == RhoAppAdapter.ERR_SYNCVERSION) ) {
     		
     		if ( error == RhoAppAdapter.ERR_SYNCVERSION )
             {
@@ -402,7 +402,7 @@ void CSyncNotify::fireBulkSyncNotification( boolean bFinish, String status, Stri
 	params.put("bulk_status",status);
 	params.put("sync_type","bulk");
 
-    doFireSyncNotification( null, bFinish, nErrCode, "", &params, 0 );
+    doFireSyncNotification( 0, bFinish, nErrCode, "", &params, 0 );
 }
 
 
@@ -413,9 +413,9 @@ void CSyncNotify::fireAllSyncNotifications( boolean bFinish, int nErrCode, Strin
 
     synchronized(m_mxSyncNotifications)
     {
-        CSyncNotification* pSN = getSyncNotifyBySrc(null);    
-        if ( pSN != null )
-            doFireSyncNotification( null, bFinish, nErrCode, strError, 0, 0/*strServerError*/ );
+        CSyncNotification* pSN = getSyncNotifyBySrc(0);    
+        if ( pSN != 0 )
+            doFireSyncNotification( 0, bFinish, nErrCode, strError, 0, 0/*strServerError*/ );
     }
 }
 
@@ -429,10 +429,10 @@ void CSyncNotify::fireSyncNotification( CSyncSource* src, boolean bFinish, int n
 	{
 		if ( !getSync().isSearch() )
         {
-			if ( src != null && strMessage.length() == 0 )
+			if ( src != 0 && strMessage.length() == 0 )
 				strMessage = RhoAppAdapter.getMessageText("sync_failed_for") + (*src).getName() + ".";
 			
-            reportSyncStatus(strMessage,nErrCode, (src != null ? (*src).m_strError : "") );
+            reportSyncStatus(strMessage,nErrCode, (src != 0 ? (*src).m_strError : "") );
         }
 	}
 
@@ -441,22 +441,22 @@ void CSyncNotify::fireSyncNotification( CSyncSource* src, boolean bFinish, int n
 
 CSyncNotification* CSyncNotify::getSyncNotifyBySrc(CSyncSource* src)
 {
-    CSyncNotification* pSN = null;
+    CSyncNotification* pSN = 0;
 	if ( getSync().isSearch() )
 		pSN = m_pSearchNotification;
 	else
     {
-        if ( src != null )
+        if ( src != 0 )
 		    pSN = m_mapSyncNotifications.get( (*src).getID());
 
-        if ( pSN == null )
+        if ( pSN == 0 )
             pSN = m_pAllNotification;
     }
 
-	if ( pSN == null && !getSync().isNoThreadedMode() )
-        return null;
+	if ( pSN == 0 && !getSync().isNoThreadedMode() )
+        return 0;
 
-    return pSN != null ? pSN : &m_emptyNotify;
+    return pSN != 0 ? pSN : &m_emptyNotify;
 }
 
 void CSyncNotify::fireSyncNotification2( CSyncSource* src, boolean bFinish, int nErrCode, const Hashtable<String,String>& serverErrors)
@@ -479,7 +479,7 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int
         synchronized(m_mxSyncNotifications)
         {
             pSN = getSyncNotifyBySrc(src);
-	        if ( pSN == null )
+	        if ( pSN == 0 )
                 return;
 			
 			if ( params != 0 ) {
@@ -488,7 +488,7 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int
 				result.put("sync_type","incremental");
 			}
 
-            if ( src != null )
+            if ( src != 0 )
             {
 				result.put("total_count", convertToStringA( (*src).getTotalCount()));
 				result.put("processed_count", convertToStringA( (*src).getTotalCount()));
@@ -505,7 +505,7 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int
                     if ( getSync().isSchemaChanged() )
                         status = "schema_changed";
                     else
-                        status = (src == null && ( (params==0) || params->size()==0 ) ) ? "complete" : "ok";
+                        status = (src == 0 && ( (params==0) || params->size()==0 ) ) ? "complete" : "ok";
                 }
 	            else
 	            {
@@ -519,7 +519,7 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int
 					String error;
 					if ( strError.length() > 0 ) {
                         error = strError;
-					} else if ( src != null ) {
+					} else if ( src != 0 ) {
                         error = (*src).m_strError;
 					}
 					
@@ -530,7 +530,7 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int
 					}
 				}
 
-                if ( src != null ) {
+                if ( src != 0 ) {
                     appendCreateObjectErrorInfo( (*src).getID(), errorsL2 );
 				}
             } else {
@@ -542,7 +542,7 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int
             bRemoveAfterFire = bRemoveAfterFire && pSN->m_bRemoveAfterFire;
         }
     }
-    LOG(INFO) + "Fire notification. Source : " + (src != null ? (*src).getName():"") + "; " + pSN->toString();
+    LOG(INFO) + "Fire notification. Source : " + (src != 0 ? (*src).getName():"") + "; " + pSN->toString();
 	
     if ( callNotify(*pSN, result, &errorsL2 ) || bRemoveAfterFire)
         clearNotification(src);
@@ -660,13 +660,13 @@ boolean CSyncNotify::callNotify(const CSyncNotification& oNotify, const Hashtabl
 
 void CSyncNotify::clearNotification(CSyncSource* src)
 {
-    LOG(INFO) + "Clear notification. Source : " + (src != null ? (*src).getName() : "");
+    LOG(INFO) + "Clear notification. Source : " + (src != 0 ? (*src).getName() : "");
 
     synchronized(m_mxSyncNotifications)
     {
         if ( getSync().isSearch() )
-            m_pSearchNotification = null;
-        else if ( src != null )
+            m_pSearchNotification = 0;
+        else if ( src != 0 )
             m_mapSyncNotifications.remove( (*src).getID());
     }
 }
@@ -678,7 +678,7 @@ void CSyncNotify::clearSyncNotification(int source_id)
     synchronized(m_mxSyncNotifications)
     {
         if ( source_id == -1 )//Clear all
-            m_pAllNotification = null;
+            m_pAllNotification = 0;
         else
             m_mapSyncNotifications.remove(source_id);
     }

data/ext/rhoconnect-client/ext/shared/sync/SyncSource.cpp

@@ -664,7 +664,7 @@ void CSyncSource::syncServerChanges()
             continue;
         }
 
-        const char* szData = null;
+        const char* szData = 0;
         String strTestResp = getSync().getSourceOptions().getProperty(getID(), "rho_server_response");
         if ( strTestResp.length() > 0 )
         {
@@ -700,10 +700,10 @@ void CSyncSource::processServerErrors(CJSONEntry& oCmds)
 {
     Hashtable<String, String> errors;
 
-    const char* arErrTypes[] = {"source-error", "search-error", "create-error", "update-error", "delete-error", "update-rollback", null};
+    const char* arErrTypes[] = {"source-error", "search-error", "create-error", "update-error", "delete-error", "update-rollback", 0};
     for( int i = 0; ; i++ )
     {
-        if ( arErrTypes[i] == null )
+        if ( arErrTypes[i] == 0 )
             break;
         if ( !oCmds.hasName(arErrTypes[i]) )
             continue;
@@ -1154,7 +1154,7 @@ void CSyncSource::processAssociations(const String& strOldObject, const String&
     for ( int i = 0; i < (int)m_arAssociations.size(); i++ )
     {
         CSyncSource* pSrc = getSync().findSourceByName(m_arAssociations.elementAt(i).m_strSrcName);
-        if ( pSrc != null )
+        if ( pSrc != 0 )
             pSrc->updateAssociation(strOldObject, strNewObject, m_arAssociations.elementAt(i).m_strAttrib);
     }
 }
@@ -1653,13 +1653,13 @@ boolean CSyncSource::downloadBlob(CAttrValue& value)//throws Exception
 	LOG(TRACE) + "Download blob: " + url + " => " + fName;
 
 	const char* nQuest = strchr(url.c_str(),'?');
-	if ( nQuest > 0 )
+	if ( nQuest != NULL )
 		url += "&";
 	else
 		url += "?";
 	url += "client_id=" + getSync().getClientID();
 
-    NetResponse resp = getNet().pullFile(url, fName, &getSync(), null, true, false);
+    NetResponse resp = getNet().pullFile(url, fName, &getSync(), 0, true, false);
     if ( !resp.isOK() )
     {
         CRhoFile::deleteFile(fName.c_str());
@@ -1685,7 +1685,10 @@ void CSyncSource::processToken(uint64 token)
 	}else
     {
         setToken( token );
+        
+        getDB().Lock();
         getDB().executeSQL("UPDATE sources SET token=? where source_id=?", token, getID() );
+        getDB().Unlock();
 	}
 
 }

data/ext/rhoconnect-client/ext.yml

@@ -6,6 +6,9 @@ libraries: ["Rhoconnect-client"]
 project_paths:
   wp8: ext/platform/wp8/Rhoconnect-client.vcxproj
   wm: ext/platform/wm/Rhoconnect-client.vcproj
+  
+sailfish:
+  proerb: ext/platform/qt/rhoconnect-client.pro.erb
 
 xml_api_paths: ext/RhoConnectClient.xml
 android:

data/lib/build/jakercc.rb

@@ -0,0 +1,41 @@
+
+# Class with around building things
+class JakeRCC
+
+
+  def self.run3_dont_fail(command, cd = nil, env = {})
+    set_list = []
+    env.each_pair do |k, v|
+      if RUBY_PLATFORM =~ /(win|w)32$/
+        set_list << "set \"#{k}=#{v}\"&&"
+      else
+        set_list << "export #{k}=#{v}&&"
+      end
+    end
+
+    to_print = "CMD: #{command}"
+    to_run = set_list.join('') + command
+    if !cd.nil?
+      to_print = "PWD: #{cd}\n#{to_print}"
+
+      if RUBY_PLATFORM =~ /(win|w)32$/
+        cd_ = cd.gsub('/', "\\")
+        to_run = "cd /d \"#{cd_}\"&&#{to_run}"
+      else
+        to_run = "cd '#{cd}'&&#{to_run}"
+      end
+    end
+
+    if !env.nil?
+      to_print = "ENV: #{env}\n#{to_print}"
+    end
+
+    system(to_run)
+  end
+
+  def self.run3(command, cd = nil, env = {})
+    fail "[#{command}]" unless self.run3_dont_fail(command, cd, env)
+  end
+
+
+end

metadata

@@ -1,23 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: rhoconnect-client
 version: !ruby/object:Gem::Version
-  version: 5.5.18
+  version: 7.4.1
 platform: ruby
 authors:
 - Rhomobile Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies: []
 description: RhoConnect client extension
 email: rhomobile@googlegroups.com
 executables: []
-extensions: []
+extensions:
+- "./ext/extconf-chmod.rb"
 extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- "./ext/extconf-chmod.rb"
 - "./ext/rhoconnect-client/RhoConnectClient.rb"
 - "./ext/rhoconnect-client/ext.yml"
 - "./ext/rhoconnect-client/ext/RhoConnectClient.xml"
@@ -33,6 +35,7 @@ files:
 - "./ext/rhoconnect-client/ext/platform/iphone/impl/readme.txt"
 - "./ext/rhoconnect-client/ext/platform/qt/Rakefile"
 - "./ext/rhoconnect-client/ext/platform/qt/rhoconnect-client.pro"
+- "./ext/rhoconnect-client/ext/platform/qt/rhoconnect-client.pro.erb"
 - "./ext/rhoconnect-client/ext/platform/wm/Rhoconnect-client.sln"
 - "./ext/rhoconnect-client/ext/platform/wm/Rhoconnect-client.vcproj"
 - "./ext/rhoconnect-client/ext/platform/wm/Rhoconnect-client.vsprops"
@@ -60,6 +63,7 @@ files:
 - "./ext/rhoconnect-client/ext/shared/sync/SyncSource.h"
 - "./ext/rhoconnect-client/ext/shared/sync/SyncThread.cpp"
 - "./ext/rhoconnect-client/ext/shared/sync/SyncThread.h"
+- "./lib/build/jakercc.rb"
 - "./lib/build/run_rhoconnect_spec.rb"
 - "./lib/rhoconnect-client.rb"
 - "./platform/shared/RhoConnectClient/RhoConnectClient.cpp"