pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Codestyle comments fix

Browse source
This commit is contained in:
Aleksey Belousov 2018-05-10 23:05:06 +03:00
parent ae64426bc0
commit fa01571941
2 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
platform/http_uploader_apple.mm
View file

@ -9,14 +9,12 @@
@interface MultipartUploadTask : NSObject
@property (nonatomic, copy) NSString *method;
@property (nonatomic, copy) NSString *urlString;
@property (nonatomic, copy) NSString *fileKey;
@property (nonatomic, copy) NSString *filePath;
@property (nonatomic, copy) NSDictionary<NSString*, NSString*> *params;
@property (nonatomic, copy) NSDictionary<NSString*, NSString*> *headers;
- (void)uploadWithCompletion:(void(^)(NSInteger httpCode, NSString * _Nonnull description))completion;
@property (copy, nonatomic) NSString *method;
@property (copy, nonatomic) NSString *urlString;
@property (copy, nonatomic) NSString *fileKey;
@property (copy, nonatomic) NSString *filePath;
@property (strong, nonatomic) NSDictionary<NSString*, NSString*> *params;
@property (strong, nonatomic) NSDictionary<NSString*, NSString*> *headers;
@end
@ -26,14 +24,11 @@
NSMutableData *data = [NSMutableData data];
[self.params enumerateKeysAndObjectsUsingBlock:^(NSString * key, NSString * value, BOOL * stop) {
[data appendData:
(NSData * _Nonnull)[[NSString stringWithFormat:@"--%@\r\n", boundary]
[data appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary]
dataUsingEncoding:NSUTF8StringEncoding]];
[data appendData:
(NSData * _Nonnull)[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"\r\n\r\n",
[data appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"\r\n\r\n",
key] dataUsingEncoding:NSUTF8StringEncoding]];
[data appendData:
(NSData * _Nonnull)[[NSString stringWithFormat:@"%@\r\n", value]
[data appendData:[[NSString stringWithFormat:@"%@\r\n", value]
dataUsingEncoding:NSUTF8StringEncoding]];
}];
@ -41,19 +36,17 @@
NSData *fileData = [NSData dataWithContentsOfFile:self.filePath];
NSString *mimeType = @"application/octet-stream";
[data appendData:(NSData* _Nonnull)[[NSString stringWithFormat:@"--%@\r\n", boundary]
[data appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary]
dataUsingEncoding:NSUTF8StringEncoding]];
[data appendData:
(NSData* _Nonnull)[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n",
[data appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n",
self.fileKey,
fileName]
dataUsingEncoding:NSUTF8StringEncoding]];
[data appendData:
(NSData* _Nonnull)[[NSString stringWithFormat:@"Content-Type: %@\r\n\r\n", mimeType]
[data appendData:[[NSString stringWithFormat:@"Content-Type: %@\r\n\r\n", mimeType]
dataUsingEncoding:NSUTF8StringEncoding]];
[data appendData:fileData];
[data appendData:(NSData* _Nonnull)[@"\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
[data appendData:(NSData* _Nonnull)[[NSString stringWithFormat:@"--%@--", boundary]
[data appendData:[@"\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
[data appendData:[[NSString stringWithFormat:@"--%@--", boundary]
dataUsingEncoding:NSUTF8StringEncoding]];
return data;
@ -100,13 +93,13 @@ HttpUploader::Result HttpUploader::Upload() const
auto mapTransform =
^NSDictionary<NSString *, NSString *> *(std::map<std::string, std::string> keyValues)
{
NSMutableDictionary<NSString *, NSString *> * params = [@{} mutableCopy];
NSMutableDictionary<NSString *, NSString *> * params = [NSMutableDictionary dictionary];
for (auto const & keyValue : keyValues)
params[@(keyValue.first.c_str())] = @(keyValue.second.c_str());
return [params copy];
};
MultipartUploadTask *uploadTask = [[MultipartUploadTask alloc] init];
auto *uploadTask = [[MultipartUploadTask alloc] init];
uploadTask.method = @(m_method.c_str());
uploadTask.urlString = @(m_url.c_str());
uploadTask.fileKey = @(m_fileKey.c_str());

1
xcode/common.xcconfig
View file

@ -32,7 +32,6 @@ CLANG_WARN_ENUM_CONVERSION = YES
CLANG_WARN_INFINITE_RECURSION = YES
CLANG_WARN_INT_CONVERSION = YES
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = YES
CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES
CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES