Merge pull request #460 from bitstadium/fix/some-cleanup

Fix/some cleanup
bitstadium · Sep 15, 2017 · 146146b · 146146b
2 parents a16ddd3 + 3ba7117
commit 146146b
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 100 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,15 +8,10 @@ env:
     - CONFIGURATION="DEBUG"
 
   matrix:
-    - SCHEME="HockeySDK"             DESTINATION="OS=8.1,name=iPad Air"                 RUN_TESTS="YES"
-    - SCHEME="HockeySDK"             DESTINATION="OS=8.2,name=iPhone 6 Plus"            RUN_TESTS="YES"
     - SCHEME="HockeySDK"             DESTINATION="OS=8.3,name=iPad 2"                   RUN_TESTS="YES"
-    - SCHEME="HockeySDK"             DESTINATION="OS=8.4,name=iPhone 4s"                RUN_TESTS="YES"
-    - SCHEME="HockeySDK"             DESTINATION="OS=9.0,name=iPad Air"                 RUN_TESTS="YES"
     - SCHEME="HockeySDK"             DESTINATION="OS=9.1,name=iPhone 6 Plus"            RUN_TESTS="YES"
-    - SCHEME="HockeySDK"             DESTINATION="OS=10.2,name=iPad Pro (9.7-inch)"     RUN_TESTS="YES"
     - SCHEME="HockeySDK"             DESTINATION="OS=10.3.1,name=iPhone 6s"             RUN_TESTS="YES"
-    - SCHEME="HockeySDK Framework"   DESTINATION="platform=iOS Simulator,OS=10.3.1,name=iPhone 6" RUN_TESTS="YES"
+    - SCHEME="HockeySDK Framework"   DESTINATION="platform=iOS Simulator,OS=10.3.3,name=iPhone 6" RUN_TESTS="YES"
     - SCHEME="HockeySDK Distribution"                                                   RUN_TESTS="NO" LINT="YES"
 
 before_install:

diff --git a/Classes/BITAppStoreHeader.h b/Classes/BITAppStoreHeader.h
@@ -31,10 +31,6 @@
 
 #import <UIKit/UIKit.h>
 
-#ifndef __IPHONE_6_1
-#define __IPHONE_6_1     60100
-#endif
-
 @interface BITAppStoreHeader : UIView
 
 @property (nonatomic, copy) NSString *headerText;

diff --git a/Classes/BITFeedbackComposeViewController.m b/Classes/BITFeedbackComposeViewController.m
@@ -151,13 +151,7 @@ - (void)keyboardWasShown:(NSNotification*)aNotification {
   NSDictionary* info = [aNotification userInfo];
   CGSize kbSize = [[info objectForKey:UIKeyboardFrameBeginUserInfoKey] CGRectValue].size;
 
-  BOOL isPortraitOrientation = NO;
-
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_8_0
-  isPortraitOrientation = UIInterfaceOrientationIsPortrait([[UIApplication sharedApplication] statusBarOrientation]);
-#else
-  isPortraitOrientation = UIInterfaceOrientationIsPortrait(self.interfaceOrientation);
-#endif
+  BOOL isPortraitOrientation = isPortraitOrientation = UIInterfaceOrientationIsPortrait([[UIApplication sharedApplication] statusBarOrientation]);
 
   CGRect frame = CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height);
   if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad) {
@@ -238,7 +232,7 @@ - (void)viewDidLoad {
   if([BITHockeyHelper isPhotoAccessPossible]) {
     self.textAccessoryView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.view.frame), 44)];
     self.textAccessoryView.backgroundColor = [UIColor colorWithRed:(CGFloat)0.9 green:(CGFloat)0.9 blue:(CGFloat)0.9 alpha:(CGFloat)1.0];
