Skip to content

Commit f17008a

Browse files
author
Olga Danylova
authored
Merge pull request #87 from olgadanylova/4.0
4.0
2 parents 39f79b6 + c3fb108 commit f17008a

File tree

12 files changed

+12
-39
lines changed

12 files changed

+12
-39
lines changed

‎Pods/Backendless.podspec‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SDK/backendlessAPI/Classes/Files/FileService.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#import "FilePermission.h"
2424

2525
@class BackendlessFile, Fault, NSArray, BEFileInfo;
26-
@protocol IResponder;
2726

2827
@interface FileService : NSObject
2928

@@ -48,9 +47,6 @@
4847
-(NSNumber *)getFileCount:(NSString *)path pattern:(NSString *)pattern;
4948
-(NSNumber *)getFileCount:(NSString *)path;
5049

51-
// async methods with responder
52-
-(void)exists:(NSString *)path responder:(id <IResponder>)responder;
53-
5450
// async methods with block-based callbacks
5551
-(void)remove:(NSString *)fileURL response:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock;
5652
-(void)removeDirectory:(NSString *)path response:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock;
@@ -61,7 +57,7 @@
6157
-(void)renameFile:(NSString *)oldPathName newName:(NSString *)newName response:(void(^)(NSString *))responseBlock error:(void(^)(Fault *))errorBlock;
6258
-(void)copyFile:(NSString *)sourcePathName target:(NSString *)targetPathName response:(void(^)(NSString *))responseBlock error:(void(^)(Fault *))errorBlock;
6359
-(void)moveFile:(NSString *)sourcePathName target:(NSString *)targetPathName response:(void(^)(NSString *))responseBlock error:(void(^)(Fault *))errorBlock;
64-
// NSArray <BEFileInfo *>
60+
// NSArray <BEFileInfo *>
6561
-(void)listing:(NSString *)path pattern:(NSString *)pattern recursive:(BOOL)recursive response:(void(^)(NSArray *))responseBlock error:(void(^)(Fault *))errorBlock;
6662
-(void)listing:(NSString *)path pattern:(NSString *)pattern recursive:(BOOL)recursive pagesize:(int)pagesize offset:(int)offset response:(void(^)(NSArray *))responseBlock error:(void(^)(Fault *))errorBlock;
6763
-(void)exists:(NSString *)path response:(void(^)(NSNumber *))responseBlock error:(void(^)(Fault *))errorBlock;

‎SDK/backendlessAPI/Classes/Files/FileService.m‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,8 @@ -(NSArray *)listing:(NSString *)path pattern:(NSString *)pattern recursive:(BOOL
218218
}
219219

220220
-(NSNumber *)exists:(NSString *)path {
221-
222221
if (!path || !path.length)
223-
return [backendless throwFault:FAULT_NO_DIRECTORY_PATH];
224-
222+
return [backendless throwFault:FAULT_NO_DIRECTORY_PATH];
225223
NSArray *args = @[path];
226224
return [invoker invokeSync:SERVER_FILE_SERVICE_PATH method:METHOD_EXISTS args:args];
227225
}
@@ -283,15 +281,6 @@ -(void)listing:(NSString *)path pattern:(NSString *)pattern recursive:(BOOL)recu
283281
[invoker invokeAsync:SERVER_FILE_SERVICE_PATH method:METHOD_LISTING args:args responder:_responder];
284282
}
285283

286-
-(void)exists:(NSString *)path responder:(id <IResponder>)responder {
287-
288-
if (!path || !path.length)
289-
return [responder errorHandler:FAULT_NO_DIRECTORY_PATH];
290-
291-
NSArray *args = @[path];
292-
[invoker invokeAsync:SERVER_FILE_SERVICE_PATH method:METHOD_EXISTS args:args responder:responder];
293-
}
294-
295284
-(void)getFileCount:(NSString *)path pattern:(NSString *)pattern recursive:(BOOL)recursive countDirectories:(BOOL)countDirectories responder:(id <IResponder>)responder {
296285
if (!path || !path.length)
297286
return [responder errorHandler:FAULT_NO_DIRECTORY_PATH];
@@ -370,7 +359,11 @@ -(void)listing:(NSString *)path pattern:(NSString *)pattern recursive:(BOOL)recu
370359
}
371360

372361
-(void)exists:(NSString *)path response:(void(^)(NSNumber *))responseBlock error:(void(^)(Fault *))errorBlock {
373-
[self exists:path responder:[ResponderBlocksContext responderBlocksContext:responseBlock error:errorBlock]];
362+
id<IResponder>responder = [ResponderBlocksContext responderBlocksContext:responseBlock error:errorBlock];
363+
if (!path || !path.length)
364+
return [responder errorHandler:FAULT_NO_DIRECTORY_PATH];
365+
NSArray *args = @[path];
366+
[invoker invokeAsync:SERVER_FILE_SERVICE_PATH method:METHOD_EXISTS args:args responder:responder];
374367
}
375368

