status-im
/
react-native-fs
mirror of https://github.com/status-im/react-native-fs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed symbol collision errors with other plugins by adding RNFS prefix to Download & Upload classes 

The Uploader & Downloader classes cause linker errors with other plugins that also implement classes that are called Uploader or Downloader. E.g. this happens when using react-native-fs in combination with Firebase Crash reporting.
Basically both plugins are at fault for not implementing unique class names. This commit adds the RNFS prefix for these classes.
This commit is contained in:
IjzerenHein 2016-07-21 09:59:37 +02:00
parent b3cef00673
commit b26fb5fd8f
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Downloader.h
View File

@ -5,7 +5,7 @@ typedef void (^ErrorCallback)(NSError*);
typedef void (^BeginCallback)(NSNumber*, NSNumber*, NSDictionary*); typedef void (^BeginCallback)(NSNumber*, NSNumber*, NSDictionary*);
typedef void (^ProgressCallback)(NSNumber*, NSNumber*); typedef void (^ProgressCallback)(NSNumber*, NSNumber*);
@interface DownloadParams : NSObject @interface RNFSDownloadParams : NSObject
@property (copy) NSString* fromUrl; @property (copy) NSString* fromUrl;
@property (copy) NSString* toFile; @property (copy) NSString* toFile;
@ -20,9 +20,9 @@ typedef void (^ProgressCallback)(NSNumber*, NSNumber*);
@end @end
@interface Downloader : NSObject <NSURLSessionDelegate, NSURLSessionDownloadDelegate> @interface RNFSDownloader : NSObject <NSURLSessionDelegate, NSURLSessionDownloadDelegate>
- (void)downloadFile:(DownloadParams*)params; - (void)downloadFile:(RNFSDownloadParams*)params;
- (void)stopDownload; - (void)stopDownload;
@end @end

10
Downloader.m
View File