-
+    
     self.addPhotoButton = [UIButton buttonWithType:UIButtonTypeCustom];
     [self.addPhotoButton setTitle:BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentAddImage") forState:UIControlStateNormal];
     [self.addPhotoButton setTitleColor:[UIColor darkGrayColor] forState:UIControlStateNormal];
@@ -546,64 +540,48 @@ - (void)imageButtonAction:(UIButton *)sender {
   NSInteger index = [self.attachmentScrollViewImageViews indexOfObject:sender];
 
   self.selectedAttachmentIndex = (self.attachmentScrollViewImageViews.count - index - 1);
-  /* We won't use this for now until we have a more robust solution for displaying UIAlertController
-   // requires iOS 8
-   id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
-   if (uialertcontrollerClass) {
-   __weak typeof(self) weakSelf = self;
-   
-   UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil
-   message:nil
-   preferredStyle:UIAlertControllerStyleActionSheet];
-   
-   
-   UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentCancel")
-   style:UIAlertActionStyleCancel
-   handler:^(UIAlertAction * action) {
-   typeof(self) strongSelf = weakSelf;
-   [strongSelf cancelAction];
-   _actionSheetVisible = NO;
-   }];
-   
-   [alertController addAction:cancelAction];
-   
-   UIAlertAction *editAction = [UIAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentEdit")
-   style:UIAlertActionStyleDefault
-   handler:^(UIAlertAction * action) {
-   typeof(self) strongSelf = weakSelf;
-   [strongSelf editAction];
-   _actionSheetVisible = NO;
-   }];
-   
-   [alertController addAction:editAction];
-   
-   UIAlertAction *deleteAction = [UIAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentDelete")
-   style:UIAlertActionStyleDestructive
-   handler:^(UIAlertAction * action) {
-   typeof(self) strongSelf = weakSelf;
-   [strongSelf deleteAction];
-   _actionSheetVisible = NO;
-   }];
-   
-   [alertController addAction:deleteAction];
-   
-   [self presentViewController:alertController animated:YES completion:nil];
-   } else {
-   */
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle: nil
-                                                           delegate: self
-                                                  cancelButtonTitle: BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentCancel")
-                                             destructiveButtonTitle: BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentDelete")
-                                                  otherButtonTitles: BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentEdit"), nil];
 
-  [actionSheet showFromRect: sender.frame inView: self.attachmentScrollView animated: YES];
-#pragma clang diagnostic push
-  /*}*/
+  __weak typeof(self) weakSelf = self;
+
+  UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil
+                                                                           message:nil
+                                                                    preferredStyle:UIAlertControllerStyleActionSheet];
+
+
+  UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentCancel")
+                                                         style:UIAlertActionStyleCancel
+                                                       handler:^(UIAlertAction __unused *action) {
+                                                         typeof(self) strongSelf = weakSelf;
+                                                         [strongSelf cancelAction];
+                                                         strongSelf.actionSheetVisible = NO;
+                                                       }];
+
+  [alertController addAction:cancelAction];
+
+  UIAlertAction *editAction = [UIAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentEdit")
+                                                       style:UIAlertActionStyleDefault
+                                                     handler:^(UIAlertAction __unused *action) {
+                                                       typeof(self) strongSelf = weakSelf;
+                                                       [strongSelf editAction];
+                                                       strongSelf.actionSheetVisible = NO;
+                                                     }];
+
+  [alertController addAction:editAction];
+
+  UIAlertAction *deleteAction = [UIAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentDelete")
+                                                         style:UIAlertActionStyleDestructive
+                                                       handler:^(UIAlertAction __unused *action) {
+                                                         typeof(self) strongSelf = weakSelf;
+                                                         [strongSelf deleteAction];
+                                                         strongSelf.actionSheetVisible = NO;
+                                                       }];
+
+  [alertController addAction:deleteAction];
+
+  [self presentViewController:alertController animated:YES completion:nil];
 
   self.actionSheetVisible = YES;
-  if ((UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) || ([[NSProcessInfo processInfo] respondsToSelector:@selector(isOperatingSystemAtLeastVersion:)] && [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){9,0,0}])) {
+  if ((UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) || ([[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){9,0,0}])) {
     [self.textView resignFirstResponder];
   }
 }

