mirror of
https://github.com/status-im/react-native-fs.git
synced 2026-08-27 18:11:06 +00:00
Merge pull request #140 from IjzerenHein/feature-fix-duplicate-symbols
Fixed iOS duplicate symbol errors with other plugins
This commit is contained in:
+3
-3
@@ -5,7 +5,7 @@ typedef void (^ErrorCallback)(NSError*);
|
||||
typedef void (^BeginCallback)(NSNumber*, NSNumber*, NSDictionary*);
|
||||
typedef void (^ProgressCallback)(NSNumber*, NSNumber*);
|
||||
|
||||
@interface DownloadParams : NSObject
|
||||
@interface RNFSDownloadParams : NSObject
|
||||
|
||||
@property (copy) NSString* fromUrl;
|
||||
@property (copy) NSString* toFile;
|
||||
@@ -20,9 +20,9 @@ typedef void (^ProgressCallback)(NSNumber*, NSNumber*);
|
||||
|
||||
@end
|
||||
|
||||
@interface Downloader : NSObject <NSURLSessionDelegate, NSURLSessionDownloadDelegate>
|
||||
@interface RNFSDownloader : NSObject <NSURLSessionDelegate, NSURLSessionDownloadDelegate>
|
||||
|
||||
- (void)downloadFile:(DownloadParams*)params;
|
||||
- (void)downloadFile:(RNFSDownloadParams*)params;
|
||||
- (void)stopDownload;
|
||||
|
||||
@end
|
||||
|
||||
+5
-5
@@ -1,12 +1,12 @@
|
||||
#import "Downloader.h"
|
||||
|
||||
@implementation DownloadParams
|
||||
@implementation RNFSDownloadParams
|
||||
|
||||
@end
|
||||
|
||||
@interface Downloader()
|
||||
@interface RNFSDownloader()
|
||||
|
||||
@property (copy) DownloadParams* params;
|
||||
@property (copy) RNFSDownloadParams* params;
|
||||
|
||||
@property (retain) NSURLSession* session;
|
||||
@property (retain) NSURLSessionTask* task;
|
||||
@@ -19,9 +19,9 @@
|
||||
|
||||
@end
|
||||
|
||||
@implementation Downloader
|
||||
@implementation RNFSDownloader
|
||||
|
||||
- (void)downloadFile:(DownloadParams*)params
|
||||
- (void)downloadFile:(RNFSDownloadParams*)params
|
||||
{
|
||||
_params = params;
|
||||
|
||||
|
||||
+6
-6
@@ -253,7 +253,7 @@ RCT_EXPORT_METHOD(downloadFile:(NSDictionary *)options
|
||||
resolver:(RCTPromiseResolveBlock)resolve
|
||||
rejecter:(RCTPromiseRejectBlock)reject)
|
||||
{
|
||||
DownloadParams* params = [DownloadParams alloc];
|
||||
RNFSDownloadParams* params = [RNFSDownloadParams alloc];
|
||||
|
||||
NSNumber* jobId = options[@"jobId"];
|
||||
params.fromUrl = options[@"fromUrl"];
|
||||
@@ -295,7 +295,7 @@ RCT_EXPORT_METHOD(downloadFile:(NSDictionary *)options
|
||||
|
||||
if (!self.downloaders) self.downloaders = [[NSMutableDictionary alloc] init];
|
||||
|
||||
Downloader* downloader = [Downloader alloc];
|
||||
RNFSDownloader* downloader = [RNFSDownloader alloc];
|
||||
|
||||
[downloader downloadFile:params];
|
||||
|
||||
@@ -304,7 +304,7 @@ RCT_EXPORT_METHOD(downloadFile:(NSDictionary *)options
|
||||
|
||||
RCT_EXPORT_METHOD(stopDownload:(nonnull NSNumber *)jobId)
|
||||
{
|
||||
Downloader* downloader = [self.downloaders objectForKey:[jobId stringValue]];
|
||||
RNFSDownloader* downloader = [self.downloaders objectForKey:[jobId stringValue]];
|
||||
|
||||
if (downloader != nil) {
|
||||
[downloader stopDownload];
|
||||
@@ -315,7 +315,7 @@ RCT_EXPORT_METHOD(uploadFiles:(NSDictionary *)options
|
||||
resolver:(RCTPromiseResolveBlock)resolve
|
||||
rejecter:(RCTPromiseRejectBlock)reject)
|
||||
{
|
||||
UploadParams* params = [UploadParams alloc];
|
||||
RNFSUploadParams* params = [RNFSUploadParams alloc];
|
||||
|
||||
NSNumber* jobId = options[@"jobId"];
|
||||
params.toUrl = options[@"toUrl"];
|
||||
@@ -356,7 +356,7 @@ RCT_EXPORT_METHOD(uploadFiles:(NSDictionary *)options
|
||||
|
||||
if (!self.uploaders) self.uploaders = [[NSMutableDictionary alloc] init];
|
||||
|
||||
Uploader* uploader = [Uploader alloc];
|
||||
RNFSUploader* uploader = [RNFSUploader alloc];
|
||||
|
||||
[uploader uploadFiles:params];
|
||||
|
||||
@@ -365,7 +365,7 @@ RCT_EXPORT_METHOD(uploadFiles:(NSDictionary *)options
|
||||
|
||||
RCT_EXPORT_METHOD(stopUpload:(nonnull NSNumber *)jobId)
|
||||
{
|
||||
Uploader* uploader = [self.uploaders objectForKey:[jobId stringValue]];
|
||||
RNFSUploader* uploader = [self.uploaders objectForKey:[jobId stringValue]];
|
||||
|
||||
if (uploader != nil) {
|
||||
[uploader stopUpload];
|
||||
|
||||
+3
-3
@@ -6,7 +6,7 @@ typedef void (^UploadErrorCallback)(NSError*);
|
||||
typedef void (^UploadBeginCallback)();
|
||||
typedef void (^UploadProgressCallback)(NSNumber*, NSNumber*);
|
||||
|
||||
@interface UploadParams : NSObject
|
||||
@interface RNFSUploadParams : NSObject
|
||||
|
||||
@property (copy) NSString* toUrl;
|
||||
@property (copy) NSArray* files;
|
||||
@@ -20,9 +20,9 @@ typedef void (^UploadProgressCallback)(NSNumber*, NSNumber*);
|
||||
|
||||
@end
|
||||
|
||||
@interface Uploader : NSObject <NSURLConnectionDelegate>
|
||||
@interface RNFSUploader : NSObject <NSURLConnectionDelegate>
|
||||
|
||||
- (void)uploadFiles:(UploadParams*)params;
|
||||
- (void)uploadFiles:(RNFSUploadParams*)params;
|
||||
- (void)stopUpload;
|
||||
|
||||
@end
|
||||
|
||||
+5
-5
@@ -1,20 +1,20 @@
|
||||
#import "Uploader.h"
|
||||
|
||||
@implementation UploadParams
|
||||
@implementation RNFSUploadParams
|
||||
|
||||
@end
|
||||
|
||||
@interface Uploader()
|
||||
@interface RNFSUploader()
|
||||
|
||||
@property (copy) UploadParams* params;
|
||||
@property (copy) RNFSUploadParams* params;
|
||||
|
||||
@property (retain) NSURLSessionDataTask* task;
|
||||
|
||||
@end
|
||||
|
||||
@implementation Uploader
|
||||
@implementation RNFSUploader
|
||||
|
||||
- (void)uploadFiles:(UploadParams*)params
|
||||
- (void)uploadFiles:(RNFSUploadParams*)params
|
||||
{
|
||||
_params = params;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user