Merge branch 'release/3.2.3-34'

jnavarrom · jnavarrom · commit d8d14ae66516 · 2016-08-03T19:03:28.000+02:00
diff --git a/iMEGA/AppDelegate.m b/iMEGA/AppDelegate.m
@@ -1172,10 +1172,30 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
                 break;
             }
                 
+                
+            case MEGAErrorTypeApiEBlocked: {
+                if ([request type] == MEGARequestTypeLogin || [request type] == MEGARequestTypeFetchNodes) {
+                    UIAlertView *alert = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"error", nil)
+                                                                    message:AMLocalizedString(@"accountBlocked", @"Error message when trying to login and the account is blocked")
+                                                                   delegate:self
+                                                          cancelButtonTitle:AMLocalizedString(@"ok", nil)
+                                                          otherButtonTitles:nil];
+                    [alert show];
+                    [api logout];
+                }
+                
+                break;
+            }
+                
             default:
                 break;
         }
         
+        if ([request type] == MEGARequestTypeExport) {
+            [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
+            [SVProgressHUD showErrorWithStatus:error.name];
+        }
+        
         if ([request type] == MEGARequestTypeSubmitPurchaseReceipt) {
             [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
             [SVProgressHUD showErrorWithStatus:[NSString stringWithFormat:AMLocalizedString(@"wrongPurchase", nil), [error name], (long)[error type]]];
@@ -1254,6 +1274,7 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
             }
             isFetchNodesDone = YES;
             
+            [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
             [SVProgressHUD dismiss];
             
             [self setBadgeValueForIncomingContactRequests];
diff --git a/iMEGA/Cloud drive/BrowserViewController.m b/iMEGA/Cloud drive/BrowserViewController.m
@@ -528,6 +528,10 @@ - (void)onRequestStart:(MEGASdk *)api request:(MEGARequest *)request {
 
 - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEGAError *)error {
     if ([error type]) {
+        if ([request type] == MEGARequestTypeMove || [request type] == MEGARequestTypeCopy) {
+            [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
+            [SVProgressHUD showErrorWithStatus:error.name];
+        }
         return;
     }
     
diff --git a/iMEGA/Cloud drive/CloudDriveTableViewController.m b/iMEGA/Cloud drive/CloudDriveTableViewController.m
@@ -1265,6 +1265,12 @@ - (void)reloadRowsAtIndexPaths:(NSArray *)indexPathsArray {
     }
 }
 
+- (void)endEditingAndReloadSearch { 
+    [self.searchDisplayController.searchResultsTableView setEditing:NO animated:YES];
+    [self filterContentForSearchText:self.searchDisplayController.searchBar.text];
+    [self.searchDisplayController.searchResultsTableView reloadData];
+}
+
 #pragma mark - IBActions
 
 - (IBAction)selectAllAction:(UIBarButtonItem *)sender {
@@ -1620,6 +1626,11 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
                 UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"permissionTitle", nil) message:AMLocalizedString(@"permissionMessage", nil) delegate:self cancelButtonTitle:AMLocalizedString(@"ok", nil) otherButtonTitles:nil, nil];
                 [alertView show];
             }
+        } else {
+            if ([request type] == MEGARequestTypeMove || [request type] == MEGARequestTypeRemove) {
+                [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
+                [SVProgressHUD showErrorWithStatus:error.name];
+            }
         }
         return;
     }
@@ -1672,7 +1683,8 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
                 
                 [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
                 [SVProgressHUD showImage:[UIImage imageNamed:@"hudRubbishBin"] status:message];
-                [self setEditing:NO animated:YES];
+                
+                [self.searchDisplayController isActive] ? [self endEditingAndReloadSearch] : [self setEditing:NO animated:YES];
             }
             break;
         }
@@ -1713,7 +1725,8 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
                     message = AMLocalizedString(@"shareFolderLeaved", @"Folder leave");
                 }
                 [SVProgressHUD showImage:[UIImage imageNamed:@"hudMinus"] status:message];
-                [self setEditing:NO animated:YES];
+                
+                [self.searchDisplayController isActive] ? [self endEditingAndReloadSearch] : [self setEditing:NO animated:YES];
             }
             break;
         }
