Preparing release 3.3.0

queueit · Jul 12, 2022 · 3d2de3c · 3d2de3c
1 parent c658e1d
commit 3d2de3c
Show file tree

Hide file tree

Showing 32 changed files with 175 additions and 651 deletions.
diff --git a/QueueITLib.xcodeproj/project.pbxproj b/QueueITLib.xcodeproj/project.pbxproj
@@ -13,8 +13,8 @@
 		1DDF312E1C931DC00036E5EB /* QueueCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DDF312D1C931DC00036E5EB /* QueueCache.m */; };
 		1DE12F901B57E2ED00DD3BBE /* libQueueITLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DE12F841B57E2ED00DD3BBE /* libQueueITLib.a */; };
 		1DE12FA71B57F0C000DD3BBE /* QueueITApiClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE12FA61B57F0C000DD3BBE /* QueueITApiClient.m */; };
-		1DE12FAA1B57F14D00DD3BBE /* QueueService_NSURLConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE12FA91B57F14D00DD3BBE /* QueueService_NSURLConnection.m */; };
-		1DE12FB01B57F24000DD3BBE /* QueueService_NSURLConnectionRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE12FAF1B57F24000DD3BBE /* QueueService_NSURLConnectionRequest.m */; };
+		1DE12FAA1B57F14D00DD3BBE /* QueueITApiClient_NSURLConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE12FA91B57F14D00DD3BBE /* QueueITApiClient_NSURLConnection.m */; };
+		1DE12FB01B57F24000DD3BBE /* QueueITApiClient_NSURLConnectionRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE12FAF1B57F24000DD3BBE /* QueueITApiClient_NSURLConnectionRequest.m */; };
 		1DE12FBC1B57F3A300DD3BBE /* QueueStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE12FBB1B57F3A300DD3BBE /* QueueStatus.m */; };
 		1DE12FBF1B57F3DD00DD3BBE /* IOSUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE12FBE1B57F3DD00DD3BBE /* IOSUtils.m */; };
 		1DE12FC21B57F42500DD3BBE /* QueueITEngine.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE12FC11B57F42500DD3BBE /* QueueITEngine.m */; };
@@ -66,10 +66,10 @@
 		1DE12F951B57E2EE00DD3BBE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		1DE12FA51B57F0C000DD3BBE /* QueueITApiClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueueITApiClient.h; sourceTree = "<group>"; };
 		1DE12FA61B57F0C000DD3BBE /* QueueITApiClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueueITApiClient.m; sourceTree = "<group>"; };
-		1DE12FA81B57F14D00DD3BBE /* QueueService_NSURLConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueueService_NSURLConnection.h; sourceTree = "<group>"; };
-		1DE12FA91B57F14D00DD3BBE /* QueueService_NSURLConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueueService_NSURLConnection.m; sourceTree = "<group>"; };
-		1DE12FAE1B57F23F00DD3BBE /* QueueService_NSURLConnectionRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueueService_NSURLConnectionRequest.h; sourceTree = "<group>"; };
-		1DE12FAF1B57F24000DD3BBE /* QueueService_NSURLConnectionRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueueService_NSURLConnectionRequest.m; sourceTree = "<group>"; };
+		1DE12FA81B57F14D00DD3BBE /* QueueITApiClient_NSURLConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueueITApiClient_NSURLConnection.h; sourceTree = "<group>"; };
+		1DE12FA91B57F14D00DD3BBE /* QueueITApiClient_NSURLConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueueITApiClient_NSURLConnection.m; sourceTree = "<group>"; };
+		1DE12FAE1B57F23F00DD3BBE /* QueueITApiClient_NSURLConnectionRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueueITApiClient_NSURLConnectionRequest.h; sourceTree = "<group>"; };
+		1DE12FAF1B57F24000DD3BBE /* QueueITApiClient_NSURLConnectionRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueueITApiClient_NSURLConnectionRequest.m; sourceTree = "<group>"; };
 		1DE12FBA1B57F3A300DD3BBE /* QueueStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueueStatus.h; sourceTree = "<group>"; };
 		1DE12FBB1B57F3A300DD3BBE /* QueueStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueueStatus.m; sourceTree = "<group>"; };
 		1DE12FBD1B57F3DD00DD3BBE /* IOSUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOSUtils.h; sourceTree = "<group>"; };
@@ -172,10 +172,10 @@
 			children = (
 				1DE12FA51B57F0C000DD3BBE /* QueueITApiClient.h */,
 				1DE12FA61B57F0C000DD3BBE /* QueueITApiClient.m */,
