merging Merge remote-tracking branch 'upstream/master'

Author: Olga Danylova

CHANGELOG.md

@@ -1,5 +1,9 @@
 # RELEASE HISTORY
 
+## 5.0 June 6, 2018
+* RT support added
+* API changes. Please check the documentation.
+
 ## 4.5.0 April 4, 2018
 * Bulk create method now returns array of objectIds
 

Pods/Backendless-osx-SDK.podspec

@@ -0,0 +1,41 @@
+workspace 'backendless'
+ 
+xcodeproj 'backendlessAPI/backendlessAPI.xcodeproj'
+ 
+target 'backendless-mac' do
+    use_frameworks!
+    workspace 'backendless'
+    pod 'Socket.IO-Client-Swift'
+end
+
+
+ 
+target 'backendless-device' do
+    use_frameworks!
+    workspace 'backendless'
+    pod 'Socket.IO-Client-Swift'
+end
+
+
+
+target 'bkndlss-device' do
+    use_frameworks!
+    workspace 'backendless'
+    pod 'Socket.IO-Client-Swift'
+end
+
+
+
+target 'backendless-simulator' do
+    use_frameworks!
+    workspace 'backendless'
+    pod 'Socket.IO-Client-Swift'
+end
+
+
+ 
+target 'bkndlss-simulator' do
+    use_frameworks!
+    workspace 'backendless'
+    pod 'Socket.IO-Client-Swift'
+end

Pods/Backendless.podspec

