rhoconnect-client 6.0.11 → 6.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/ext/rhoconnect-client/ext.yml +3 -0
  3. data/ext/rhoconnect-client/ext/platform/iphone/RhoconnectClient.xcodeproj/project.pbxproj +8 -4
  4. data/ext/rhoconnect-client/ext/platform/qt/rhoconnect-client.pro +33 -1
  5. data/ext/rhoconnect-client/ext/platform/qt/rhoconnect-client.pro.erb +79 -0
  6. data/ext/rhoconnect-client/ext/shared/sync/ClientRegister.cpp +4 -0
  7. data/ext/rhoconnect-client/ext/shared/sync/SyncSource.cpp +3 -0
  8. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f8ac5a11b68ce3ec48e7c600a73c5a88d89b0853
4
- data.tar.gz: cf10ed2afa9e473316b74a8d1d55c5bdba79d110
3
+ metadata.gz: a571a25415dc890011d3eb532b900746fc557a7a
4
+ data.tar.gz: 14a1882c9b5723f6080093d73ef3889f13684c18
5
5
  SHA512:
6
- metadata.gz: 6bdc3367badec79f88f8b818a5c591f5f5d746abdcb39ea5867f3e8d4252e10c88b14df72aa05b38895d098277e3420017c8ed5df0fe0f1566fcf338b21355ed
7
- data.tar.gz: cb95f1247d31c1e632dea61750012a3d5d36e104933a7e0e3fff03979cbd5815c0c9691ce7f98b469a3179734ec1705497d9bbaded6761d39f4a530225a56c8a
6
+ metadata.gz: 593fab3d7626608c84b71d13160c972b37cae08aeb77735625e1d372b8959490a1cf1a62e1772160611122af198595e44b5b4ac95ca0f0ff15b5ca86d4542d29
7
+ data.tar.gz: 8ae7cb963f87dfad2974829ae904b7a18252c4d50b07157f4b019c41ce0cd98511eedfc3d7028dd070ced1b0913cdfa12eb6d23e0d6fc3faf7501c6701ef4920
data/ext/rhoconnect-client/ext.yml CHANGED
@@ -6,6 +6,9 @@ libraries: ["Rhoconnect-client"]
6
6
  project_paths:
7
7
  wp8: ext/platform/wp8/Rhoconnect-client.vcxproj
8
8
  wm: ext/platform/wm/Rhoconnect-client.vcproj
9
+
10
+ sailfish:
11
+ proerb: ext/platform/qt/rhoconnect-client.pro.erb
9
12
 
10
13
  xml_api_paths: ext/RhoConnectClient.xml
11
14
  android:
data/ext/rhoconnect-client/ext/platform/iphone/RhoconnectClient.xcodeproj/project.pbxproj CHANGED
@@ -266,6 +266,7 @@
266
266
  isa = XCBuildConfiguration;
267
267
  buildSettings = {
268
268
  GCC_C_LANGUAGE_STANDARD = c99;
269
+ CLANG_CXX_LIBRARY = "libc++";
269
270
  GCC_OPTIMIZATION_LEVEL = 0;
270
271
  GCC_WARN_ABOUT_RETURN_TYPE = YES;
271
272
  GCC_WARN_UNUSED_VARIABLE = YES;
@@ -276,7 +277,7 @@
276
277
  "$(RHO_ROOT)/platform/shared/ruby/iphone",
277
278
  "$(RHO_ROOT)/platform/shared",
278
279
  );
279
- IPHONEOS_DEPLOYMENT_TARGET = 3.0;
280
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
280
281
  ONLY_ACTIVE_ARCH = NO;
281
282
  PREBINDING = NO;
282
283
  SDKROOT = iphonesimulator4.1;
@@ -288,6 +289,7 @@
288
289
  isa = XCBuildConfiguration;