diff --git a/Classes/BITFeedbackListViewCell.m b/Classes/BITFeedbackListViewCell.m
@@ -170,11 +170,7 @@ - (UIColor *)backgroundColor {
 - (BOOL)isSameDayWithDate1:(NSDate*)date1 date2:(NSDate*)date2 {
   NSCalendar* calendar = [NSCalendar currentCalendar];
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_8_0
   unsigned unitFlags = NSCalendarUnitYear | NSCalendarUnitMonth |  NSCalendarUnitDay;
-#else
-  unsigned unitFlags = NSYearCalendarUnit | NSMonthCalendarUnit |  NSDayCalendarUnit;
-#endif
 
   NSDateComponents *dateComponent1 = [calendar components:unitFlags fromDate:date1];
   NSDateComponents *dateComponent2 = [calendar components:unitFlags fromDate:date2];

diff --git a/Classes/BITFeedbackManager.m b/Classes/BITFeedbackManager.m
@@ -1227,7 +1227,7 @@ - (void)requestLatestImageWithCompletionHandler:(BITLatestImageFetchCompletionBl
   [self fetchLatestImageUsingPhotoLibraryWithCompletionHandler:completionHandler];
 }
 
-- (void)fetchLatestImageUsingPhotoLibraryWithCompletionHandler:(BITLatestImageFetchCompletionBlock)completionHandler NS_AVAILABLE_IOS(8_0) {
+- (void)fetchLatestImageUsingPhotoLibraryWithCompletionHandler:(BITLatestImageFetchCompletionBlock)completionHandler {
   // Safeguard in case the dev hasn't set the NSPhotoLibraryUsageDescription in their Info.plist
   if (![self isiOS10PhotoPolicySet]) {return;}
 
@@ -1248,7 +1248,7 @@ - (void)fetchLatestImageUsingPhotoLibraryWithCompletionHandler:(BITLatestImageFe
   }];
 }
 
-- (void)loadLatestImageAssetWithCompletionHandler:(BITLatestImageFetchCompletionBlock)completionHandler NS_AVAILABLE_IOS(8_0) {
+- (void)loadLatestImageAssetWithCompletionHandler:(BITLatestImageFetchCompletionBlock)completionHandler {
 
   // Safeguard in case the dev hasn't set the NSPhotoLibraryUsageDescription in their Info.plist
   if (![self isiOS10PhotoPolicySet]) {return;}

diff --git a/Classes/BITHockeyBaseManager.m b/Classes/BITHockeyBaseManager.m
@@ -43,10 +43,6 @@
 #import <mach-o/dyld.h>
 #import <mach-o/loader.h>
 
-#ifndef __IPHONE_6_1
-#define __IPHONE_6_1     60100
-#endif
-
 // We need BIT_UNUSED macro to make sure there aren't any warnings when building
 // HockeySDK Distribution scheme. Since several configurations are build in this scheme
 // and different features can be turned on and off we can't just use __unused attribute.

diff --git a/Classes/BITStoreButton.h b/Classes/BITStoreButton.h
@@ -47,11 +47,6 @@
 - (void)storeButtonFired:(BITStoreButton *)button;
 @end
 
-
-#ifndef __IPHONE_6_1
-#define __IPHONE_6_1     60100
-#endif
-
 /**
  * Button style depending on the iOS version
  */

diff --git a/Classes/HockeySDKPrivate.h b/Classes/HockeySDKPrivate.h
@@ -74,10 +74,6 @@ NSBundle *BITHockeyBundle(void);
 NSString *BITHockeyLocalizedString(NSString *stringToken);
 NSString *BITHockeyMD5(NSString *str);
 
-#ifndef __IPHONE_8_0
-#define __IPHONE_8_0     80000
-#endif
-
 #ifndef __IPHONE_11_0
 #define __IPHONE_11_0    110000
 #endif
@@ -96,14 +92,6 @@ NSString *BITHockeyMD5(NSString *str);
 
 #endif /* TARGET_OS_SIMULATOR */
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_1
-
 #define kBITButtonTypeSystem                UIButtonTypeSystem
 
-#else
-
-#define kBITButtonTypeSystem                UIButtonTypeRoundedRect
-
-#endif
-
 #endif /* HockeySDK_HockeySDKPrivate_h */