rhoconnect-client 6.0.11 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8ac5a11b68ce3ec48e7c600a73c5a88d89b0853
-  data.tar.gz: cf10ed2afa9e473316b74a8d1d55c5bdba79d110
+  metadata.gz: a571a25415dc890011d3eb532b900746fc557a7a
+  data.tar.gz: 14a1882c9b5723f6080093d73ef3889f13684c18
 SHA512:
-  metadata.gz: 6bdc3367badec79f88f8b818a5c591f5f5d746abdcb39ea5867f3e8d4252e10c88b14df72aa05b38895d098277e3420017c8ed5df0fe0f1566fcf338b21355ed
-  data.tar.gz: cb95f1247d31c1e632dea61750012a3d5d36e104933a7e0e3fff03979cbd5815c0c9691ce7f98b469a3179734ec1705497d9bbaded6761d39f4a530225a56c8a
+  metadata.gz: 593fab3d7626608c84b71d13160c972b37cae08aeb77735625e1d372b8959490a1cf1a62e1772160611122af198595e44b5b4ac95ca0f0ff15b5ca86d4542d29
+  data.tar.gz: 8ae7cb963f87dfad2974829ae904b7a18252c4d50b07157f4b019c41ce0cd98511eedfc3d7028dd070ced1b0913cdfa12eb6d23e0d6fc3faf7501c6701ef4920

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/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,28 @@ win32 {
   QMAKE_CXXFLAGS_RELEASE += /O2
 }
 
+unix:!macx {
+  OBJECTS_DIR = $$RHODES_ROOT/platform/linux/bin/extensions/rhoconnect-client
+  INCLUDEPATH += $$RHODES_ROOT/platform/shared/ruby/sailfish
+
+
+  contains(DEFINES, OS_LINUX)  {
+      DESTDIR = $$RHODES_ROOT/platform/linux/bin/extensions
+  }
+
+  contains(DEFINES, OS_SAILFISH)  {
+      INCLUDEPATH += $$RHODES_ROOT/platform/shared/qt/sailfish/src
+      INCLUDEPATH += $$RHODES_ROOT/platform/shared/qt/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

@@ -231,7 +231,11 @@ void CClientRegister::run()
 
 String CClientRegister::getRegisterBody(const String& strClientID)
 {
+#ifndef OS_SAILFISH
     String strPushType = rho::push::CPushManager::getInstance()->getDefaultID();
+#else
+    String strPushType = "";
+#endif
     if(strPushType == "rhoconnect")
     {
         strPushType = "rhoconnect_push";

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

@@ -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();
 	}
 
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhoconnect-client
 version: !ruby/object:Gem::Version
-  version: 6.0.11
+  version: 6.2.0
 platform: ruby
 authors:
 - Rhomobile Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-28 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies: []
 description: RhoConnect client extension
 email: rhomobile@googlegroups.com
@@ -33,6 +33,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"