diff --git a/iMEGA/Contacts/ContactRequestsViewController.m b/iMEGA/Contacts/ContactRequestsViewController.m
@@ -448,7 +448,7 @@ - (void)emptyDataSet:(UIScrollView *)scrollView didTapButton:(UIButton *)button
 - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEGAError *)error {
     if ([error type]) {
         if ([request type] == MEGARequestTypeInviteContact) {
-            [SVProgressHUD showErrorWithStatus:AMLocalizedString(error.name, nil)];
+            [SVProgressHUD showErrorWithStatus:error.name];
         }
         return;
     }
diff --git a/iMEGA/Contacts/ContactsViewController.m b/iMEGA/Contacts/ContactsViewController.m
@@ -1054,8 +1054,9 @@ - (void)emptyDataSet:(UIScrollView *)scrollView didTapButton:(UIButton *)button
 
 - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEGAError *)error {
     if ([error type]) {
-        if ([request type] == MEGARequestTypeInviteContact) {
-            [SVProgressHUD showErrorWithStatus:AMLocalizedString(error.name, nil)];
+        [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
+        if ([request type] == MEGARequestTypeInviteContact || [request type] == MEGARequestTypeShare) {
+            [SVProgressHUD showErrorWithStatus:error.name];
         }
         return;
     }
diff --git a/iMEGA/Info.plist b/iMEGA/Info.plist
@@ -36,7 +36,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.2.2</string>
+	<string>3.2.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -51,7 +51,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>33</string>
+	<string>34</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
diff --git a/iMEGA/Languages/Base.lproj/Localizable.strings b/iMEGA/Languages/Base.lproj/Localizable.strings
@@ -70,6 +70,12 @@
 "createAccount"="Create Account";
 /* Message shown when the user writes a wrong email or password on login */
 "invalidMailOrPassword"="Invalid e-mail and/or password. Please try again";
+/* Error message when to many attempts to login */
+"tooManyAttemptsLogin"="You have attempted to log in too many times. Please wait until %@ and try again.";
+/* Error message when trying to login to an account not validated */
+"accountNotValidated"="Please check your e-mail and click the link to confirm your account";
+/* Error message when trying to login and the account is blocked */
+"accountBlocked"="Your account has been blocked. Please contact support@mega.nz";
 /* Message shown when the user writes an invalid format in the email field  */
 "emailInvalidFormat"="Enter a valid email";
 /* Message shown when the user enters a wrong password  */
diff --git a/iMEGA/Login/ConfirmAccountViewController.m b/iMEGA/Login/ConfirmAccountViewController.m
@@ -155,6 +155,7 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
             }
                 
             case MEGAErrorTypeApiEAccess: {
+                [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
                 [SVProgressHUD dismiss];
                 UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"alreadyLoggedInAlertTitle", @"You are logged with another account")
                                                                     message:AMLocalizedString(@"alreadyLoggedInAlertMessage", @"If you agree, the current account will be logged out and all Offline data will be erased. Do you want to continue?")
diff --git a/iMEGA/Login/LoginViewController.m b/iMEGA/Login/LoginViewController.m
@@ -151,6 +151,16 @@ - (BOOL)validateEmail:(NSString *)email {
     
 }
 
+- (NSString *)timeFormatted:(NSUInteger)totalSeconds {
+    NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+    [formatter setDateStyle:NSDateFormatterNoStyle];
+    [formatter setTimeStyle:NSDateFormatterMediumStyle];
+    
+    NSDate *date = [NSDate dateWithTimeIntervalSinceNow:totalSeconds];
+    
+    return [formatter stringFromDate:date];
+}
+
 #pragma mark - UIResponder
 
 - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
@@ -198,11 +208,15 @@ -(BOOL)textFieldShouldReturn:(UITextField *)textField {
 #pragma mark - MEGARequestDelegate
 
 - (void)onRequestStart:(MEGASdk *)api request:(MEGARequest *)request {
-    [SVProgressHUD showWithMaskType:SVProgressHUDMaskTypeClear];
+    if ([request type] == MEGARequestTypeLogin) {
+        [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeClear];
+        [SVProgressHUD show];
+    }
 }
 
 - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEGAError *)error {
     if ([error type]) {
+        [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];
         [SVProgressHUD dismiss];
         switch ([error type]) {
             case MEGAErrorTypeApiEArgs:
@@ -218,6 +232,39 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
                 break;
             }
                 
+            case MEGAErrorTypeApiETooMany: {
+                NSString *message = [NSString stringWithFormat:AMLocalizedString(@"tooManyAttemptsLogin", @"Error message when to many attempts to login"), [self timeFormatted:3600]];
+                UIAlertView *alert = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"error", nil)
+                                                                message:message
+                                                               delegate:self
+                                                      cancelButtonTitle:AMLocalizedString(@"ok", nil)
+                                                      otherButtonTitles:nil];
+                [alert show];
+            
+                break;
+            }
+                
+            case MEGAErrorTypeApiEIncomplete: {
+                UIAlertView *alert = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"error", nil)
+                                                                message:AMLocalizedString(@"accountNotValidated", @"Error message when trying to login to an account not validated")
+                                                               delegate:self
+                                                      cancelButtonTitle:AMLocalizedString(@"ok", nil)
+                                                      otherButtonTitles:nil];
+                [alert show];
+            
+                break;
+            }
+                
+            case MEGAErrorTypeApiEBlocked: {
+                UIAlertView *alert = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"error", nil)
+                                                                message:AMLocalizedString(@"accountBlocked", @"Error message when trying to login and the account is suspended")
+                                                               delegate:self
+                                                      cancelButtonTitle:AMLocalizedString(@"ok", nil)
+                                                      otherButtonTitles:nil];
+                [alert show];
+                break;
+            }
+                
             default:
                 break;
         }