289
290
  buildSettings = {
290
291
  GCC_C_LANGUAGE_STANDARD = c99;
292
+ CLANG_CXX_LIBRARY = "libc++";
291
293
  GCC_WARN_ABOUT_RETURN_TYPE = YES;
292
294
  GCC_WARN_UNUSED_VARIABLE = YES;
293
295
  HEADER_SEARCH_PATHS = (
@@ -297,7 +299,7 @@
297
299
  "$(RHO_ROOT)/platform/shared/ruby/iphone",
298
300
  "$(RHO_ROOT)/platform/shared",
299
301
  );
300
- IPHONEOS_DEPLOYMENT_TARGET = 3.0;
302
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
301
303
  ONLY_ACTIVE_ARCH = NO;
302
304
  PREBINDING = NO;
303
305
  SDKROOT = iphonesimulator4.1;
@@ -311,6 +313,7 @@
311
313
  ALWAYS_SEARCH_USER_PATHS = NO;
312
314
  COPY_PHASE_STRIP = NO;
313
315
  DSTROOT = "/tmp/Rhoconnect-client.dst";
316
+ CLANG_CXX_LIBRARY = "libc++";
314
317
  GCC_DYNAMIC_NO_PIC = NO;
315
318
  GCC_ENABLE_FIX_AND_CONTINUE = YES;
316
319
  GCC_MODEL_TUNING = G5;
@@ -329,7 +332,7 @@
329
332
  ../../shared/sync,
330
333
  );
331
334
  INSTALL_PATH = /usr/local/lib;
332
- IPHONEOS_DEPLOYMENT_TARGET = 3.0;
335
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
333
336
  MACOSX_DEPLOYMENT_TARGET = 10.5;
334
337
  PRODUCT_NAME = "Rhoconnect-client";
335
338
  SDKROOT = iphoneos;
@@ -343,6 +346,7 @@
343
346
  DSTROOT = "/tmp/Rhoconnect-client.dst";
344
347
  GCC_MODEL_TUNING = G5;
345
348
  GCC_PRECOMPILE_PREFIX_HEADER = YES;
349
+ CLANG_CXX_LIBRARY = "libc++";
346
350
  GCC_PREFIX_HEADER = RhoconnectClient_Prefix.pch;
347
351
  HEADER_SEARCH_PATHS = (
348
352
  "$(RHO_ROOT)/platform/shared/common",
@@ -356,7 +360,7 @@
356
360
  ../../shared/sync,
357
361
  );
358
362
  INSTALL_PATH = /usr/local/lib;
359
- IPHONEOS_DEPLOYMENT_TARGET = 3.0;
363
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
360
364
  MACOSX_DEPLOYMENT_TARGET = 10.5;
361
365
  PRODUCT_NAME = "Rhoconnect-client";
362
366
  SDKROOT = iphoneos;
data/ext/rhoconnect-client/ext/platform/qt/rhoconnect-client.pro CHANGED
@@ -1,5 +1,12 @@
1
1
  QT -= core
2
2
 
3
+ equals(QT_MAJOR_VERSION, 5) {
4
+ equals(QT_MINOR_VERSION, 6) {
5
+ DEFINES += OS_SAILFISH OS_LINUX
6
+ QT += core
7
+ }
8
+ }
9
+
3
10
  TARGET = rhoconnect-client
4
11
  TEMPLATE = lib
5
12
 
@@ -20,6 +27,7 @@ $$RHODES_ROOT/platform/shared\
20
27
  ../../shared\
21
28
  ../../shared/sync
22
29
 
