Merge branch 'release/1.1_41'

PowZone · Dec 6, 2014 · e6650c3 · e6650c3
2 parents 6966541 + 639c5e0
commit e6650c3
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 33 deletions.
diff --git a/BeMyEyes Tests/ClientTest.swift b/BeMyEyes Tests/ClientTest.swift
@@ -39,12 +39,14 @@ class ClientTest: XCTestCase {
  if let error = error {
  XCTFail("...with error: " + error.localizedDescription)
  }
- let user = BMEClient.sharedClient().currentUser
- XCTAssert(user != nil, "No current user")
- XCTAssert(user.email == email, "Wrong email")
- XCTAssert(user.firstName == firstName, "Wrong first name")
- XCTAssert(user.lastName == lastName, "Wrong last name")
- XCTAssert(user.role == role, "Wrong role")
+ if let user = BMEClient.sharedClient().currentUser {
+ XCTAssert(user.email == email, "Wrong email")
+ XCTAssert(user.firstName == firstName, "Wrong first name")
+ XCTAssert(user.lastName == lastName, "Wrong last name")
+ XCTAssert(user.role == role, "Wrong role")
+ } else {
+ XCTFail("No current user")
+ }
  let token = BMEClient.sharedClient().token()
  XCTAssert(token != nil, "No token")
  }
@@ -57,12 +59,14 @@ class ClientTest: XCTestCase {
  BMEClient.sharedClient().createUserWithEmail(email, password: password, firstName: firstName, lastName: lastName, role: role) { (success, error) in
  BMEClient.sharedClient().loginWithEmail(email, password: password, deviceToken: nil, success: { token in
  expectation.fulfill()
- let user = BMEClient.sharedClient().currentUser
- XCTAssert(user != nil, "No current user")
- XCTAssert(user.email == email, "Wrong email")
- XCTAssert(user.firstName == firstName, "Wrong first name")
- XCTAssert(user.lastName == lastName, "Wrong last name")
- XCTAssert(user.role == role, "Wrong role")
+ if let user = BMEClient.sharedClient().currentUser {
+ XCTAssert(user.email == email, "Wrong email")
+ XCTAssert(user.firstName == firstName, "Wrong first name")
+ XCTAssert(user.lastName == lastName, "Wrong last name")
+ XCTAssert(user.role == role, "Wrong role")
+ } else {
+ XCTFail("No current user")
+ }
  let token = BMEClient.sharedClient().token()
  XCTAssert(token != nil, "No token")
  }, failure: { (error) -> Void in

diff --git a/BeMyEyes/BeMyEyes-Info.plist b/BeMyEyes/BeMyEyes-Info.plist
@@ -30,7 +30,7 @@
  </dict>
  </array>
  <key>CFBundleVersion</key>
- <string>40</string>
+ <string>41</string>
  <key>FacebookAppID</key>
  <string>771890076161460</string>
  <key>FacebookDisplayName</key>

diff --git a/BeMyEyes/Source/Application/BMEAccessControlHandler.m b/BeMyEyes/Source/Application/BMEAccessControlHandler.m
@@ -205,18 +205,24 @@ + (void)requireCameraEnabled:(void(^)(BOOL isEnabled))completion {
 }
 
 + (void)hasVideoEnabled:(void(^)(BOOL isEnabled))completion {
- AVCaptureDevice *device = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
- AVCaptureDeviceInput *deviceInput = [AVCaptureDeviceInput deviceInputWithDevice:device error:nil];
- if (deviceInput)
- {
- // Access to the camera succeeded.
- if (completion) {
- completion(YES);
- }
- return;
+ BOOL enabled;
+ switch ([AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]) {
+ case AVAuthorizationStatusNotDetermined:
+ enabled = NO;
+ break;
+ case AVAuthorizationStatusDenied:
+ enabled = NO;
+ break;
+ case AVAuthorizationStatusRestricted:
+ enabled = NO;
+ break;
+ case AVAuthorizationStatusAuthorized:
+ enabled = YES;
+ default:
+ break;
  }
  if (completion) {
- completion(NO);
+ completion(enabled);
  }
 }
 

diff --git a/BeMyEyes/Source/Controllers/BMEMainViewController.m b/BeMyEyes/Source/Controllers/BMEMainViewController.m
@@ -180,16 +180,16 @@ - (void)askForAccessIfNecessary
 {
  [BMEAccessControlHandler enabledForRole:[BMEClient sharedClient].currentUser.role completion:^(BOOL isEnabled, BOOL validToken) {
  if (isEnabled) {
- return;
- }
- if (!validToken) {
- // User has enable push, but something else went wrong
- NSString *title = MKLocalizedFromTable(BME_MAIN_ALERT_NOTIFICATIONS_ERROR_TITLE, BMEMainLocalizationTable);
- NSString *message = MKLocalizedFromTable(BME_MAIN_ALERT_NOTIFICATIONS_ERROR_MESSAGE, BMEMainLocalizationTable);
- NSString *cancelButton = MKLocalizedFromTable(BME_MAIN_ALERT_CANCEL, BMEMainLocalizationTable);
- PSPDFAlertView *alertView = [[PSPDFAlertView alloc] initWithTitle:title message:message];
- [alertView setCancelButtonWithTitle:cancelButton block:nil];
- [alertView show];
+ if (!validToken) {
+  // User has enable push, but something else went wrong
+  NSString *title = MKLocalizedFromTable(BME_MAIN_ALERT_NOTIFICATIONS_ERROR_TITLE, BMEMainLocalizationTable);
+  NSString *message = MKLocalizedFromTable(BME_MAIN_ALERT_NOTIFICATIONS_ERROR_MESSAGE, BMEMainLocalizationTable);
+  NSString *cancelButton = MKLocalizedFromTable(BME_MAIN_ALERT_CANCEL, BMEMainLocalizationTable);
+  PSPDFAlertView *alertView = [[PSPDFAlertView alloc] initWithTitle:title message:message];
+  [alertView setCancelButtonWithTitle:cancelButton block:nil];
+  [alertView show];
+  return;
+ }
  return;
  }
  [self performSegueWithIdentifier:BMEAccessViewSegue sender:self];