Use HelperTools' getNSErrorFrom: instead of homegrowing NSError

Author: tmolitor-stud-tu

Monal/Classes/MLIQProcessor.m

@@ -250,8 +250,7 @@ +(void) processErrorIq:(XMPPIQ*) iqNode forAccount:(xmpp*) account
 $$class_handler(handleMAMBackscrollingResultInvalidation, $$ID(xmpp*, account), $$ID(MLContact*, contact), $$PROMISE(promise))
     DDLogError(@"Got backscrolling mam error for %@", contact.contactJid);
     NSString* errorMessage = [NSString stringWithFormat:NSLocalizedString(@"Could not fetch more old chat history for '%@' from the server archive. Please try again.", @""), contact.contactJid];
-    NSError* error = [NSError errorWithDomain:@"Monal" code:0 userInfo:@{NSLocalizedDescriptionKey: errorMessage}];
-    [promise reject:error];
+    [promise reject:[HelperTools getNSErrorFrom:nil withDescription:errorMessage]];
 $$
 
 $$class_handler(handleMAMBackscrollingResult, $$ID(xmpp*, account), $$ID(XMPPIQ*, iqNode), $$ID(MLContact*, contact), $_ID(NSMutableOrderedSet*, historyIdsOfAlreadyRetreivedMessages), $$PROMISE(promise))
