Utilize email body additions when attachments are unavailable

Author: Dan Federman

Bug Reporting/ARKEmailBugReporter.m

@@ -182,6 +182,7 @@ - (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)
         NSString *bugTitle = [alertView textFieldAtIndex:0].text;
         NSArray *logStores = [self.logStores copy];
         NSMapTable *logStoresToLogMessagesMap = [NSMapTable new];
+        NSDictionary *emailBodyAdditions = [self.emailBodyAdditionsDelegate emailBodyAdditionsForEmailBugReporter:self];
 
         if ([MFMailComposeViewController canSendMail]) {
             self.mailComposeViewController = [MFMailComposeViewController new];
@@ -197,7 +198,6 @@ - (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)
                     if (logStoresToLogMessagesMap.count == logStores.count) {
                         NSMutableString *emailBody = [NSMutableString stringWithFormat:@"%@\n", self.prefilledEmailBody];
 
-                        NSDictionary *emailBodyAdditions = [self.emailBodyAdditionsDelegate emailBodyAdditionsForEmailBugReporter:self];
                         if (emailBodyAdditions.count > 0) {
                             for (NSString *emailBodyAdditionKey in emailBodyAdditions.allKeys) {
                                 [emailBody appendFormat:@"%@: %@\n", emailBodyAdditionKey, emailBodyAdditions[emailBodyAdditionKey]];
@@ -256,11 +256,17 @@ - (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)
 
                     // Only append logs once all log messages have been retrieved.
                     if (logStoresToLogMessagesMap.count == logStores.count) {
-                        NSMutableString *emailBody = [NSMutableString new];
+                        NSMutableString *emailBody = [NSMutableString stringWithFormat:@"%@\n", self.prefilledEmailBody];
+                        
+                        if (emailBodyAdditions.count > 0) {
+                            for (NSString *emailBodyAdditionKey in emailBodyAdditions.allKeys) {
+                                [emailBody appendFormat:@"%@: %@\n", emailBodyAdditionKey, emailBodyAdditions[emailBodyAdditionKey]];
+                            }
+                        }
+                        
                         for (ARKLogStore *logStore in logStores) {
                             NSArray *logMessages = [logStoresToLogMessagesMap objectForKey:logStore];
-                            
-                            [emailBody appendFormat:@"%@\n%@\n", self.prefilledEmailBody, [self _recentErrorLogMessagesAsPlainText:logMessages count:self.numberOfRecentErrorLogsToIncludeInEmailBodyWhenAttachmentsAreUnavailable]];
+                            [emailBody appendFormat:@"\n%@\n", [self _recentErrorLogMessagesAsPlainText:logMessages count:self.numberOfRecentErrorLogsToIncludeInEmailBodyWhenAttachmentsAreUnavailable]];
                         }
 
                         NSURL *composeEmailURL = [self _emailURLWithRecipients:@[self.bugReportRecipientEmailAddress] CC:@"" subject:bugTitle body:emailBody];