-				1DE12FA81B57F14D00DD3BBE /* QueueService_NSURLConnection.h */,
-				1DE12FA91B57F14D00DD3BBE /* QueueService_NSURLConnection.m */,
-				1DE12FAE1B57F23F00DD3BBE /* QueueService_NSURLConnectionRequest.h */,
-				1DE12FAF1B57F24000DD3BBE /* QueueService_NSURLConnectionRequest.m */,
+				1DE12FA81B57F14D00DD3BBE /* QueueITApiClient_NSURLConnection.h */,
+				1DE12FA91B57F14D00DD3BBE /* QueueITApiClient_NSURLConnection.m */,
+				1DE12FAE1B57F23F00DD3BBE /* QueueITApiClient_NSURLConnectionRequest.h */,
+				1DE12FAF1B57F24000DD3BBE /* QueueITApiClient_NSURLConnectionRequest.m */,
 				1DDF312C1C931DC00036E5EB /* QueueCache.h */,
 				1DDF312D1C931DC00036E5EB /* QueueCache.m */,
 			);
@@ -307,10 +307,10 @@
 			files = (
 				AD68D81928363A6C00200800 /* QueueITWaitingRoomView.m in Sources */,
 				AD5278A8284A44E500F70BF9 /* QueueTryPassResult.m in Sources */,
-				1DE12FB01B57F24000DD3BBE /* QueueService_NSURLConnectionRequest.m in Sources */,
+				1DE12FB01B57F24000DD3BBE /* QueueITApiClient_NSURLConnectionRequest.m in Sources */,
 				1DE12FC21B57F42500DD3BBE /* QueueITEngine.m in Sources */,
 				1DCB83FD1BCE5375009B489A /* Reachability.m in Sources */,
-				1DE12FAA1B57F14D00DD3BBE /* QueueService_NSURLConnection.m in Sources */,
+				1DE12FAA1B57F14D00DD3BBE /* QueueITApiClient_NSURLConnection.m in Sources */,
 				1DDF312E1C931DC00036E5EB /* QueueCache.m in Sources */,
 				1D0970CD1F5EA46E00495466 /* QueuePassedInfo.m in Sources */,
 				AD742D2C2837CA60001234CE /* QueueITWaitingRoomProvider.m in Sources */,

diff --git a/QueueITLib/QueueConsts.h b/QueueITLib/QueueConsts.h
@@ -3,6 +3,6 @@
 
 #define QueueCloseUrl @"queueit://close"
 #define QueueRestartSessionUrl @"queueit://restartSession"
-#define SDKVersion @"iOS-3.1.14";
+#define SDKVersion @"iOS-3.3.0";
 
 #endif
diff --git a/QueueITLib/QueueITApiClient.m b/QueueITLib/QueueITApiClient.m
@@ -1,5 +1,5 @@
 #import "QueueITApiClient.h"
-#import "QueueService_NSURLConnection.h"
+#import "QueueITApiClient_NSURLConnection.h"
 
 static QueueITApiClient *SharedInstance;
 
@@ -13,7 +13,7 @@ + (QueueITApiClient *)getInstance
 {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        SharedInstance = [[QueueService_NSURLConnection alloc] init];
+        SharedInstance = [[QueueITApiClient_NSURLConnection alloc] init];
     });
 
     return SharedInstance;

diff --git a/QueueITLib/QueueService_NSURLConnection.h → ...eITLib/QueueITApiClient_NSURLConnection.h b/QueueITLib/QueueService_NSURLConnection.h → ...eITLib/QueueITApiClient_NSURLConnection.h
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 #import "QueueITApiClient.h"
 
-@interface QueueService_NSURLConnection : QueueITApiClient
+@interface QueueITApiClient_NSURLConnection : QueueITApiClient
 
 @end
diff --git a/QueueITLib/QueueService_NSURLConnection.m → ...eITLib/QueueITApiClient_NSURLConnection.m b/QueueITLib/QueueService_NSURLConnection.m → ...eITLib/QueueITApiClient_NSURLConnection.m
@@ -1,11 +1,11 @@
-#import "QueueService_NSURLConnection.h"
-#import "QueueService_NSURLConnectionRequest.h"
+#import "QueueITApiClient_NSURLConnection.h"
+#import "QueueITApiClient_NSURLConnectionRequest.h"
 
-@interface QueueService_NSURLConnection()<QueueService_NSURLConnectionRequestDelegate>
+@interface QueueITApiClient_NSURLConnection()<QueueService_NSURLConnectionRequestDelegate>
 @end
 
 
-@implementation QueueService_NSURLConnection
+@implementation QueueITApiClient_NSURLConnection
 
 - (NSString *)submitRequestWithURL:(NSURL *)URL
                             method:(NSString *)httpMethod
@@ -25,8 +25,8 @@ - (NSString *)submitRequestWithURL:(NSURL *)URL
     [request addValue:@"application/json" forHTTPHeaderField:@"Accept"];
     [request addValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
 
-    QueueService_NSURLConnectionRequest *connectionRequest;
-    connectionRequest = [[QueueService_NSURLConnectionRequest alloc] initWithRequest:request
+    QueueITApiClient_NSURLConnectionRequest *connectionRequest;
+    connectionRequest = [[QueueITApiClient_NSURLConnectionRequest alloc] initWithRequest:request
                                                                   expectedStatusCode:expectedStatus
                                                                              success:success
                                                                              failure:failure
@@ -39,7 +39,7 @@ - (NSString *)submitRequestWithURL:(NSURL *)URL
 
 #pragma mark - NSURLConnectionRequestDelegate
 
-- (void)requestDidComplete:(QueueService_NSURLConnectionRequest *)request
+- (void)requestDidComplete:(QueueITApiClient_NSURLConnectionRequest *)request
 {
 }
 

diff --git a/...Lib/QueueService_NSURLConnectionRequest.h → ...QueueITApiClient_NSURLConnectionRequest.h b/...Lib/QueueService_NSURLConnectionRequest.h → ...QueueITApiClient_NSURLConnectionRequest.h
@@ -3,7 +3,7 @@
 
 @protocol QueueService_NSURLConnectionRequestDelegate;
 
-@interface QueueService_NSURLConnectionRequest : NSObject<NSURLConnectionDelegate, NSURLConnectionDataDelegate>
+@interface QueueITApiClient_NSURLConnectionRequest : NSObject<NSURLConnectionDelegate, NSURLConnectionDataDelegate>
 
 - (NSString *)uniqueIdentifier;
 
@@ -16,5 +16,5 @@
 @end
 
 @protocol QueueService_NSURLConnectionRequestDelegate <NSObject>
-- (void)requestDidComplete:(QueueService_NSURLConnectionRequest *)request;
+- (void)requestDidComplete:(QueueITApiClient_NSURLConnectionRequest *)request;
 @end
diff --git a/...Lib/QueueService_NSURLConnectionRequest.m → ...QueueITApiClient_NSURLConnectionRequest.m b/...Lib/QueueService_NSURLConnectionRequest.m → ...QueueITApiClient_NSURLConnectionRequest.m
@@ -1,7 +1,7 @@
-#import "QueueService_NSURLConnectionRequest.h"
+#import "QueueITApiClient_NSURLConnectionRequest.h"
 
 
-@interface QueueService_NSURLConnectionRequest()
+@interface QueueITApiClient_NSURLConnectionRequest()
 
 @property (nonatomic, strong) NSURLConnection *connection;
 @property (nonatomic, strong) NSURLRequest *request;
@@ -16,7 +16,7 @@ @interface QueueService_NSURLConnectionRequest()
 
 @end
 
-@implementation QueueService_NSURLConnectionRequest
+@implementation QueueITApiClient_NSURLConnectionRequest
 
 - (instancetype)initWithRequest:(NSURLRequest *)request
              expectedStatusCode:(NSInteger)statusCode

diff --git a/QueueITLib/QueueITEngine.h b/QueueITLib/QueueITEngine.h
@@ -8,25 +8,29 @@
 
 @protocol QueuePassedDelegate;
 @protocol QueueViewWillOpenDelegate;
-@protocol QueueViewDidAppearDelegate;
 @protocol QueueDisabledDelegate;
 @protocol QueueITUnavailableDelegate;
 @protocol QueueUserExitedDelegate;
+@protocol QueueITErrorDelegate;
 @protocol QueueViewClosedDelegate;
 @protocol QueueSessionRestartDelegate;
-@protocol QueueSuccessDelegate;
+@protocol QueueUrlChangedDelegate;
+
+@protocol QueueViewDidAppearDelegate;
 
-@interface QueueITEngine : NSObject<ViewUserExitedDelegate, ViewUserClosedDelegate, ViewSessionRestartDelegate, ViewQueuePassedDelegate, ViewQueueDidAppearDelegate, ViewQueueWillOpenDelegate, ViewQueueUpdatePageUrlDelegate, ProviderQueueDisabledDelegate, ProviderQueueITUnavailableDelegate, ProviderSuccessDelegate>
+@interface QueueITEngine : NSObject<QueueITWaitingRoomViewDelegate, QueueITWaitingRoomProviderDelegate>
 
 @property (nonatomic, weak)id<QueuePassedDelegate> _Nullable queuePassedDelegate;
 @property (nonatomic, weak)id<QueueViewWillOpenDelegate> _Nullable queueViewWillOpenDelegate;
-@property (nonatomic, weak)id<QueueViewDidAppearDelegate> _Nullable queueViewDidAppearDelegate;
 @property (nonatomic, weak)id<QueueDisabledDelegate> _Nullable queueDisabledDelegate;
 @property (nonatomic, weak)id<QueueITUnavailableDelegate> _Nullable queueITUnavailableDelegate;
-@property (nonatomic, weak)id<QueueUserExitedDelegate> _Nullable queueUserExitedDelegate;
+@property (nonatomic, weak)id<QueueITErrorDelegate> _Nullable queueErrorDelegate;
 @property (nonatomic, weak)id<QueueViewClosedDelegate> _Nullable queueViewClosedDelegate;
+@property (nonatomic, weak)id<QueueUserExitedDelegate> _Nullable queueUserExitedDelegate;
 @property (nonatomic, weak)id<QueueSessionRestartDelegate> _Nullable queueSessionRestartDelegate;
-@property (nonatomic, weak)id<QueueSuccessDelegate> _Nullable queueSuccessDelegate;
+@property (nonatomic, weak)id<QueueUrlChangedDelegate> _Nullable queueUrlChangedDelegate;
+
+@property (nonatomic, weak)id<QueueViewDidAppearDelegate> _Nullable queueViewDidAppearDelegate;
 
 @property (nonatomic, strong)NSString* _Nullable errorMessage;
 @property (nonatomic, copy)NSString*  _Nonnull customerId;
@@ -47,7 +51,6 @@
                      error:(NSError* _Nullable*_Nullable) error;
 -(BOOL)runWithEnqueueKey:(NSString* _Nonnull) enqueueKey
                    error:(NSError* _Nullable*_Nullable) error;
--(BOOL)isUserInQueue;
 -(BOOL)isRequestInProgress;
 
 @end
@@ -56,35 +59,40 @@
 -(void)notifyYourTurn:(QueuePassedInfo* _Nullable) queuePassedInfo;
 @end
 
-@protocol QueueSessionRestartDelegate <NSObject>
--(void)notifySessionRestart;
-@end
-
 
 @protocol QueueViewWillOpenDelegate <NSObject>
 -(void)notifyQueueViewWillOpen;
 @end
 
-@protocol QueueViewDidAppearDelegate <NSObject>
--(void)notifyQueueViewDidAppear;
+@protocol QueueDisabledDelegate <NSObject>
+-(void)notifyQueueDisabled:(QueueDisabledInfo* _Nullable) queueDisabledInfo;
 @end
 
-@protocol QueueUserExitedDelegate <NSObject>
--(void)notifyUserExited;
+@protocol QueueITUnavailableDelegate <NSObject>
+-(void)notifyQueueITUnavailable:(NSString* _Nonnull) errorMessage;
+@end
+
+@protocol QueueITErrorDelegate <NSObject>
+-(void)notifyQueueError:(NSString* _Nonnull) errorMessage errorCode:(long)errorCode;
 @end
 
 @protocol QueueViewClosedDelegate <NSObject>
 -(void)notifyViewClosed;
 @end
 
-@protocol QueueDisabledDelegate <NSObject>
--(void)notifyQueueDisabled:(QueueDisabledInfo* _Nullable) queueDisabledInfo;
+@protocol QueueUserExitedDelegate <NSObject>
+-(void)notifyUserExited;
 @end
 
-@protocol QueueITUnavailableDelegate <NSObject>
--(void)notifyQueueITUnavailable:(NSString* _Nonnull) errorMessage;
+@protocol QueueSessionRestartDelegate <NSObject>
+-(void)notifySessionRestart;
+@end
+
+@protocol QueueUrlChangedDelegate<NSObject>
+-(void)notifyQueueUrlChanged:(NSString* _Nonnull) url;
 @end
 
-@protocol QueueSuccessDelegate <NSObject>
--(void)notifyQueueSuccess:(QueueTryPassResult* _Nullable) queuePassResult;
+
+@protocol QueueViewDidAppearDelegate <NSObject>
+-(void)notifyQueueViewDidAppear;
 @end