@@ -244,10 +291,4 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
     }
 }
 
-- (void)onRequestUpdate:(MEGASdk *)api request:(MEGARequest *)request {
-}
-
-- (void)onRequestTemporaryError:(MEGASdk *)api request:(MEGARequest *)request error:(MEGAError *)error {
-}
-
 @end

Original file line number	Diff line number	Diff line change
`@@ -528,6 +528,10 @@ - (void)onRequestStart:(MEGASdk )api request:(MEGARequest )request {`
`528`	`528`
`529`	`529`	`- (void)onRequestFinish:(MEGASdk )api request:(MEGARequest )request error:(MEGAError *)error {`
`530`	`530`	`if ([error type]) {`
	`531`	`+ if ([request type] == MEGARequestTypeMove \|\| [request type] == MEGARequestTypeCopy) {`
	`532`	`+ [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];`
	`533`	`+ [SVProgressHUD showErrorWithStatus:error.name];`
	`534`	`+ }`
`531`	`535`	`return;`
`532`	`536`	`}`
`533`	`537`
Original file line number	Diff line number	Diff line change
`@@ -1265,6 +1265,12 @@ - (void)reloadRowsAtIndexPaths:(NSArray *)indexPathsArray {`
`1265`	`1265`	`}`
`1266`	`1266`	`}`
`1267`	`1267`
	`1268`	`+- (void)endEditingAndReloadSearch {`
	`1269`	`+ [self.searchDisplayController.searchResultsTableView setEditing:NO animated:YES];`
	`1270`	`+ [self filterContentForSearchText:self.searchDisplayController.searchBar.text];`
	`1271`	`+ [self.searchDisplayController.searchResultsTableView reloadData];`
	`1272`	`+}`
	`1273`	`+`
`1268`	`1274`	`#pragma mark - IBActions`
`1269`	`1275`
`1270`	`1276`	`- (IBAction)selectAllAction:(UIBarButtonItem *)sender {`
`@@ -1620,6 +1626,11 @@ - (void)onRequestFinish:(MEGASdk )api request:(MEGARequest )request error:(MEG`
`1620`	`1626`	`UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"permissionTitle", nil) message:AMLocalizedString(@"permissionMessage", nil) delegate:self cancelButtonTitle:AMLocalizedString(@"ok", nil) otherButtonTitles:nil, nil];`
`1621`	`1627`	`[alertView show];`
`1622`	`1628`	`}`
	`1629`	`+ } else {`
	`1630`	`+ if ([request type] == MEGARequestTypeMove \|\| [request type] == MEGARequestTypeRemove) {`
	`1631`	`+ [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];`
	`1632`	`+ [SVProgressHUD showErrorWithStatus:error.name];`
	`1633`	`+ }`
