Merge branch 'release/3.7.1'

Author: jnavarrom

MEGA.xcodeproj/project.pbxproj

@@ -0,0 +1,10 @@
+
+#import "MEGABaseRequestDelegate.h"
+
+@interface MEGACopyRequestDelegate : MEGABaseRequestDelegate
+
+- (id)init NS_UNAVAILABLE;
+
+- (instancetype)initToAttachToChatWithCompletion:(void (^)(void))completion;
+
+@end

iMEGA/API/Requests/MEGACopyRequestDelegate.h

@@ -0,0 +1,44 @@
+
+#import "MEGACopyRequestDelegate.h"
+
+#import "SVProgressHUD.h"
+
+@interface MEGACopyRequestDelegate ()
+
+@property (nonatomic, copy) void (^completion)(void);
+
+@end
+
+@implementation MEGACopyRequestDelegate
+
+#pragma mark - Initialization
+
+- (instancetype)initToAttachToChatWithCompletion:(void (^)(void))completion {
+    self = [super init];
+    if (self) {
+        _completion = completion;
+    }
+    
+    return self;
+}
+
+#pragma mark - MEGARequestDelegate
+
+- (void)onRequestStart:(MEGASdk *)api request:(MEGARequest *)request {
+    [super onRequestStart:api request:request];
+}
+- (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEGAError *)error {
+    [super onRequestFinish:api request:request error:error];
+    
+    if (error.type) {
+        [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
+        [SVProgressHUD showErrorWithStatus:[NSString stringWithFormat:@"%@ %@", request.requestString, error.name]];
+        return;
+    }
+    
+    if (self.completion) {
+        self.completion();
+    }
+}
+
+@end

iMEGA/API/Requests/MEGACopyRequestDelegate.m

@@ -0,0 +1,10 @@
+
+#import "MEGABaseRequestDelegate.h"
+
+@interface MEGACreateFolderRequestDelegate : MEGABaseRequestDelegate
+
+- (id)init NS_UNAVAILABLE;
+
+- (instancetype)initWithCompletion:(void (^)(void))completion;
+
+@end

iMEGA/API/Requests/MEGACreateFolderRequestDelegate.h

@@ -0,0 +1,45 @@
+
+#import "MEGACreateFolderRequestDelegate.h"
+
+#import "SVProgressHUD.h"
+
+@interface MEGACreateFolderRequestDelegate ()
+
+@property (nonatomic, copy) void (^completion)(void);
+
+@end
+
+@implementation MEGACreateFolderRequestDelegate
+
+#pragma mark - Initialization
+
+- (instancetype)initWithCompletion:(void (^)(void))completion {
+    self = [super init];
+    if (self) {
+        _completion = completion;
+    }
+    
+    return self;
+}
+
+#pragma mark - MEGARequestDelegate
+
+- (void)onRequestStart:(MEGASdk *)api request:(MEGARequest *)request {
+    [super onRequestStart:api request:request];
+}
+
+- (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEGAError *)error {
+    [super onRequestFinish:api request:request error:error];
+    
+    if (error.type) {
+        [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
+        [SVProgressHUD showErrorWithStatus:[NSString stringWithFormat:@"%@ %@", request.requestString, error.name]];
+        return;
+    }
+    
+    if (self.completion) {
+        self.completion();
+    }
+}
+
+@end

iMEGA/API/Requests/MEGACreateFolderRequestDelegate.m

@@ -6,6 +6,8 @@
 
 #import "LaunchViewController.h"
 
+#import "MEGAStore.h"
+
 @interface MEGALoginRequestDelegate ()
 
 @property (nonatomic, getter=hasSession) BOOL session;
@@ -99,6 +101,7 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
     if (!self.hasSession) {
         NSString *session = [api dumpSession];
         [SAMKeychain setPassword:session forService:@"MEGA" account:@"sessionV3"];
+        [[MEGAStore shareInstance] configureMEGAStore];
 
         LaunchViewController *launchVC = [[UIStoryboard storyboardWithName:@"Launch" bundle:nil] instantiateViewControllerWithIdentifier:@"LaunchViewControllerID"];
         UIWindow *window = [[[UIApplication sharedApplication] delegate] window];

iMEGA/API/Requests/MEGALoginRequestDelegate.m

@@ -40,7 +40,7 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
         return;
     } else {
         [SAMKeychain setPassword:request.email forService:@"MEGA" account:@"email"];
-        [SVProgressHUD showInfoWithStatus:AMLocalizedString(@"pleaseCheckYourEmail", nil)];
+        [SVProgressHUD showInfoWithStatus:AMLocalizedString(@"awaitingEmailConfirmation", @"Title shown just after doing some action that requires confirming the action by an email")];
     }
 }
 

iMEGA/API/Requests/MEGASendSignupLinkRequestDelegate.m

@@ -0,0 +1,10 @@
+
+#import "MEGAStartUploadTransferDelegate.h"
+
+@interface MEGAStartUploadTransferDelegate : NSObject  <MEGATransferDelegate>
+
+- (id)init NS_UNAVAILABLE;
+
+- (instancetype)initToUploadToChatWithTotalBytes:(void (^)(long long totalBytes))totalBytes progress:(void (^)(float transferredBytes, float totalBytes))progress completion:(void (^)(long long totalBytes))completion;
+
+@end

iMEGA/API/Transfers/MEGAStartUploadTransferDelegate.h

@@ -0,0 +1,53 @@
+
+#import "MEGAStartUploadTransferDelegate.h"
+
+@interface MEGAStartUploadTransferDelegate ()
+
+@property (nonatomic, copy) void (^totalBytes)(long long totalBytes);
+@property (nonatomic, copy) void (^progress)(float transferredBytes, float totalBytes);
+@property (nonatomic, copy) void (^completion)(long long transferTotalBytes);
+
+@end
+
+@implementation MEGAStartUploadTransferDelegate
+
+#pragma mark - Initialization
+
+- (instancetype)initToUploadToChatWithTotalBytes:(void (^)(long long totalBytes))totalBytes progress:(void (^)(float transferredBytes, float totalBytes))progress completion:(void (^)(long long totalBytes))completion {
+    self = [super init];
+    if (self) {
+        _totalBytes = totalBytes;
+        _progress = progress;
+        _completion = completion;
+    }
+    
+    return self;
+}
+
+#pragma mark - MEGATransferDelegate
+
+- (void)onTransferStart:(MEGASdk *)api transfer:(MEGATransfer *)transfer {
+    [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
+    
+    if (self.totalBytes) {
+        self.totalBytes(transfer.totalBytes.longLongValue);
+    }
+}
+
+- (void)onTransferUpdate:(MEGASdk *)api transfer:(MEGATransfer *)transfer {
+    if (self.progress) {
+         self.progress(transfer.transferredBytes.floatValue, transfer.totalBytes.floatValue);
+    }
+}
+
+- (void)onTransferFinish:(MEGASdk *)api transfer:(MEGATransfer *)transfer error:(MEGAError *)error {
+    [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
+    
+    if (self.completion) {
+        self.completion(transfer.totalBytes.longLongValue);
+    }
+    
+    if (error.type) return;
+}
+
+@end