Merge pull request #45 from tus/develop

Patch for Issue #44
tus · May 10, 2019 · b7517f9 · b7517f9
2 parents 95320a6 + f370058
commit b7517f9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/Example/TUSKit/TKViewController.m b/Example/TUSKit/TKViewController.m
@@ -107,7 +107,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking
         }
 
                 // If a file has not been created yet by your TUS backend
-        TUSResumableUpload *upload = [self.tusSession createUploadFromFile:fileUrl retry:-1 headers:@{} metadata:@{}];
+        TUSResumableUpload *upload = [self.tusSession createUploadFromFile:fileUrl retry:-1 headers:@{} metadata:@{} uploadUrl:[[NSURL alloc] initWithString:@""]];
 
                 upload.progressBlock = progressBlock;
                 upload.resultBlock = resultBlock;

diff --git a/TUSKit.podspec b/TUSKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "TUSKit"
-  s.version          = "1.4.0"
+  s.version          = "1.4.1"
   s.summary          = "The tus client for iOS."
   s.description      = <<-DESC
                        An iOS implementation of the tus resumable video upload protocol.

diff --git a/TUSKit/TUSResumableUpload+Private.h b/TUSKit/TUSResumableUpload+Private.h
@@ -73,6 +73,7 @@
 
 - (instancetype _Nullable)initWithUploadId:(NSString * _Nonnull)uploadId
                                       file:(NSURL * _Nonnull)fileUrl
+                                    retry:(int)retryCount
                                   delegate:(id <TUSResumableUploadDelegate> _Nonnull)delegate
                              uploadHeaders:(NSDictionary <NSString *, NSString *>* _Nonnull)headers
                                   metadata:(NSDictionary <NSString *, NSString *>* _Nullable)metadata

diff --git a/TUSKit/TUSResumableUpload.m b/TUSKit/TUSResumableUpload.m
@@ -111,6 +111,7 @@ @implementation TUSResumableUpload
 
 - (instancetype _Nullable)initWithUploadId:(NSString * _Nonnull)uploadId
                                       file:(NSURL * _Nonnull)fileUrl
+                                    retry:(int)retryCount
                                   delegate:(id <TUSResumableUploadDelegate> _Nonnull)delegate
                              uploadHeaders:(NSDictionary <NSString *, NSString *>* _Nonnull)headers
                                   metadata:(NSDictionary <NSString *, NSString *>* _Nullable)metadata
@@ -131,6 +132,7 @@ - (instancetype _Nullable)initWithUploadId:(NSString * _Nonnull)uploadId
 
     return [self initWithUploadId:uploadId
                              file:fileUrl
+                            retry:retryCount
                          delegate:delegate
                     uploadHeaders:headers
                     finalMetadata:uploadMetadata

diff --git a/TUSKit/TUSSession.h b/TUSKit/TUSSession.h
@@ -15,7 +15,7 @@
  This is NOT yet thread safe.
  */
 @interface TUSSession : NSObject
-@property BOOL allowsCellularAccess;
+@property (nonatomic) BOOL allowsCellularAccess;
 
 /**
  Initialize
@@ -36,6 +36,7 @@
  Create an upload with a uploadUrl
  */
 - (TUSResumableUpload * _Nullable) createUploadFromFile:(NSURL * _Nonnull)fileURL
+                                                  retry:(int)retryCount
                                                 headers:(NSDictionary <NSString *, NSString *> * __nullable)headers
                                                metadata:(NSDictionary <NSString *, NSString *> * __nullable)metadata
                                               uploadUrl:(NSURL * _Nonnull)uploadUrl;

diff --git a/TUSKit/TUSSession.m b/TUSKit/TUSSession.m
@@ -103,12 +103,14 @@ - (TUSResumableUpload *) createUploadFromFile:(NSURL *)fileURL
 }
 
 - (TUSResumableUpload * _Nullable) createUploadFromFile:(NSURL * _Nonnull)fileURL
+                                                  retry:(int)retryCount
                                                 headers:(NSDictionary <NSString *, NSString *> * __nullable)headers
                                                metadata:(NSDictionary <NSString *, NSString *> * __nullable)metadata
                                               uploadUrl:(NSURL * _Nonnull)uploadUrl
 {
     TUSResumableUpload *upload = [[TUSResumableUpload alloc] initWithUploadId:[self.store generateUploadId]
                                                                          file:fileURL
+                                                                        retry:retryCount
                                                                      delegate:self
                                                                 uploadHeaders:headers?:@{}
                                                                      metadata:metadata