376369
-(void)getFileCount:(NSString *)path pattern:(NSString *)pattern recursive:(BOOL)recursive countDirectories:(BOOL)countDirectories response:(void(^)(NSNumber *))responseBlock error:(void(^)(Fault *))errorBlock {

‎SDK/backendlessAPI/backendlessAPI.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2422,7 +2422,6 @@
24222422
D3FB9B7219867F0E00A13FB6 /* AtomicCountersFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomicCountersFactory.h; sourceTree = "<group>"; };
24232423
D3FB9B7319867F0E00A13FB6 /* AtomicCountersFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AtomicCountersFactory.m; sourceTree = "<group>"; };
24242424
D3FB9B7A1986818F00A13FB6 /* IAtomicCounters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IAtomicCounters.h; sourceTree = "<group>"; };
2425-
F90F2B5E1BB2DF9C004F8D33 /* Update Project with Backendless SDK for iOS9.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = "Update Project with Backendless SDK for iOS9.pdf"; path = "../../Update Project with Backendless SDK for iOS9.pdf"; sourceTree = "<group>"; };
24262425
F918412C1638281600D36A61 /* FileService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileService.h; sourceTree = "<group>"; };
24272426
F918412D1638281600D36A61 /* FileService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileService.m; sourceTree = "<group>"; };
24282427
F9184132163AB29600D36A61 /* BackendlessFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackendlessFile.h; sourceTree = "<group>"; };
@@ -2446,7 +2445,6 @@
24462445
F91B48191603340A00012DFC /* BackendlessEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackendlessEntity.h; sourceTree = "<group>"; };
24472446
F91B481A1603340A00012DFC /* BackendlessEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BackendlessEntity.m; sourceTree = "<group>"; };
24482447
F91B48291603649C00012DFC /* IDataStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IDataStore.h; sourceTree = "<group>"; };
2449-
F9356C701B6FA479009A01D9 /* getting-started.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = "getting-started.pdf"; path = "../getting-started.pdf"; sourceTree = "<group>"; };
24502448
F94487611B68EBA400EB12A5 /* Backendless-With-Media-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Backendless-With-Media-Bridging-Header.h"; sourceTree = "<group>"; };
24512449
F96B1C5E1DD3A23C00A4B362 /* PagedQueryBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PagedQueryBuilder.h; sourceTree = "<group>"; };
24522450
F96B1C5F1DD3A23C00A4B362 /* PagedQueryBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PagedQueryBuilder.m; sourceTree = "<group>"; };
@@ -3153,8 +3151,6 @@
31533151
isa = PBXGroup;
31543152
children = (
31553153
D30A5D7819B9D03100C0BA44 /* README.md */,
3156-
F9356C701B6FA479009A01D9 /* getting-started.pdf */,
3157-
F90F2B5E1BB2DF9C004F8D33 /* Update Project with Backendless SDK for iOS9.pdf */,
31583154
F9F26B551D8C3A1E00B9EA82 /* ios */,
31593155
F91B47C415FE380C00012DFC /* lib */,
31603156
F98A7EBE1B307017007635B6 /* osx */,

‎SDK/getting-started.pdf‎

-1.29 MB
Binary file not shown.

‎SDK/ios/backendless/backendless.a‎

-4.45 KB
Binary file not shown.

‎SDK/ios/backendless/include/FileService.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#import "FilePermission.h"
2424

2525
@class BackendlessFile, Fault, NSArray, BEFileInfo;
26-
@protocol IResponder;
2726

2827
@interface FileService : NSObject
2928

@@ -48,9 +47,6 @@
4847
-(NSNumber *)getFileCount:(NSString *)path pattern:(NSString *)pattern;
4948
-(NSNumber *)getFileCount:(NSString *)path;
5049

51-
// async methods with responder
52-
-(void)exists:(NSString *)path responder:(id <IResponder>)responder;
53-
5450
// async methods with block-based callbacks
5551
-(void)remove:(NSString *)fileURL response:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock;
5652
-(void)removeDirectory:(NSString *)path response:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock;
@@ -61,7 +57,7 @@
6157
-(void)renameFile:(NSString *)oldPathName newName:(NSString *)newName response:(void(^)(NSString *))responseBlock error:(void(^)(Fault *))errorBlock;
6258
-(void)copyFile:(NSString *)sourcePathName target:(NSString *)targetPathName response:(void(^)(NSString *))responseBlock error:(void(^)(Fault *))errorBlock;
6359
-(void)moveFile:(NSString *)sourcePathName target:(NSString *)targetPathName response:(void(^)(NSString *))responseBlock error:(void(^)(Fault *))errorBlock;
64-
// NSArray <BEFileInfo *>
60+
// NSArray <BEFileInfo *>
6561
-(void)listing:(NSString *)path pattern:(NSString *)pattern recursive:(BOOL)recursive response:(void(^)(NSArray *))responseBlock error:(void(^)(Fault *))errorBlock;
6662
-(void)listing:(NSString *)path pattern:(NSString *)pattern recursive:(BOOL)recursive pagesize:(int)pagesize offset:(int)offset response:(void(^)(NSArray *))responseBlock error:(void(^)(Fault *))errorBlock;
6763
-(void)exists:(NSString *)path response:(void(^)(NSNumber *))responseBlock error:(void(^)(Fault *))errorBlock;

‎SDK/lib/backendless/backendless.a‎

-4.45 KB
Binary file not shown.

‎SDK/lib/backendless/include/FileService.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#import "FilePermission.h"
2424

2525
@class BackendlessFile, Fault, NSArray, BEFileInfo;
26-
@protocol IResponder;
2726

2827
@interface FileService : NSObject
2928

@@ -48,9 +47,6 @@
4847
-(NSNumber *)getFileCount:(NSString *)path pattern:(NSString *)pattern;
4948
-(NSNumber *)getFileCount:(NSString *)path;
5049

51-
// async methods with responder
52-
-(void)exists:(NSString *)path responder:(id <IResponder>)responder;
53-
5450
// async methods with block-based callbacks
5551
-(void)remove:(NSString *)fileURL response:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock;
5652
-(void)removeDirectory:(NSString *)path response:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock;
@@ -61,7 +57,7 @@
6157
-(void)renameFile:(NSString *)oldPathName newName:(NSString *)newName response:(void(^)(NSString *))responseBlock error:(void(^)(Fault *))errorBlock;
6258
-(void)copyFile:(NSString *)sourcePathName target:(NSString *)targetPathName response:(void(^)(NSString *))responseBlock error:(void(^)(Fault *))errorBlock;
6359
-(void)moveFile:(NSString *)sourcePathName target:(NSString *)targetPathName response:(void(^)(NSString *))responseBlock error:(void(^)(Fault *))errorBlock;
64-
// NSArray <BEFileInfo *>
60+
// NSArray <BEFileInfo *>
6561
-(void)listing:(NSString *)path pattern:(NSString *)pattern recursive:(BOOL)recursive response:(void(^)(NSArray *))responseBlock error:(void(^)(Fault *))errorBlock;
6662
-(void)listing:(NSString *)path pattern:(NSString *)pattern recursive:(BOOL)recursive pagesize:(int)pagesize offset:(int)offset response:(void(^)(NSArray *))responseBlock error:(void(^)(Fault *))errorBlock;
6763
-(void)exists:(NSString *)path response:(void(^)(NSNumber *))responseBlock error:(void(^)(Fault *))errorBlock;

‎SDK/osx/backendless/include/FileService.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#import "FilePermission.h"
2424

2525
@class BackendlessFile, Fault, NSArray, BEFileInfo;
26-
@protocol IResponder;
2726

2827
@interface FileService : NSObject
2928

@@ -48,9 +47,6 @@
4847
-(NSNumber *)getFileCount:(NSString *)path pattern:(NSString *)pattern;
4948
-(NSNumber *)getFileCount:(NSString *)path;
5049

51-
// async methods with responder
52-
-(void)exists:(NSString *)path responder:(id <IResponder>)responder;
53-
5450
// async methods with block-based callbacks
5551
-(void)remove:(NSString *)fileURL response:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock;
5652
-(void)removeDirectory:(NSString *)path response:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock;
@@ -61,7 +57,7 @@
6157
-(void)renameFile:(NSString *)oldPathName newName:(NSString *)newName response:(void(^)(NSString *))responseBlock error:(void(^)(Fault *))errorBlock;
6258
-(void)copyFile:(NSString *)sourcePathName target:(NSString *)targetPathName response:(void(^)(NSString *))responseBlock error:(void(^)(Fault *))errorBlock;
6359
-(void)moveFile:(NSString *)sourcePathName target:(NSString *)targetPathName response:(void(^)(NSString *))responseBlock error:(void(^)(Fault *))errorBlock;
64-
// NSArray <BEFileInfo *>
60+
// NSArray <BEFileInfo *>
6561
-(void)listing:(NSString *)path pattern:(NSString *)pattern recursive:(BOOL)recursive response:(void(^)(NSArray *))responseBlock error:(void(^)(Fault *))errorBlock;
6662
-(void)listing:(NSString *)path pattern:(NSString *)pattern recursive:(BOOL)recursive pagesize:(int)pagesize offset:(int)offset response:(void(^)(NSArray *))responseBlock error:(void(^)(Fault *))errorBlock;
6763
-(void)exists:(NSString *)path response:(void(^)(NSNumber *))responseBlock error:(void(^)(Fault *))errorBlock;

0 commit comments

Comments
 (0)