@@ -281,15 +280,15 @@ +(void) processErrorIq:(XMPPIQ*) iqNode forAccount:(xmpp*) account
     if([iqNode check:@"/<type=error>"] && retrievedBodiesOverall == 0
         && ![iqNode check:@"error/{urn:ietf:params:xml:ns:xmpp-stanzas}item-not-found"])
     {
-        NSString* errorMessage = [HelperTools extractXMPPError:iqNode withDescription:NSLocalizedString(@"Could not fetch more old history for this chat from the server archive. Please try again later.", @"")];
-        NSError* error = [NSError errorWithDomain:@"Monal" code:0 userInfo:@{NSLocalizedDescriptionKey: errorMessage}];
-        [promise reject:error];
+        NSString* errorMessage = [NSString stringWithFormat:NSLocalizedString(@"Could not fetch more old chat history for '%@' from the server archive", @""), contact.contactJid];
+        [promise reject:[HelperTools getNSErrorFrom:iqNode withDescription:errorMessage]];
     }
     else
     {
         if(retrievedBodiesOverall == 0)
         {
-            //if we did not retrieve any body messages we don't need to process metadata sanzas (if any), but signal we reached the end of our archive
+            //if we did not retrieve any body messages we don't need to process metadata stanzas (if any),
+            //but signal we reached the end of our archive
             DDLogDebug(@"Reached upper end of mam:2 archive");
             [promise fulfill:@[]];
             return;
@@ -881,8 +880,7 @@ +(BOOL) processRosterWithAccount:(xmpp*) account andIqNode:(XMPPIQ*) iqNode
     DDLogError(@"Could not change the password of '%@'", jid);
     [SAMKeychain deletePasswordForService:kMonalTmpKeychainName account:uuid];
     NSString* errorMessage = [NSString stringWithFormat:NSLocalizedString(@"Could not change the password of '%@'. Please try again.", @""), jid];
-    NSError* error = [NSError errorWithDomain:@"Monal" code:0 userInfo:@{NSLocalizedDescriptionKey: errorMessage}];
-    [promise reject:error];
+    [promise reject:[HelperTools getNSErrorFrom:nil withDescription:errorMessage]];
 $$
 
 $$class_handler(handlePasswordChange, $$ID(xmpp*, account), $$ID(XMPPIQ*, iqNode), $$ID(NSString*, uuid), $$PROMISE(promise))
@@ -891,9 +889,8 @@ +(BOOL) processRosterWithAccount:(xmpp*) account andIqNode:(XMPPIQ*) iqNode
     {
         DDLogError(@"Changing the password of '%@' returned error: %@", jid, [iqNode findFirst:@"error"]);
         [SAMKeychain deletePasswordForService:kMonalTmpKeychainName account:uuid];
-        NSString* errorMessage = [HelperTools extractXMPPError:iqNode withDescription:[NSString stringWithFormat:NSLocalizedString(@"Could not change the password of '%@'", @""), jid]];
-        NSError* error = [NSError errorWithDomain:@"Monal" code:0 userInfo:@{NSLocalizedDescriptionKey: errorMessage}];
-        [promise reject:error];
+        NSString* errorMessage = [NSString stringWithFormat:NSLocalizedString(@"Could not change the password of '%@'", @""), jid];
+        [promise reject:[HelperTools getNSErrorFrom:iqNode withDescription:errorMessage]];
     }
     else
     {

Monal/Classes/MLMucProcessor.m

@@ -1344,15 +1344,15 @@ -(AnyPromise*) setAffiliation:(NSString*) affiliation ofUser:(NSString*) jid inM
 $$instance_handler(handleAffiliationUpdateResultInvalidation, account.mucProcessor, $$ID(xmpp*, account), $$ID(NSString*, affiliation), $$ID(NSString*, jid), $$ID(NSString*, roomJid), $$PROMISE(promise))
     DDLogError(@"Failed to change affiliation of '%@' in '%@' to '%@'", jid, roomJid, affiliation);
     NSString* errorString = [NSString stringWithFormat:NSLocalizedString(@"Failed to change affiliation of '%@' in '%@' to '%@': please try again", @""), jid, roomJid, affiliation];
-    [promise reject:[NSError errorWithDomain:@"Monal" code:0 userInfo:@{NSLocalizedDescriptionKey: errorString}]];
+    [promise reject:[HelperTools getNSErrorFrom:nil withDescription:errorString]];
 $$
 
 $$instance_handler(handleAffiliationUpdateResult, account.mucProcessor, $$ID(xmpp*, account), $$ID(XMPPIQ*, iqNode), $$ID(NSString*, affiliation), $$ID(NSString*, jid), $$ID(NSString*, roomJid), $$PROMISE(promise))
     if([iqNode check:@"/<type=error>"])
     {
         DDLogError(@"Failed to change affiliation of '%@' in '%@' to '%@': %@", jid, roomJid, affiliation, [iqNode findFirst:@"error"]);
         NSString* errorString = [HelperTools extractXMPPError:iqNode withDescription:[NSString stringWithFormat:NSLocalizedString(@"Failed to change affiliation of '%@' in '%@' to '%@'", @""), jid, roomJid, affiliation]];
-        [promise reject:[NSError errorWithDomain:@"Monal" code:0 userInfo:@{NSLocalizedDescriptionKey: errorString}]];
+        [promise reject:[HelperTools getNSErrorFrom:iqNode withDescription:errorString]];
         return;
     }
     DDLogInfo(@"Successfully changed affiliation of '%@' in '%@' to '%@'", jid, roomJid, affiliation);
@@ -1410,17 +1410,15 @@ -(AnyPromise*) publishAvatar:(UIImage* _Nullable) image forMuc:(NSString*) room
 
 $$instance_handler(handleAvatarPublishResultInvalidation, account.mucProcessor, $$ID(xmpp*, account), $$ID(NSString*, room), $$PROMISE(promise))
     NSString* errorString = [NSString stringWithFormat:NSLocalizedString(@"Failed to publish avatar image for group/channel %@: please try again", @""), room];
-    NSError* error = [NSError errorWithDomain:@"Monal" code:0 userInfo:@{NSLocalizedDescriptionKey: errorString}];
-    [promise reject:error];
+    [promise reject:[HelperTools getNSErrorFrom:nil withDescription:errorString]];
 $$
 
 $$instance_handler(handleAvatarPublishResult, account.mucProcessor, $$ID(xmpp*, account), $$ID(XMPPIQ*, iqNode), $$PROMISE(promise))
     if([iqNode check:@"/<type=error>"])
     {
         DDLogError(@"Publishing avatar for muc '%@' returned error: %@", iqNode.fromUser, [iqNode findFirst:@"error"]);
         NSString* errorString = [NSString stringWithFormat:NSLocalizedString(@"Failed to publish avatar image for group/channel %@", @""), iqNode.fromUser];
-        NSError* error = [NSError errorWithDomain:@"Monal" code:0 userInfo:@{NSLocalizedDescriptionKey: errorString}];
-        [promise reject:error];
+        [promise reject:[HelperTools getNSErrorFrom:iqNode withDescription:errorString]];
         return;
     }
     DDLogInfo(@"Successfully published avatar for muc: %@", iqNode.fromUser);