`1623`	`1634`	`}`
`1624`	`1635`	`return;`
`1625`	`1636`	`}`
`@@ -1672,7 +1683,8 @@ - (void)onRequestFinish:(MEGASdk )api request:(MEGARequest )request error:(MEG`
`1672`	`1683`
`1673`	`1684`	`[SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];`
`1674`	`1685`	`[SVProgressHUD showImage:[UIImage imageNamed:@"hudRubbishBin"] status:message];`
`1675`		`- [self setEditing:NO animated:YES];`
	`1686`	`+`
	`1687`	`+ [self.searchDisplayController isActive] ? [self endEditingAndReloadSearch] : [self setEditing:NO animated:YES];`
`1676`	`1688`	`}`
`1677`	`1689`	`break;`
`1678`	`1690`	`}`
`@@ -1713,7 +1725,8 @@ - (void)onRequestFinish:(MEGASdk )api request:(MEGARequest )request error:(MEG`
`1713`	`1725`	`message = AMLocalizedString(@"shareFolderLeaved", @"Folder leave");`
`1714`	`1726`	`}`
`1715`	`1727`	`[SVProgressHUD showImage:[UIImage imageNamed:@"hudMinus"] status:message];`
`1716`		`- [self setEditing:NO animated:YES];`
	`1728`	`+`
	`1729`	`+ [self.searchDisplayController isActive] ? [self endEditingAndReloadSearch] : [self setEditing:NO animated:YES];`
`1717`	`1730`	`}`
`1718`	`1731`	`break;`
`1719`	`1732`	`}`
Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ - (void)emptyDataSet:(UIScrollView )scrollView didTapButton:(UIButton )button`
`448`	`448`	`- (void)onRequestFinish:(MEGASdk )api request:(MEGARequest )request error:(MEGAError *)error {`
`449`	`449`	`if ([error type]) {`
`450`	`450`	`if ([request type] == MEGARequestTypeInviteContact) {`
`451`		`- [SVProgressHUD showErrorWithStatus:AMLocalizedString(error.name, nil)];`
	`451`	`+ [SVProgressHUD showErrorWithStatus:error.name];`
`452`	`452`	`}`
`453`	`453`	`return;`
`454`	`454`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1054,8 +1054,9 @@ - (void)emptyDataSet:(UIScrollView )scrollView didTapButton:(UIButton )button`
`1054`	`1054`
`1055`	`1055`	`- (void)onRequestFinish:(MEGASdk )api request:(MEGARequest )request error:(MEGAError *)error {`
`1056`	`1056`	`if ([error type]) {`
`1057`		`- if ([request type] == MEGARequestTypeInviteContact) {`
`1058`		`- [SVProgressHUD showErrorWithStatus:AMLocalizedString(error.name, nil)];`
	`1057`	`+ [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];`
	`1058`	`+ if ([request type] == MEGARequestTypeInviteContact \|\| [request type] == MEGARequestTypeShare) {`
	`1059`	`+ [SVProgressHUD showErrorWithStatus:error.name];`
`1059`	`1060`	`}`
`1060`	`1061`	`return;`
`1061`	`1062`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,7 @@ - (void)onRequestFinish:(MEGASdk )api request:(MEGARequest )request error:(MEG`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`case MEGAErrorTypeApiEAccess: {`
	`158`	`+ [SVProgressHUD setDefaultMaskType:SVProgressHUDMaskTypeNone];`
`158`	`159`	`[SVProgressHUD dismiss];`
`159`	`160`	`UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"alreadyLoggedInAlertTitle", @"You are logged with another account")`
`160`	`161`	`message:AMLocalizedString(@"alreadyLoggedInAlertMessage", @"If you agree, the current account will be logged out and all Offline data will be erased. Do you want to continue?")`