Merge branch 'release/3.8.3'

bitstadium · Oct 22, 2015 · 29c1b28 · 29c1b28
2 parents dc7666b + a7b779d
commit 29c1b28
Show file tree

Hide file tree

Showing 56 changed files with 615 additions and 443 deletions.
diff --git a/Classes/BITActivityIndicatorButton.m b/Classes/BITActivityIndicatorButton.m
@@ -79,4 +79,4 @@ - (void)layoutSubviews {
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/Classes/BITAppStoreHeader.m b/Classes/BITAppStoreHeader.m
@@ -162,4 +162,4 @@ - (void)setIconImage:(UIImage *)anIconImage {
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_UPDATES */
diff --git a/Classes/BITArrowImageAnnotation.m b/Classes/BITArrowImageAnnotation.m
@@ -207,4 +207,4 @@ - (void)layoutSubviews{
 
 @end
 
-#endif
+#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/Classes/BITAuthenticationViewController.m b/Classes/BITAuthenticationViewController.m
@@ -93,7 +93,7 @@ - (void)setShowsLoginViaWebButton:(BOOL)showsLoginViaWebButton {
       [self updateBarButtons];
       [self updateWebLoginButton];
     }
-   }
+  }
 }
 
 - (void) updateWebLoginButton {
@@ -279,7 +279,7 @@ - (BOOL)textFieldShouldReturn:(UITextField *)textField {
       [self saveAction:nil];
     }
   }
-  return NO; 
+  return NO;
 }
 
 #pragma mark - Actions
@@ -294,23 +294,26 @@ - (void)saveAction:(id)sender {
                                      if(succeeded) {
                                        //controller should dismiss us shortly..
                                      } else {
-
-                                       // requires iOS 8
-                                       id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
-                                       if (uialertcontrollerClass) {
-                                         UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil
-                                                                                                                  message:error.localizedDescription
-                                                                                                           preferredStyle:UIAlertControllerStyleAlert];
-
-
-                                         UIAlertAction *okAction = [UIAlertAction actionWithTitle:BITHockeyLocalizedString(@"OK")
-                                                                                                style:UIAlertActionStyleCancel
-                                                                                              handler:^(UIAlertAction * action) {}];
-
-                                         [alertController addAction:okAction];
+                                       dispatch_async(dispatch_get_main_queue(), ^{
 
-                                         [self presentViewController:alertController animated:YES completion:nil];
-                                       } else {
+                                         /* 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) {
+                                          UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil
+                                          message:error.localizedDescription
+                                          preferredStyle:UIAlertControllerStyleAlert];
+                                          
+                                          
+                                          UIAlertAction *okAction = [UIAlertAction actionWithTitle:BITHockeyLocalizedString(@"OK")
+                                          style:UIAlertActionStyleCancel
+                                          handler:^(UIAlertAction * action) {}];
+                                          
+                                          [alertController addAction:okAction];
+                                          
+                                          [self presentViewController:alertController animated:YES completion:nil];
+                                          } else {
+                                          */
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
                                          UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:nil
@@ -320,9 +323,10 @@ - (void)saveAction:(id)sender {
                                                                                    otherButtonTitles:nil];
                                          [alertView show];
 #pragma clang diagnostic pop
-                                       }
-                                       typeof(self) strongSelf = weakSelf;
-                                       [strongSelf setLoginUIEnabled:YES];
+                                         /*}*/
+                                         typeof(self) strongSelf = weakSelf;
+                                         [strongSelf setLoginUIEnabled:YES];
+                                       });
                                      }
                                    }];
 }
@@ -334,4 +338,4 @@ - (void) setLoginUIEnabled:(BOOL) enabled {
 
 @end
 
-#endif
+#endif  /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
diff --git a/Classes/BITAuthenticator.h b/Classes/BITAuthenticator.h
@@ -313,7 +313,7 @@ typedef NS_ENUM(NSUInteger, BITAuthenticatorAppRestrictionEnforcementFrequency)
  * @see authenticateInstallation
  * @see validateWithCompletion:
  *
- * @param completion Block being executed once identification completed
+ * @param completion Block being executed once identification completed. Be sure to properly dispatch code to the main queue if necessary.
  */
 - (void) identifyWithCompletion:(void(^)(BOOL identified, NSError *error)) completion;
 
@@ -342,7 +342,7 @@ typedef NS_ENUM(NSUInteger, BITAuthenticatorAppRestrictionEnforcementFrequency)
  * @see authenticateInstallation
  * @see identifyWithCompletion:
  *
- * @param completion Block being executed once validation completed
+ * @param completion Block being executed once validation completed. Be sure to properly dispatch code to the main queue if necessary.
  */
 - (void) validateWithCompletion:(void(^)(BOOL validated, NSError *error)) completion;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -79,4 +79,4 @@ - (void)layoutSubviews {

		@end

		#endif
		#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -162,4 +162,4 @@ - (void)setIconImage:(UIImage *)anIconImage {

		@end

		#endif
		#endif /* HOCKEYSDK_FEATURE_UPDATES */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -207,4 +207,4 @@ - (void)layoutSubviews{

		@end

		#endif
		#endif /* HOCKEYSDK_FEATURE_FEEDBACK */