@@ -51,56 +51,88 @@ -(NSNumber *)get:(NSString *)counterName {
     if (!counterName)
         return [backendless throwFault:FAULT_NO_NAME];
     NSArray *args = @[counterName];
-    return [invoker invokeSync:SERVER_ATOMIC_OPERATION_SERVICE_PATH method:METHOD_GET args:args];
+    id result = [invoker invokeSync:SERVER_ATOMIC_OPERATION_SERVICE_PATH method:METHOD_GET args:args];
+    if ([result isKindOfClass:[Fault class]]) {
+        [backendless throwFault:result];
+    }
+    return result;
 }
 
 -(NSNumber *)getAndIncrement:(NSString *)counterName {
     if (!counterName)
         return [backendless throwFault:FAULT_NO_NAME];
     NSArray *args = @[counterName];
-    return [invoker invokeSync:SERVER_ATOMIC_OPERATION_SERVICE_PATH method:METHOD_GET_AND_INCREMENT args:args];
+    id result = [invoker invokeSync:SERVER_ATOMIC_OPERATION_SERVICE_PATH method:METHOD_GET_AND_INCREMENT args:args];
+    if ([result isKindOfClass:[Fault class]]) {
+        [backendless throwFault:result];
+    }
+    return result;
 }
 
 -(NSNumber *)incrementAndGet:(NSString *)counterName {
     if (!counterName)
         return [backendless throwFault:FAULT_NO_NAME];
     NSArray *args = @[counterName];
-    return [invoker invokeSync:SERVER_ATOMIC_OPERATION_SERVICE_PATH method:METHOD_INCREMENT_AND_GET args:args];
+    id result = [invoker invokeSync:SERVER_ATOMIC_OPERATION_SERVICE_PATH method:METHOD_INCREMENT_AND_GET args:args];
+    if ([result isKindOfClass:[Fault class]]) {
+        [backendless throwFault:result];
+    }
+    return result;
 }
 
 -(NSNumber *)getAndDecrement:(NSString *)counterName {
     if (!counterName)
         return [backendless throwFault:FAULT_NO_NAME];
     NSArray *args = @[counterName];
-    return [invoker invokeSync:SERVER_ATOMIC_OPERATION_SERVICE_PATH method:METHOD_GET_AND_DECREMENT args:args];
+    id result = [invoker invokeSync:SERVER_ATOMIC_OPERATION_SERVICE_PATH method:METHOD_GET_AND_DECREMENT args:args];
+    if ([result isKindOfClass:[Fault class]]) {
+        [backendless throwFault:result];
+    }
+    return result;
 }
 
 -(NSNumber *)decrementAndGet:(NSString *)counterName {
     if (!counterName)
         return [backendless throwFault:FAULT_NO_NAME];
     NSArray *args = @[counterName];
-    return [invoker invokeSync:SERVER_ATOMIC_OPERATION_SERVICE_PATH method:METHOD_DECREMENT_AND_GET args:args];
+    id result = [invoker invokeSync:SERVER_ATOMIC_OPERATION_SERVICE_PATH method:METHOD_DECREMENT_AND_GET args:args];
+    if ([result isKindOfClass:[Fault class]]) {
+        [backendless throwFault:result];
+    }
+    return result;
 }
 
 -(NSNumber *)addAndGet:(NSString *)counterName value:(NSNumber *)value {
     if (!counterName)
         return [backendless throwFault:FAULT_NO_NAME];
     NSArray *args = @[counterName, value];
-    return [invoker invokeSync:SERVER_ATOMIC_OPERATION_SERVICE_PATH method:METHOD_ADD_AND_GET args:args];
+    id result = [invoker invokeSync:SERVER_ATOMIC_OPERATION_SERVICE_PATH method:METHOD_ADD_AND_GET args:args];
+    if ([result isKindOfClass:[Fault class]]) {
+        [backendless throwFault:result];
+    }
+    return result;
 }
 
 -(NSNumber *)getAndAdd:(NSString *)counterName value:(NSNumber *)value {
     if (!counterName)
         return [backendless throwFault:FAULT_NO_NAME];
     NSArray *args = @[counterName, value];
-    return [invoker invokeSync:SERVER_ATOMIC_OPERATION_SERVICE_PATH method:METHOD_GET_AND_ADD args:args];
+    id result = [invoker invokeSync:SERVER_ATOMIC_OPERATION_SERVICE_PATH method:METHOD_GET_AND_ADD args:args];
+    if ([result isKindOfClass:[Fault class]]) {
+        [backendless throwFault:result];
+    }
+    return result;
 }
 
 -(NSNumber *)compareAndSet:(NSString *)counterName expected:(NSNumber *)expected updated:(NSNumber *)updated {
     if (!counterName)
         return [backendless throwFault:FAULT_NO_NAME];
     NSArray *args = @[counterName, expected, updated];
-    return [invoker invokeSync:SERVER_ATOMIC_OPERATION_SERVICE_PATH method:METHOD_COMPARE_AND_SET args:args];
+    id result = [invoker invokeSync:SERVER_ATOMIC_OPERATION_SERVICE_PATH method:METHOD_COMPARE_AND_SET args:args];
+    if ([result isKindOfClass:[Fault class]]) {
+        [backendless throwFault:result];
+    }
+    return result;
 }
 
 -(void)reset:(NSString *)counterName  {

SDK/Podfile

@@ -46,12 +46,11 @@
 #import "ICallback.h"
 #import "GeoFence.h"
 #import "LocationTracker.h"
-#import "Message.h"
+#import "PublishMessageInfo.h"
 #import "MessageStatus.h"
 #import "DeliveryOptions.h"
 #import "PublishOptions.h"
-#import "SubscriptionOptions.h"
-#import "BESubscription.h"
+#import "Channel.h"
 #import "DeviceRegistration.h"
 #import "MessagingService.h"
 #import "BackendlessPushHelper.h"
@@ -71,6 +70,10 @@
 #import "BackendlessBeacon.h"
 #import "Presence.h"
 #import "MapDrivenDataStore.h"
+#import "SharedObject.h"
+#import "RTService.h"
+
+//Cache
 #import "BackendlessCachePolicy.h"
 #import "AbstractQuery.h"
 
@@ -101,6 +104,9 @@
 @property (strong, nonatomic, readonly) CacheService *cache;
 @property (strong, nonatomic, readonly) AtomicCounters *counters;
 @property (strong, nonatomic, readonly) Logging *logging;
+@property (strong, nonatomic, readonly) RTService *rt;
+@property (strong, nonatomic, readonly) SharedObject *sharedObject;
+
 // service shortcuts
 @property (assign, nonatomic, readonly) PersistenceService *data;
 @property (assign, nonatomic, readonly) GeoService *geo;

SDK/backendless.xcworkspace/contents.xcworkspacedata

@@ -37,7 +37,7 @@
 
 @implementation Backendless
 
-@synthesize hostURL = _hostURL, appID = _appID, apiKey = _apiKey, userService = _userService, persistenceService = _persistenceService, messagingService = _messagingService, geoService = _geoService, fileService = _fileService, customService = _customService, events = _events, cache = _cache, counters = _counters, logging = _logging, data = _data, geo = _geo, messaging = _messaging, file = _file;
+@synthesize hostURL = _hostURL, appID = _appID, apiKey = _apiKey, userService = _userService, persistenceService = _persistenceService, messagingService = _messagingService, geoService = _geoService, fileService = _fileService, customService = _customService, events = _events, cache = _cache, counters = _counters, logging = _logging, data = _data, geo = _geo, messaging = _messaging, file = _file, rt = _rt;
 
 +(Backendless *)sharedInstance {
     static Backendless *sharedBackendless;
@@ -74,6 +74,7 @@ -(void)dealloc {
     [_cache release];
     [_counters release];
     [_logging release];
+    [_rt release];
     [super dealloc];
 }
 
@@ -185,6 +186,20 @@ -(Logging *)logging {
     return _logging;
 }
 
+-(RTService *)rt {
+    if (!_rt) {
+        _rt = [RTService new];
+    }
+    return _rt;
+}
+
+-(SharedObject *)sharedObject {
+    return [SharedObject alloc];
+}
+
+#pragma mark -
+#pragma mark getters / setters
+
 -(NSString *)getHostUrl {
     return _hostURL;
 }
@@ -442,7 +457,7 @@ -(BOOL)is64bitHardware {
     static BOOL sHardwareChecked = NO;
     static BOOL sIs64bitHardware = NO;
     if (!sHardwareChecked) {
-        sHardwareChecked = YES;        
+        sHardwareChecked = YES;
 #if TARGET_IPHONE_SIMULATOR
         // The app was compiled as 32-bit for the iOS Simulator.
         // We check if the Simulator is a 32-bit or 64-bit simulator using the function is64bitSimulator()

SDK/backendlessAPI/Classes/Atomic/AtomicCounters.m

@@ -82,7 +82,7 @@ -(id)get {
     return [backendless.cache get:_key];
 }
 
--(NSNumber *)contains {
+-(BOOL)contains {
     return [backendless.cache contains:_key];
 }
 
@@ -114,7 +114,7 @@ -(void)get:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock {
     [backendless.cache get:_key response:responseBlock error:errorBlock];
 }
 
--(void)contains:(void(^)(NSNumber *))responseBlock error:(void(^)(Fault *))errorBlock {
+-(void)contains:(void(^)(BOOL))responseBlock error:(void(^)(Fault *))errorBlock {
     [backendless.cache contains:_key response:responseBlock error:errorBlock];
 }
 

SDK/backendlessAPI/Classes/Backendless.h

@@ -29,7 +29,7 @@
 -(void)put:(NSString *)key object:(id)entity;
 -(void)put:(NSString *)key object:(id)entity timeToLive:(int)seconds;
 -(id)get:(NSString *)key;
--(NSNumber *)contains:(NSString *)key;
+-(BOOL)contains:(NSString *)key;
 -(void)expireIn:(NSString *)key timeToLive:(int)seconds;
 -(void)expireAt:(NSString *)key timestamp:(NSDate *)timestamp;
 -(void)remove:(NSString *)key;
@@ -38,7 +38,7 @@
 -(void)put:(NSString *)key object:(id)entity response:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock;
 -(void)put:(NSString *)key object:(id)entity timeToLive:(int)seconds response:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock;
 -(void)get:(NSString *)key response:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock;
--(void)contains:(NSString *)key response:(void(^)(NSNumber *))responseBlock error:(void(^)(Fault *))errorBlock;
+-(void)contains:(NSString *)key response:(void(^)(BOOL))responseBlock error:(void(^)(Fault *))errorBlock;
 -(void)expireIn:(NSString *)key timeToLive:(int)seconds response:(void(^)(void))responseBlock error:(void(^)(Fault *))errorBlock;
 -(void)expireAt:(NSString *)key timestamp:(NSDate *)timestamp response:(void(^)(void))responseBlock error:(void(^)(Fault *))errorBlock;
 -(void)remove:(NSString *)key response:(void(^)(void))responseBlock error:(void(^)(Fault *))errorBlock;