@ -1,12 +1,12 @@
#import "Downloader.h" #import "Downloader.h"
@implementation DownloadParams @implementation RNFSDownloadParams
@end @end
@interface Downloader() @interface RNFSDownloader()
@property (copy) DownloadParams* params; @property (copy) RNFSDownloadParams* params;
@property (retain) NSURLSession* session; @property (retain) NSURLSession* session;
@property (retain) NSURLSessionTask* task; @property (retain) NSURLSessionTask* task;
@ -19,9 +19,9 @@
@end @end
@implementation Downloader @implementation RNFSDownloader
- (void)downloadFile:(DownloadParams*)params - (void)downloadFile:(RNFSDownloadParams*)params
{ {
_params = params; _params = params;

12
RNFSManager.m
View File

@ -238,7 +238,7 @@ RCT_EXPORT_METHOD(downloadFile:(NSDictionary *)options
resolver:(RCTPromiseResolveBlock)resolve resolver:(RCTPromiseResolveBlock)resolve
rejecter:(RCTPromiseRejectBlock)reject) rejecter:(RCTPromiseRejectBlock)reject)
{ {
DownloadParams* params = [DownloadParams alloc]; RNFSDownloadParams* params = [RNFSDownloadParams alloc];
NSNumber* jobId = options[@"jobId"]; NSNumber* jobId = options[@"jobId"];
params.fromUrl = options[@"fromUrl"]; params.fromUrl = options[@"fromUrl"];
@ -280,7 +280,7 @@ RCT_EXPORT_METHOD(downloadFile:(NSDictionary *)options
if (!self.downloaders) self.downloaders = [[NSMutableDictionary alloc] init]; if (!self.downloaders) self.downloaders = [[NSMutableDictionary alloc] init];
Downloader* downloader = [Downloader alloc]; RNFSDownloader* downloader = [RNFSDownloader alloc];
[downloader downloadFile:params]; [downloader downloadFile:params];
@ -289,7 +289,7 @@ RCT_EXPORT_METHOD(downloadFile:(NSDictionary *)options
RCT_EXPORT_METHOD(stopDownload:(nonnull NSNumber *)jobId) RCT_EXPORT_METHOD(stopDownload:(nonnull NSNumber *)jobId)
{ {
Downloader* downloader = [self.downloaders objectForKey:[jobId stringValue]]; RNFSDownloader* downloader = [self.downloaders objectForKey:[jobId stringValue]];
if (downloader != nil) { if (downloader != nil) {
[downloader stopDownload]; [downloader stopDownload];
@ -300,7 +300,7 @@ RCT_EXPORT_METHOD(uploadFiles:(NSDictionary *)options
resolver:(RCTPromiseResolveBlock)resolve resolver:(RCTPromiseResolveBlock)resolve
rejecter:(RCTPromiseRejectBlock)reject) rejecter:(RCTPromiseRejectBlock)reject)
{ {
UploadParams* params = [UploadParams alloc]; RNFSUploadParams* params = [RNFSUploadParams alloc];
NSNumber* jobId = options[@"jobId"]; NSNumber* jobId = options[@"jobId"];
params.toUrl = options[@"toUrl"]; params.toUrl = options[@"toUrl"];
@ -342,7 +342,7 @@ RCT_EXPORT_METHOD(uploadFiles:(NSDictionary *)options
if (!self.uploaders) self.uploaders = [[NSMutableDictionary alloc] init]; if (!self.uploaders) self.uploaders = [[NSMutableDictionary alloc] init];
Uploader* uploader = [Uploader alloc]; RNFSUploader* uploader = [RNFSUploader alloc];
[uploader uploadFiles:params]; [uploader uploadFiles:params];
@ -351,7 +351,7 @@ RCT_EXPORT_METHOD(uploadFiles:(NSDictionary *)options
RCT_EXPORT_METHOD(stopUpload:(nonnull NSNumber *)jobId) RCT_EXPORT_METHOD(stopUpload:(nonnull NSNumber *)jobId)
{ {
Uploader* uploader = [self.uploaders objectForKey:[jobId stringValue]]; RNFSUploader* uploader = [self.uploaders objectForKey:[jobId stringValue]];
if (uploader != nil) { if (uploader != nil) {
[uploader stopUpload]; [uploader stopUpload];

6
Uploader.h
View File

@ -6,7 +6,7 @@ typedef void (^UploadErrorCallback)(NSError*);
typedef void (^UploadBeginCallback)(); typedef void (^UploadBeginCallback)();
typedef void (^UploadProgressCallback)(NSNumber*, NSNumber*); typedef void (^UploadProgressCallback)(NSNumber*, NSNumber*);
@interface UploadParams : NSObject @interface RNFSUploadParams : NSObject
@property (copy) NSString* toUrl; @property (copy) NSString* toUrl;
@property (copy) NSArray* files; @property (copy) NSArray* files;
@ -20,9 +20,9 @@ typedef void (^UploadProgressCallback)(NSNumber*, NSNumber*);
@end @end
@interface Uploader : NSObject <NSURLConnectionDelegate> @interface RNFSUploader : NSObject <NSURLConnectionDelegate>
- (void)uploadFiles:(UploadParams*)params; - (void)uploadFiles:(RNFSUploadParams*)params;
- (void)stopUpload; - (void)stopUpload;
@end @end

10
Uploader.m
View File

@ -1,20 +1,20 @@
#import "Uploader.h" #import "Uploader.h"
@implementation UploadParams @implementation RNFSUploadParams
@end @end
@interface Uploader() @interface RNFSUploader()
@property (copy) UploadParams* params; @property (copy) RNFSUploadParams* params;
@property (retain) NSURLSessionDataTask* task; @property (retain) NSURLSessionDataTask* task;
@end @end
@implementation Uploader @implementation RNFSUploader
- (void)uploadFiles:(UploadParams*)params - (void)uploadFiles:(RNFSUploadParams*)params
{ {
_params = params; _params = params;