Merge branch 'release/3.5.2'

Classes/BITAttributedLabel.m

@@ -33,7 +33,7 @@
 NSString * const kBITBackgroundLineWidthAttributeName = @"BITBackgroundLineWidth";
 NSString * const kBITBackgroundCornerRadiusAttributeName = @"BITBackgroundCornerRadius";
 
-static inline CTTextAlignment CTTextAlignmentFromUITextAlignment(UITextAlignment alignment) {
+static inline __attribute__((unused)) CTTextAlignment CTTextAlignmentFromUITextAlignment(UITextAlignment alignment) {
     switch (alignment) {
         case UITextAlignmentLeft: return kCTLeftTextAlignment;
         case UITextAlignmentCenter: return kCTCenterTextAlignment;
@@ -42,7 +42,7 @@ static inline CTTextAlignment CTTextAlignmentFromUITextAlignment(UITextAlignment
     }
 }
 
-static inline CTTextAlignment CTTextAlignmentFromNSTextAlignment(NSTextAlignment alignment) {
+static __attribute__((unused)) inline CTTextAlignment CTTextAlignmentFromNSTextAlignment(NSTextAlignment alignment) {
     switch (alignment) {
         case NSTextAlignmentLeft: return kCTLeftTextAlignment;
         case NSTextAlignmentCenter: return kCTCenterTextAlignment;
@@ -63,7 +63,7 @@ static inline CTLineBreakMode CTLineBreakModeFromUILineBreakMode(UILineBreakMode
     }
 }
 
-static inline CTLineBreakMode CTLineBreakModeFromNSLineBreakMode(NSLineBreakMode lineBreakMode) {
+static inline __attribute__((unused)) CTLineBreakMode CTLineBreakModeFromNSLineBreakMode(NSLineBreakMode lineBreakMode) {
     switch (lineBreakMode) {
         case NSLineBreakByWordWrapping: return kCTLineBreakByWordWrapping;
         case NSLineBreakByCharWrapping: return kCTLineBreakByCharWrapping;
@@ -75,7 +75,7 @@ static inline CTLineBreakMode CTLineBreakModeFromNSLineBreakMode(NSLineBreakMode
     }
 }
 
-static inline UILineBreakMode UILineBreakModeFromNSLineBreakMode(NSLineBreakMode lineBreakMode) {
+static inline __attribute__((unused)) UILineBreakMode UILineBreakModeFromNSLineBreakMode(NSLineBreakMode lineBreakMode) {
     switch (lineBreakMode) {
         case NSLineBreakByWordWrapping: return UILineBreakModeWordWrap;
         case NSLineBreakByCharWrapping: return UILineBreakModeCharacterWrap;

Classes/BITAuthenticator.m

@@ -694,8 +694,8 @@ - (void)processFullSizeImage {
   }
 
   unsigned char *buffer, *source;
-  source = (unsigned char *)malloc(fs.st_size);
-  if (read(fd, source, fs.st_size) != fs.st_size) {
+  source = (unsigned char *)malloc((unsigned long)fs.st_size);
+  if (read(fd, source, (unsigned long)fs.st_size) != fs.st_size) {
     // Couldn't read file
     free(source);
     return;

Classes/BITHockeyManager.m

@@ -503,12 +503,13 @@ - (void)invokeStartUpdateManager {
 #endif /* HOCKEYSDK_FEATURE_UPDATES */
 
 - (BOOL)isSetUpOnMainThread {
-  NSString *errorString = @"ERROR: This SDK has to be setup on the main thread!";
+  NSString *errorString = @"ERROR: HockeySDK has to be setup on the main thread!";
 
   if (!NSThread.isMainThread) {
     if (self.isAppStoreEnvironment) {
       BITHockeyLog(@"%@", errorString);
     } else {
+      NSLog(@"%@", errorString);
       NSAssert(NSThread.isMainThread, errorString);
     }
 

Classes/BITUpdateManager.m

@@ -280,7 +280,7 @@ - (void) storeUsageTimeForCurrentVersion:(NSNumber *)usageTime {
 }
 
 - (NSString *)currentUsageString {
-  double currentUsageTime = [[NSUserDefaults standardUserDefaults] doubleForKey:kBITUpdateUsageTimeOfCurrentVersion];
+  double currentUsageTime = [self.currentAppVersionUsageTime doubleValue];
 
   if (currentUsageTime > 0) {
     // round (up) to 1 minute
@@ -513,8 +513,8 @@ - (void)showCheckForUpdateAlert {
       UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:BITHockeyLocalizedString(@"UpdateAvailable")
                                                            message:[NSString stringWithFormat:BITHockeyLocalizedString(@"UpdateAlertMandatoryTextWithAppVersion"), [self.newestAppVersion nameAndVersionString]]
                                                           delegate:self
-                                                 cancelButtonTitle:BITHockeyLocalizedString(@"UpdateInstall")
-                                                 otherButtonTitles:BITHockeyLocalizedString(@"UpdateShow"), nil
+                                                 cancelButtonTitle:nil
+                                                 otherButtonTitles:BITHockeyLocalizedString(@"UpdateShow"), BITHockeyLocalizedString(@"UpdateInstall"), nil
                                  ];
       [alertView setTag:BITUpdateAlertViewTagMandatoryUpdate];
       [alertView show];

HockeySDK.podspec

@@ -1,27 +1,31 @@
 Pod::Spec.new do |s|
-  s.name     = 'HockeySDK'
-  s.version  = '3.5.1'
-  s.license  = 'MIT'
-  s.platform = :ios, '5.0'
-  s.summary  = 'Distribute beta apps and collect crash reports with HockeyApp.'
-  s.homepage = 'http://hockeyapp.net/'
-  s.author   = { 'Andreas Linde' => 'mail@andreaslinde.de', 'Thomas Dohmke' => "thomas@dohmke.de" }
-  s.source   = { :git => 'https://github.com/bitstadium/HockeySDK-iOS.git', :tag => s.version.to_s }
+  s.name              = 'HockeySDK'
+  s.version           = '3.5.2'
 
-  s.description = 'HockeyApp is a server to distribute beta apps, collect crash reports and '                   \
-                  'communicate with your app users.'                                                            \
-                  'It improves the testing process dramatically and can be used for both beta '                 \
-                  'and App Store builds. Only beta builds will notify users about a new version. '              \
-                  'NOTE: If you want the framework to try again when a network is available, add a dependency ' \
-                  'on Reachability and send a notification with the name `BITHockeyNetworkDidBecomeReachable` ' \
-                  'yourself when the network becomes reachable.'
+  s.summary           = 'Collect live crash reports, get feedback from your users, distribute your betas, and analyze your test coverage with HockeyApp.'
+  s.description       = <<-DESC
+                        HockeyApp is a service to distribute beta apps, collect crash reports and
+                        communicate with your app's users.
+                        
+                        It improves the testing process dramatically and can be used for both beta
+                        and App Store builds.
+                        DESC
 
-  s.source_files = 'Classes'
-  s.requires_arc = true
-  s.preserve_paths = 'Resources', 'Support'
-  s.frameworks   = 'CoreText', 'QuartzCore', 'SystemConfiguration', 'CoreGraphics', 'UIKit', 'Security'
+  s.homepage          = 'http://hockeyapp.net/'
+  s.documentation_url = 'http://hockeyapp.net/help/sdk/ios/3.5.2/'
+
+  s.license           = 'MIT'
+  s.author            = { 'Andreas Linde' => 'mail@andreaslinde.de', 'Thomas Dohmke' => "thomas@dohmke.de" }
+  s.source            = { :git => 'https://github.com/bitstadium/HockeySDK-iOS.git', :tag => s.version.to_s }
+
+  s.platform          = :ios, '5.0'
+  s.source_files      = 'Classes'
+  s.requires_arc      = true
+
+  s.frameworks              = 'CoreText', 'QuartzCore', 'SystemConfiguration', 'CoreGraphics', 'UIKit', 'Security'
   s.ios.vendored_frameworks = 'Vendor/CrashReporter.framework'
-  s.xcconfig     = {'GCC_PREPROCESSOR_DEFINITIONS' => %{$(inherited) BITHOCKEY_VERSION="@\\"#{s.version}\\"" BITHOCKEY_BUILD="@\\"24\\""} }
-s.resource_bundle = { 'HockeySDKResources' => ['Resources/*.png', 'Resources/*.lproj'] }
+  s.xcconfig                = {'GCC_PREPROCESSOR_DEFINITIONS' => %{$(inherited) BITHOCKEY_VERSION="@\\"#{s.version}\\"" BITHOCKEY_BUILD="@\\"25\\""} }
+  s.resource_bundle         = { 'HockeySDKResources' => ['Resources/*.png', 'Resources/*.lproj'] }
+  s.preserve_paths          = 'Resources', 'Support'
 
-end
+end

README.md

@@ -1,6 +1,6 @@
-## Version 3.5.1
+## Version 3.5.2
 
-- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.5.1/docs/docs/Changelog.html)
+- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.5.2/docs/docs/Changelog.html)
 
 
 ## Introduction
@@ -31,10 +31,10 @@ The main SDK class is `BITHockeyManager`. It initializes all modules and provide
 
 ## Installation & Setup
 
-- [Installation & Setup](http://www.hockeyapp.net/help/sdk/ios/3.5.1/docs/docs/Guide-Installation-Setup.html) (Recommended)
-- [Installation & Setup Advanced](http://www.hockeyapp.net/help/sdk/ios/3.5.1/docs/docs/Guide-Installation-Setup-Advanced.html) (Using Git submodule and Xcode sub-project)
-- [Identify and authenticate users of Ad-Hoc or Enterprise builds](http://www.hockeyapp.net/help/sdk/ios/3.5.1/docs/docs/HowTo-Authenticating-Users-on-iOS.html)
-- [Migration from previous SDK Versions](http://www.hockeyapp.net/help/sdk/ios/3.5.1/docs/docs/Guide-Migration-Kits.html)
+- [Installation & Setup](http://www.hockeyapp.net/help/sdk/ios/3.5.2/docs/docs/Guide-Installation-Setup.html) (Recommended)
+- [Installation & Setup Advanced](http://www.hockeyapp.net/help/sdk/ios/3.5.2/docs/docs/Guide-Installation-Setup-Advanced.html) (Using Git submodule and Xcode sub-project)
+- [Identify and authenticate users of Ad-Hoc or Enterprise builds](http://www.hockeyapp.net/help/sdk/ios/3.5.2/docs/docs/HowTo-Authenticating-Users-on-iOS.html)
+- [Migration from previous SDK Versions](http://www.hockeyapp.net/help/sdk/ios/3.5.2/docs/docs/Guide-Migration-Kits.html)
 - [Mac Desktop Uploader](http://support.hockeyapp.net/kb/how-tos/how-to-upload-to-hockeyapp-on-a-mac)
 
 
@@ -46,6 +46,6 @@ This documentation provides integrated help in Xcode for all public APIs and a s
 
 2. Unzip the file. A new folder `HockeySDK-iOS-documentation` is created.
 
-3. Copy the content into ~`/Library/Developer/Shared/Documentation/DocSet`
+3. Copy the content into ~`/Library/Developer/Shared/Documentation/DocSets`
 
-The documentation is also available via the following URL: [http://hockeyapp.net/help/sdk/ios/3.5.1/](http://hockeyapp.net/help/sdk/ios/3.5.1/)
+The documentation is also available via the following URL: [http://hockeyapp.net/help/sdk/ios/3.5.2/](http://hockeyapp.net/help/sdk/ios/3.5.2/)

Support/HockeySDK.xcodeproj/project.pbxproj

@@ -1154,6 +1154,10 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 7.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				OTHER_CFLAGS = (
+					"-Wshorten-64-to-32",
+					"-Wall",
+				);
 				RUN_CLANG_STATIC_ANALYZER = YES;
 				SDKROOT = iphoneos;
 			};
@@ -1287,6 +1291,10 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 7.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				OTHER_CFLAGS = (
+					"-Wshorten-64-to-32",
+					"-Wall",
+				);
 				RUN_CLANG_STATIC_ANALYZER = YES;
 				SDKROOT = iphoneos;
 			};
@@ -1318,6 +1326,10 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 7.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				OTHER_CFLAGS = (
+					"-Wshorten-64-to-32",
+					"-Wall",
+				);
 				RUN_CLANG_STATIC_ANALYZER = YES;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = NO;

Support/buildnumber.xcconfig

@@ -1,7 +1,7 @@
 #include "HockeySDK.xcconfig"
 
-BUILD_NUMBER = 24
-VERSION_STRING = 3.5.1
+BUILD_NUMBER = 25
+VERSION_STRING = 3.5.2
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) BITHOCKEY_VERSION="@\""$(VERSION_STRING)"\"" BITHOCKEY_BUILD="@\""$(BUILD_NUMBER)"\""
 BIT_ARM_ARCHS = armv7 armv7s arm64
 BIT_SIM_ARCHS = x86_64 i386

docs/Changelog-template.md

@@ -1,3 +1,13 @@
+## Version 3.5.2
+
+- [UPDATE] Make sure a log message appears in the console if the SDK is not setup on the main thread
+- [BUGFIX] Fix usage time always being send as `0` instead of sending the actual usage time
+- [BUGFIX] Fix "Install" button in the mandatory update alert not working and forcing users to use the "show" button and then install from the update view instead
+- [BUGFIX] Fix possible unused function warnings
+- [BUGFIX] Fix two warnings when `-Wshorten-64-to-32` is set.
+- [BUGFIX] Fix typos in documentation
+<br /><br/>
+
 ## Version 3.5.1
 
 - General

docs/Guide-Installation-Setup-Advanced-template.md

@@ -114,7 +114,7 @@ This documentation provides integrated help in Xcode for all public APIs and a s
 
 2. Unzip the file. A new folder `HockeySDK-iOS-documentation` is created.
 
-3. Copy the content into ~`/Library/Developer/Shared/Documentation/DocSet`
+3. Copy the content into ~`/Library/Developer/Shared/Documentation/DocSets`
 
 The documentation is also available via the following URL: [http://hockeyapp.net/help/sdk/ios/3.5.1/](http://hockeyapp.net/help/sdk/ios/3.5.1/)
 

docs/Guide-Installation-Setup-template.md

@@ -90,7 +90,7 @@ The Mac Desktop Uploader can provide easy uploading of your app versions to Hock
 
 This documentation provides integrated help in Xcode for all public APIs and a set of additional tutorials and how-tos.
 
-1. Copy `de.bitstadium.HockeySDK-iOS-3.5.1.docset` into ~`/Library/Developer/Shared/Documentation/DocSet`
+1. Copy `de.bitstadium.HockeySDK-iOS-3.5.1.docset` into ~`/Library/Developer/Shared/Documentation/DocSets`
 
 The documentation is also available via the following URL: [http://hockeyapp.net/help/sdk/ios/3.5.1/](http://hockeyapp.net/help/sdk/ios/3.5.1/)