30
+
23
31
  macx {
24
32
  DESTDIR = $$RHODES_ROOT/platform/osx/bin/extensions
25
33
  OBJECTS_DIR = $$RHODES_ROOT/platform/osx/bin/extensions/rhoconnect-client
@@ -28,7 +36,7 @@ macx {
28
36
  win32 {
29
37
  DESTDIR = $$RHODES_ROOT/platform/win32/bin/extensions
30
38
  OBJECTS_DIR = $$RHODES_ROOT/platform/win32/bin/extensions/rhoconnect-client
31
- DEFINES += WIN32 _WINDOWS _LIB _UNICODE UNICODE
39
+ DEFINES += WIN32 _WINDOWS _LIB _UNICODE UNICODE WIN32_LEAN_AND_MEAN
32
40
  debug {
33
41
  DEFINES += _DEBUG DEBUG
34
42
  }
@@ -49,6 +57,8 @@ DEFINES += RHODES_QT_PLATFORM _XOPEN_SOURCE _DARWIN_C_SOURCE
49
57
  QMAKE_CXXFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
50
58
  # QMAKE_CFLAGS += -fvisibility=hidden
51
59
  # QMAKE_CXXFLAGS += -fvisibility=hidden
60
+ #QMAKE_CFLAGS_DEBUG -= -O2
61
+ #QMAKE_CXXFLAGS_DEBUG -= -O2
52
62
  }
53
63
  win32 {
54
64
  QMAKE_CFLAGS_WARN_ON += /wd4996 /wd4100 /wd4005
@@ -57,6 +67,28 @@ win32 {
57
67
  QMAKE_CXXFLAGS_RELEASE += /O2
58
68
  }
59
69
 
70
+ unix:!macx {
71
+ OBJECTS_DIR = $$RHODES_ROOT/platform/linux/bin/extensions/rhoconnect-client
72
+ INCLUDEPATH += $$RHODES_ROOT/platform/shared/ruby/sailfish
73
+
74
+
75
+ contains(DEFINES, OS_LINUX) {
76
+ DESTDIR = $$RHODES_ROOT/platform/linux/bin/extensions
77
+ }
78
+
79
+ contains(DEFINES, OS_SAILFISH) {
80
+ INCLUDEPATH += $$RHODES_ROOT/platform/shared/qt/sailfish/src
81
+ INCLUDEPATH += $$RHODES_ROOT/platform/shared/qt/sailfish
82
+ }
83
+
84
+
85
+ DEFINES += HAVE_CONFIG_H OS_LINUX
86
+ QMAKE_CFLAGS += -fvisibility=hidden
87
+ QMAKE_CXXFLAGS += -fvisibility=hidden
88
+
89
+ }
90
+
91
+
60
92
  HEADERS += \
61
93
  ../../shared/RhoConnectClientImpl.h\
62
94
  ../../shared/RhoConnectClientSingletonImpl.h\
data/ext/rhoconnect-client/ext/platform/qt/rhoconnect-client.pro.erb ADDED
@@ -0,0 +1,79 @@
1
+ QT -= core
2
+ DEFINES += OS_SAILFISH OS_LINUX
3
+ QT += core
4
+
5
+
6
+ TARGET = rhoconnect-client
7
+ TEMPLATE = lib
8
+
9
+ CONFIG += staticlib warn_on
10
+
11
+ INCLUDEPATH += \
12
+ <%= @rhoRoot %>/lib/commonAPI/coreapi/ext/shared\
13
+ <%= @rhoRoot %>/platform/shared/common\
14
+ <%= @rhoRoot %>/platform/shared/rubyext\
15
+ <%= @rhoRoot %>/platform/shared/ruby/include\
16
+ <%= @rhoRoot %>/platform/shared\
17
+ <%= @rhoRoot %>/platform/shared/sync\
18
+ <%= @rhoRoot %>/platform/shared\
19
+ <%= @extRoot %>/ext/shared\
20
+ <%= @extRoot %>/ext/shared/sync
21
+
22
+ DEFINES += RHODES_QT_PLATFORM _XOPEN_SOURCE _DARWIN_C_SOURCE
23
+
24
+ !isEmpty(RHOSIMULATOR_BUILD) {
25
+ DEFINES += RHODES_EMULATOR
26
+ }
27
+
28
+ !win32 {
29
+ QMAKE_CFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
30
+ QMAKE_CXXFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
31
+ # QMAKE_CFLAGS += -fvisibility=hidden
32
+ # QMAKE_CXXFLAGS += -fvisibility=hidden
33
+ }
34
+
35
+ unix:!macx {
36
+ OBJECTS_DIR = $$PWD/bin/tmp
37
+ INCLUDEPATH += <%= @rhoRoot %>/platform/shared/ruby/sailfish
38
+
39
+ DESTDIR = $$PWD/../extensions
40
+ contains(DEFINES, OS_SAILFISH) {
41
+ INCLUDEPATH += <%= @rhoRoot %>/platform/shared/qt/sailfish/src
42
+ INCLUDEPATH += <%= @rhoRoot %>/platform/shared/qt/sailfish
43
+ }
44
+
45
+ DEFINES += HAVE_CONFIG_H OS_LINUX
46
+ QMAKE_CFLAGS += -fvisibility=hidden
47
+ QMAKE_CXXFLAGS += -fvisibility=hidden
48
+ }
49
+
50
+
51
+ HEADERS += \
52
+ <%= @extRoot %>/ext/shared/RhoConnectClientImpl.h\
53
+ <%= @extRoot %>/ext/shared/RhoConnectClientSingletonImpl.h\
54
+ <%= @extRoot %>/ext/shared/generated/cpp/IRhoConnectClient.h\
55
+ <%= @extRoot %>/ext/shared/generated/cpp/RhoConnectClientBase.h\
56
+ <%= @extRoot %>/ext/shared/sync/ClientRegister.h\
57
+ <%= @extRoot %>/ext/shared/sync/ISyncProtocol.h\
58
+ <%= @extRoot %>/ext/shared/sync/SyncEngine.h\
59
+ <%= @extRoot %>/ext/shared/sync/SyncNotify.h\
60
+ <%= @extRoot %>/ext/shared/sync/SyncProtocol_3.h\
61
+ <%= @extRoot %>/ext/shared/sync/SyncProtocol_4.h\
62
+ <%= @extRoot %>/ext/shared/sync/SyncSource.h\
63
+ <%= @extRoot %>/ext/shared/sync/SyncThread.h
64
+
65
+ SOURCES += \
66
+ <%= @extRoot %>/ext/shared/RhoConnectClientImpl.cpp\
67
+ <%= @extRoot %>/ext/shared/initRhoconnectClient.cpp\
68
+ <%= @extRoot %>/ext/shared/rhoconnectclient.c\
69
+ <%= @extRoot %>/ext/shared/generated/rhoconnectclient_api_init.cpp\
70
+ <%= @extRoot %>/ext/shared/generated/rhoconnectclient_js_api.cpp\
71
+ <%= @extRoot %>/ext/shared/generated/rhoconnectclient_ruby_api.c\
72
+ <%= @extRoot %>/ext/shared/generated/cpp/RhoConnectClientBase.cpp\
73
+ <%= @extRoot %>/ext/shared/generated/cpp/RhoConnectClient_js_wrap.cpp\
74
+ <%= @extRoot %>/ext/shared/generated/cpp/RhoConnectClient_ruby_wrap.cpp\
75
+ <%= @extRoot %>/ext/shared/sync/ClientRegister.cpp\
76
+ <%= @extRoot %>/ext/shared/sync/SyncEngine.cpp\
77
+ <%= @extRoot %>/ext/shared/sync/SyncNotify.cpp\
78
+ <%= @extRoot %>/ext/shared/sync/SyncSource.cpp\
79
+ <%= @extRoot %>/ext/shared/sync/SyncThread.cpp
data/ext/rhoconnect-client/ext/shared/sync/ClientRegister.cpp CHANGED
@@ -231,7 +231,11 @@ void CClientRegister::run()
231
231
 
232
232
  String CClientRegister::getRegisterBody(const String& strClientID)
233
233
  {
234
+ #ifndef OS_SAILFISH
234
235
  String strPushType = rho::push::CPushManager::getInstance()->getDefaultID();
236
+ #else
237
+ String strPushType = "";
238
+ #endif
235
239
  if(strPushType == "rhoconnect")
236
240
  {
237
241
  strPushType = "rhoconnect_push";
data/ext/rhoconnect-client/ext/shared/sync/SyncSource.cpp CHANGED
@@ -1685,7 +1685,10 @@ void CSyncSource::processToken(uint64 token)
1685
1685
  }else
1686
1686
  {
1687
1687
  setToken( token );
1688
+
1689
+ getDB().Lock();
1688
1690
  getDB().executeSQL("UPDATE sources SET token=? where source_id=?", token, getID() );
1691
+ getDB().Unlock();
1689
1692
  }
1690
1693
 
1691
1694
  }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rhoconnect-client
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.11
4
+ version: 6.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rhomobile Dev Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-10-28 00:00:00.000000000 Z
11
+ date: 2019-04-09 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: RhoConnect client extension
14
14
  email: rhomobile@googlegroups.com
@@ -33,6 +33,7 @@ files:
33
33
  - "./ext/rhoconnect-client/ext/platform/iphone/impl/readme.txt"
34
34
  - "./ext/rhoconnect-client/ext/platform/qt/Rakefile"
35
35
  - "./ext/rhoconnect-client/ext/platform/qt/rhoconnect-client.pro"
36
+ - "./ext/rhoconnect-client/ext/platform/qt/rhoconnect-client.pro.erb"
36
37
  - "./ext/rhoconnect-client/ext/platform/wm/Rhoconnect-client.sln"
37
38
  - "./ext/rhoconnect-client/ext/platform/wm/Rhoconnect-client.vcproj"
38
39
  - "./ext/rhoconnect-client/ext/platform/wm/Rhoconnect-client.vsprops"