Merge pull request #110 from bitstadium/release/4.1.4

Release/4.1.4

Author: Benjamin Scholtysik (Reimold)

Classes/CrashReporting/BITCrashCXXExceptionHandler.mm

@@ -26,7 +26,7 @@
 
 @implementation BITCrashUncaughtCXXExceptionHandlerManager
 
-extern "C" void LIBCXXABI_NORETURN __cxa_throw(void *exception_object, std::type_info *tinfo, void (*dest)(void *))
+extern "C" void __attribute__((noreturn)) __cxa_throw(void *exception_object, std::type_info *tinfo, void (*dest)(void *))
 {
   // Purposely do not take a lock in this function. The aim is to be as fast as
   // possible. While we could really use some of the info set up by the real
@@ -40,7 +40,7 @@ @implementation BITCrashUncaughtCXXExceptionHandlerManager
   // implementation changing in a future version. (Or not existing in an earlier
   // version).
 
-  typedef void (*cxa_throw_func)(void *, std::type_info *, void (*)(void *)) LIBCXXABI_NORETURN;
+  typedef void (*cxa_throw_func)(void *, std::type_info *, void (*)(void *)) __attribute__((noreturn));
   static dispatch_once_t predicate = 0;
   static cxa_throw_func __original__cxa_throw = nullptr;
   static const void **__real_objc_ehtype_vtable = nullptr;

Classes/Feedback/BITFeedbackMessageCellView.m

@@ -144,7 +144,8 @@ - (void)updateAttachmentViews {
   _attachmentsAdded = 0;
 
   NSArray *previewableAttachments = self.message.previewableAttachments;
-
+  [self clearAllImageViews];
+  
   if (_attachmentsAdded == [previewableAttachments count]) return;
 
   if (previewableAttachments) {
@@ -211,6 +212,15 @@ - (void)drawRect:(NSRect)dirtyRect {
   [super drawRect:dirtyRect];
 }
 
+- (void)clearAllImageViews{
+  
+  // Since we simultaneously loop over and mutate the view's subviews array we need to go backwards
+  for (NSView *subview in [self.subviews reverseObjectEnumerator]) {
+    if ([subview isKindOfClass:[BITActivityIndicatorButton class]]) {
+      [subview removeFromSuperview];
+    }
+  }
+}
 
 + (NSRect)messageUsedRect:(BITFeedbackMessage *)message tableViewWidth:(CGFloat)width {
   CGRect maxMessageHeightFrame = CGRectMake(0, 0, width - FRAME_SIDE_BORDER * 2 - 4, CGFLOAT_MAX);

Classes/Feedback/BITFeedbackWindowController.m

@@ -70,7 +70,7 @@ @interface BITFeedbackWindowController () <NSTableViewDataSource, NSTableViewDel
 @property (nonatomic, strong) BITFeedbackMessageAttachment *previewAttachment;
 @property (nonatomic) NSRect previewThumbnailRect;
 
-@property (unsafe_unretained) IBOutlet NSArrayController *composeAttacchmentsArrayController;
+@property (unsafe_unretained) IBOutlet NSArrayController *composeAttachmentsArrayController;
 
 - (BOOL)canContinueUserDataView;
 - (BOOL)canSendMessage;
@@ -140,7 +140,7 @@ - (void)windowDidLoad {
                                                name:BITHockeyFeedbackMessagesLoadingFinished
                                              object:nil];
 
-  [self.composeAttacchmentsArrayController setContent:self.attachments];
+  [self.composeAttachmentsArrayController setContent:self.attachments];
   [self.feedbackAttachmentsTableView setTarget:self];
   [self.feedbackAttachmentsTableView setDoubleAction:@selector(previewAttachment:)];
   [self.feedbackAttachmentsTableView registerForDraggedTypes:[NSArray arrayWithObject:(NSString*)kUTTypeFileURL]];
@@ -208,7 +208,7 @@ - (void)deleteAttachment:(id)sender {
   NSInteger clickedRow = [self.feedbackAttachmentsTableView clickedRow];
 
   [self.attachments removeObjectAtIndex:clickedRow];
-  [self.composeAttacchmentsArrayController setContent:self.attachments];
+  [self.composeAttachmentsArrayController setContent:self.attachments];
 
   if ([self.attachments count] == 0) {
     [self hideComposeAttachments];
@@ -353,8 +353,10 @@ - (BOOL)canSendMessage {
 }
 
 - (IBAction)sendMessage:(id)sender {
-  [self.manager submitMessageWithText:[self.messageText string] andAttachments:self.attachments];
+  [self.manager submitMessageWithText:[self.messageText string] andAttachments:[NSArray arrayWithArray:self.attachments]];
   self.messageText = nil;
+  [self.attachments removeAllObjects];
+  [self.composeAttachmentsArrayController setContent:self.attachments];
   [self reloadTableAndScrollToBottom];
 }
 
@@ -494,7 +496,7 @@ - (void)addAttachmentWithFilename:(NSString *)filename {
     attachment.originalFilename = filename;
 
     [self.attachments addObject:attachment];
-    [self.composeAttacchmentsArrayController setContent:self.attachments];
+    [self.composeAttachmentsArrayController setContent:self.attachments];
     [self.feedbackAttachmentsTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:[self.attachments count] - 1] byExtendingSelection:NO];
     [self.feedbackAttachmentsTableView scrollRowToVisible:[self.attachments count] - 1];
 

Classes/Feedback/BITFeedbackWindowController.xib

@@ -7,7 +7,7 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="BITFeedbackWindowController">
             <connections>
-                <outlet property="composeAttacchmentsArrayController" destination="qlE-az-7zs" id="eHb-7l-lvM"/>
+                <outlet property="composeAttachmentsArrayController" destination="qlE-az-7zs" id="eHb-7l-lvM"/>
                 <outlet property="contactInfoTextField" destination="77" id="KCn-wy-JQO"/>
                 <outlet property="feedbackAttachmentsScrollView" destination="7No-Zb-2jx" id="J4I-jl-EDL"/>
                 <outlet property="feedbackAttachmentsTableView" destination="vi6-mo-5xv" id="biG-nM-sgF"/>

HockeySDK-Mac.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'HockeySDK-Mac'
-  s.version           = '4.1.3'
+  s.version           = '4.1.4'
 
   s.summary           = 'Collect live crash reports, get feedback from your users, distribute your betas, and get usage data.'
   s.description       = <<-DESC