Merge pull request #459 from bmourat/fix/screenshot-bug-ios-11

Fix screenshot bug in ios 11
bitstadium · Sep 14, 2017 · a16ddd3 · a16ddd3
2 parents d70a42a + 93776a9
commit a16ddd3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/Classes/BITFeedbackComposeViewController.m b/Classes/BITFeedbackComposeViewController.m
@@ -45,7 +45,6 @@
 #import "BITImageAnnotationViewController.h"
 #import "BITHockeyAttachment.h"
 
-
 @interface BITFeedbackComposeViewController () <BITFeedbackUserDataDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate, UIActionSheetDelegate, BITImageAnnotationDelegate> {
 }
 
@@ -217,7 +216,7 @@ - (void)viewDidLoad {
                                                                             style:UIBarButtonItemStyleDone
                                                                            target:self
                                                                            action:@selector(sendAction:)];
-  
+
   // Container that contains both the textfield and eventually the photo scroll view on the right side
   self.contentViewContainer = [[UIView alloc] initWithFrame:self.view.bounds];
   self.contentViewContainer.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
@@ -262,7 +261,11 @@ - (void)viewDidLoad {
   self.attachmentScrollView.bounces = YES;
   self.attachmentScrollView.autoresizesSubviews = NO;
   self.attachmentScrollView.autoresizingMask = UIViewAutoresizingFlexibleHeight|UIViewAutoresizingFlexibleRightMargin;
-
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_11_0
+  if (@available(iOS 11.0, *)) {
+    self.attachmentScrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentAlways;
+  }
+#endif
   [self.contentViewContainer addSubview:self.attachmentScrollView];
 }
 

diff --git a/Classes/BITHockeyManager.m b/Classes/BITHockeyManager.m
@@ -599,7 +599,7 @@ - (void)pingServerForIntegrationStartWorkflowWithTimeString:(NSString *)timeStri
   NSDictionary *params = @{@"timestamp": timeString,
                            @"sdk": BITHOCKEY_NAME,
                            @"sdk_version": BITHOCKEY_VERSION,
-                           @"bundle_version": [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]
+                           @"bundle_version": (id)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]
                            };
 
   NSURLSessionConfiguration *sessionConfiguration = [NSURLSessionConfiguration defaultSessionConfiguration];

diff --git a/Classes/BITStoreButton.m b/Classes/BITStoreButton.m
@@ -211,7 +211,7 @@ - (CGSize)sizeThatFits:(CGSize) __unused size {
   if ([self.buttonData.label respondsToSelector:@selector(boundingRectWithSize:options:attributes:context:)]) {
     CGRect calculatedRect = [self.buttonData.label boundingRectWithSize:constr
                                                                 options:NSStringDrawingUsesFontLeading
-                                                             attributes:@{NSFontAttributeName:self.titleLabel.font}
+                                                             attributes:@{NSFontAttributeName:(id)self.titleLabel.font}
                                                                 context:nil];
     newSize = calculatedRect.size;
   } else {

diff --git a/Classes/HockeySDKPrivate.h b/Classes/HockeySDKPrivate.h
@@ -78,6 +78,10 @@ NSString *BITHockeyMD5(NSString *str);
 #define __IPHONE_8_0     80000
 #endif
 
+#ifndef __IPHONE_11_0
+#define __IPHONE_11_0    110000
+#endif
+
 #ifndef TARGET_OS_SIMULATOR
 
   #ifdef TARGET_IPHONE_SIMULATOR