Merge branch 'release/1.1_36'

BeMyEyes.xcodeproj/project.pbxproj

@@ -29,6 +29,7 @@
  4E8E21F519E8C03C00316AD8 /* IntroVideoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E8E21F219E8C03C00316AD8 /* IntroVideoViewController.swift */; };
  4E8E21F619E8C03C00316AD8 /* OnboardingVideoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E8E21F319E8C03C00316AD8 /* OnboardingVideoViewController.swift */; };
  4E8E21F719E8C03C00316AD8 /* VideoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E8E21F419E8C03C00316AD8 /* VideoViewController.swift */; };
+ 4EB3A9A41A0E6D4F0044D4B9 /* BMEOpenTokVideoCapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EB3A9A31A0E6D4F0044D4B9 /* BMEOpenTokVideoCapture.m */; };
  4EB46C4419F080FE008405B8 /* BMEAccessLocalization.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4EB46C4619F080FE008405B8 /* BMEAccessLocalization.strings */; };
  4EB6A1E219E5725F00C72A02 /* Button.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB6A1E119E5725F00C72A02 /* Button.swift */; };
  4EB6AD1219E1F47A00141615 /* BMETaskTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EB6AD1119E1F47A00141615 /* BMETaskTableViewCell.m */; };
@@ -200,6 +201,8 @@
  4E8E21F219E8C03C00316AD8 /* IntroVideoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroVideoViewController.swift; sourceTree = "<group>"; };
  4E8E21F319E8C03C00316AD8 /* OnboardingVideoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingVideoViewController.swift; sourceTree = "<group>"; };
  4E8E21F419E8C03C00316AD8 /* VideoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoViewController.swift; sourceTree = "<group>"; };
+ 4EB3A9A21A0E6D4F0044D4B9 /* BMEOpenTokVideoCapture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BMEOpenTokVideoCapture.h; sourceTree = "<group>"; };
+ 4EB3A9A31A0E6D4F0044D4B9 /* BMEOpenTokVideoCapture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BMEOpenTokVideoCapture.m; sourceTree = "<group>"; };
  4EB46C4519F080FE008405B8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/BMEAccessLocalization.strings; sourceTree = "<group>"; };
  4EB46C4719F08102008405B8 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/BMEAccessLocalization.strings; sourceTree = "<group>"; };
  4EB6A1E119E5725F00C72A02 /* Button.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Button.swift; sourceTree = "<group>"; };
@@ -670,6 +673,8 @@
  4E6544861A0136F700B71C1C /* BMEScrollViewTextFieldHelper.h */,
  4E6544871A0136F700B71C1C /* BMEScrollViewTextFieldHelper.m */,
  4E6AE89D1A01927F0019247A /* FacebookHelper.swift */,
+ 4EB3A9A21A0E6D4F0044D4B9 /* BMEOpenTokVideoCapture.h */,
+ 4EB3A9A31A0E6D4F0044D4B9 /* BMEOpenTokVideoCapture.m */,
  );
  path = Library;
  sourceTree = "<group>";
@@ -998,6 +1003,7 @@
  4E3ACE1819FFEF4F002548C8 /* PostCallViewController.swift in Sources */,
  72DA826818D45B52001F3312 /* BMEHelperMainViewController.m in Sources */,
  7236E04A18B8DD8E00F622AA /* BMESignUpViewController.m in Sources */,
+ 4EB3A9A41A0E6D4F0044D4B9 /* BMEOpenTokVideoCapture.m in Sources */,
  7296569918CC8C3E00E1A9EE /* BMEMainViewController.m in Sources */,
  4EB6AD1719E1F48C00141615 /* GradientView.swift in Sources */,
  72A7676C19029F34003121C4 /* NSDate+BMESnoozeRelativeDate.m in Sources */,

BeMyEyes/Base.lproj/Main.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="NHr-Jb-n4i">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="pPv-pk-tQL">
  <dependencies>
  <deployment identifier="iOS"/>
  <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
@@ -349,7 +349,7 @@
  <!--Top Navigation Controller-->
  <scene sceneID="eg8-GG-mp5">
  <objects>
- <navigationController definesPresentationContext="YES" navigationBarHidden="YES" id="NHr-Jb-n4i" customClass="BMETopNavigationController" sceneMemberID="viewController">
+ <navigationController storyboardIdentifier="FrontPageNavigation" definesPresentationContext="YES" navigationBarHidden="YES" id="NHr-Jb-n4i" customClass="BMETopNavigationController" sceneMemberID="viewController">
  <navigationBar key="navigationBar" contentMode="scaleToFill" id="Pvb-fY-Etg">
  <autoresizingMask key="autoresizingMask"/>
  </navigationBar>

BeMyEyes/BeMyEyes-Info.plist

@@ -30,7 +30,7 @@
  </dict>
  </array>
  <key>CFBundleVersion</key>
- <string>35</string>
+ <string>36</string>
  <key>FacebookAppID</key>
  <string>771890076161460</string>
  <key>FacebookDisplayName</key>
@@ -39,6 +39,7 @@
  <true/>
  <key>UIBackgroundModes</key>
  <array>
+ <string>audio</string>
  <string>remote-notification</string>
  </array>
  <key>UILaunchStoryboardName</key>
@@ -57,6 +58,13 @@
  <array>
  <string>UIInterfaceOrientationPortrait</string>
  </array>
+ <key>UISupportedInterfaceOrientations~ipad</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ <string>UIInterfaceOrientationPortraitUpsideDown</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
+ </array>
  <key>UIViewControllerBasedStatusBarAppearance</key>
  <true/>
 </dict>

BeMyEyes/Source/Application/BMEAccessControlHandler.h

@@ -10,13 +10,13 @@
 
 @interface BMEAccessControlHandler : NSObject
 
-+ (void)requireNotificationsEnabled:(void(^)(BOOL isEnabled))completion;
-+ (void)hasNotificationsEnabled:(void(^)(BOOL isEnabled))completion;
++ (void)requireNotificationsEnabled:(void(^)(BOOL isEnabled, BOOL validToken))completion;
++ (void)hasNotificationsEnabled:(void(^)(BOOL isEnabled, BOOL validToken))completion;
 + (void)requireMicrophoneEnabled:(void(^)(BOOL isEnabled))completion;
 + (void)hasMicrophoneEnabled:(void(^)(BOOL isEnabled))completion;
 + (void)requireCameraEnabled:(void(^)(BOOL isEnabled))completion;
 + (void)hasVideoEnabled:(void(^)(BOOL isEnabled))completion;
 
-+ (void)enabledForRole:(BMERole)role completion:(void(^)(BOOL isEnabled))completion;
++ (void)enabledForRole:(BMERole)role completion:(void(^)(BOOL isEnabled, BOOL validToken))completion;
 
 @end

BeMyEyes/Source/Application/BMEAccessControlHandler.m

@@ -12,7 +12,7 @@
 
 @interface BMEAccessControlHandler() <UIAlertViewDelegate>
 
-@property (strong, nonatomic) void (^notificationsCompletion)(BOOL);
+@property (strong, nonatomic) void (^notificationsCompletion)(BOOL isEnabled, BOOL validToken);
 
 @end
 
@@ -50,13 +50,13 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 {
  if ([keyPath isEqualToString:NSStringFromSelector(@selector(deviceToken))] &&
  object == [GVUserDefaults standardUserDefaults]) {
- [BMEAccessControlHandler hasNotificationsEnabled:^(BOOL isEnabled) {
+ [BMEAccessControlHandler hasNotificationsEnabled:^(BOOL isEnabled, BOOL validToken) {
  if (!isEnabled) {
  [BMEAccessControlHandler showNotificationsAlert];
  }
  if (self.notificationsCompletion) {
- self.notificationsCompletion(isEnabled);
- self.notificationsCompletion = nil;
+ self.notificationsCompletion(isEnabled, validToken);
+ _notificationsCompletion = nil;
  }
  }];
  return;
@@ -68,10 +68,10 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 #pragma mark -
 #pragma mark Public Methods
 
-+ (void)enabledForRole:(BMERole)role completion:(void (^)(BOOL))completion
++ (void)enabledForRole:(BMERole)role completion:(void (^)(BOOL isEnabled, BOOL validToken))completion
 {
 #if TARGET_IPHONE_SIMULATOR
- completion(YES);
+ completion(YES, YES);
  return;
 #endif
 
@@ -81,30 +81,30 @@ + (void)enabledForRole:(BMERole)role completion:(void (^)(BOOL))completion
  // Ask for microphone + video
  [self hasMicrophoneEnabled:^(BOOL isEnabled) {
  if (!isEnabled) {
- completion(NO);
+ completion(NO, YES);
  return;
  }
  [self hasVideoEnabled:^(BOOL isEnabled) {
- completion(isEnabled);
+ completion(isEnabled, YES);
  }];
  }];
  }
  break;
  case BMERoleHelper:
  {
  // Ask for notifications + microphone + video
- [self hasNotificationsEnabled:^(BOOL isEnabled) {
+ [self hasNotificationsEnabled:^(BOOL isEnabled, BOOL validToken) {
  if (!isEnabled) {
- completion(NO);
+ completion(NO, validToken);
  return;
  }
  [self hasMicrophoneEnabled:^(BOOL isEnabled) {
  if (!isEnabled) {
- completion(NO);
+ completion(NO, validToken);
  return;
  }
  [self hasVideoEnabled:^(BOOL isEnabled) {
- completion(isEnabled);
+ completion(isEnabled, validToken);
  }];
  }];
  }];
@@ -119,13 +119,13 @@ + (void)enabledForRole:(BMERole)role completion:(void (^)(BOOL))completion
 
 // Remote notifications
 
-+ (void)requireNotificationsEnabled:(void(^)(BOOL isEnabled))completion {
++ (void)requireNotificationsEnabled:(void(^)(BOOL isEnabled, BOOL validToken))completion {
  // Store completion block
  [self sharedInstance].notificationsCompletion = completion;
  [self registerForRemoteNotifications];
 }
 
-+ (void)hasNotificationsEnabled:(void(^)(BOOL isEnabled))completion {
++ (void)hasNotificationsEnabled:(void(^)(BOOL isUserEnabled, BOOL validToken))completion {
  // System – require badge and alert
  BOOL isUserEnabled = NO;
  if ([[UIApplication sharedApplication] respondsToSelector:@selector(isRegisteredForRemoteNotifications)]) {
@@ -149,8 +149,7 @@ + (void)hasNotificationsEnabled:(void(^)(BOOL isEnabled))completion {
  BOOL isTemporary = [deviceToken rangeOfString:@"bmetemp"].location == 0; // [GVUserDefaults standardUserDefaults].isTemporaryDeviceToken might not have been set yet
  BOOL hasValidToken = hasNotificationsToken && !isTemporary;
  // Combined
- BOOL isEnabled = hasValidToken && isUserEnabled;
- completion(isEnabled);
+ completion(isUserEnabled, hasValidToken);
 }
 
 

BeMyEyes/Source/Application/BMEAppDelegate.m

@@ -75,9 +75,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
  [NewRelicAgent startWithApplicationToken:@"AA9b45f5411736426b5fac31cce185b50d173d99ea"];
  [self configureRESTClient];
- dispatch_async(dispatch_get_main_queue(), ^{
- [self checkIfLoggedIn];
- });
+ [self checkIfLoggedIn];
 
  if (self.isLaunchedWithShortID) {
  [self performSelector:@selector(didAnswerCallWithShortId:) withObject:shortIdInLaunchOptions afterDelay:0.0f];
@@ -269,6 +267,7 @@ - (void)checkIfLoggedIn {
  }
  }];
  } else {
+ [self showFrontPage];
  NSLog(@"Device token: %@", [GVUserDefaults standardUserDefaults].deviceToken);
  NSLog(@"Is valid: %@", [BMEClient sharedClient].isTokenValid ? @"YES" : @"NO");
  }
@@ -405,25 +404,34 @@ - (void)didLogIn:(NSNotification *)notification {
 
 
 - (void)showFrontPage {
- BMETopNavigationController *initialViewController;
- if ([self.window.rootViewController isKindOfClass:[BMETopNavigationController class]]) {
- initialViewController = (BMETopNavigationController *)self.window.rootViewController;
+ if ([self.window.rootViewController.restorationIdentifier isEqualToString:BMEFrontPageNavigationControllerIdentifier]) {
+ BMETopNavigationController *initialViewController = (BMETopNavigationController *)self.window.rootViewController;
  if (initialViewController.presentedViewController) {
  [initialViewController dismissViewControllerAnimated:YES completion:nil];
  }
  [initialViewController popToRootViewControllerAnimated:YES];
- } else {
- initialViewController = (BMETopNavigationController *)[self.window.rootViewController.storyboard instantiateInitialViewController];
- self.window.rootViewController = initialViewController;
+ return;
  }
+ [self setTopViewController:[self.storyboard instantiateViewControllerWithIdentifier:BMEFrontPageNavigationControllerIdentifier]];
 }
 
 - (void)showLoggedInMainView {
- if ([self.window.rootViewController.presentedViewController.restorationIdentifier isEqualToString:BMEMainNavigationControllerIdentifier]) {
+ if ([self.window.rootViewController.restorationIdentifier isEqualToString:BMEMainNavigationControllerIdentifier]) {
  return;
  }
- UIViewController *mainController = [self.window.rootViewController.storyboard instantiateViewControllerWithIdentifier:BMEMainNavigationControllerIdentifier];
- [self.window.rootViewController presentViewController:mainController animated:YES completion:nil];
+ [self setTopViewController:[self.storyboard instantiateViewControllerWithIdentifier:BMEMainNavigationControllerIdentifier]];
+}
+
+- (void)setTopViewController:(UIViewController *)viewController {
+ for (UIView *view in self.window.subviews) { // Clear out, since presentedViewController might not be removed when settings window.rootViewController
+ [view removeFromSuperview];
+ }
+ self.window.rootViewController = viewController;
+}
+
+- (UIStoryboard *)storyboard {
+ UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:nil];
+ return storyboard;
 }
 
 @end

BeMyEyes/Source/Controllers/BMEAccessViewController.m

@@ -69,14 +69,14 @@ - (void)dealloc
 
 - (void)checkAccess
 {
- [BMEAccessControlHandler enabledForRole:self.role completion:^(BOOL isEnabled) {
- if (isEnabled) {
+ [BMEAccessControlHandler enabledForRole:self.role completion:^(BOOL isEnabled, BOOL validToken) {
+ if (isEnabled && validToken) {
  [self dismissViewControllerAnimated:YES completion:nil];
  return;
  }
 
  if (_accessNotificationsView) {
- [BMEAccessControlHandler hasNotificationsEnabled:^(BOOL isEnabled) {
+ [BMEAccessControlHandler hasNotificationsEnabled:^(BOOL isEnabled, BOOL validToken) {
  _accessNotificationsView.selected = isEnabled;
  }];
  }
@@ -87,7 +87,7 @@ - (void)checkAccess
  }
  if (_accessCameraView) {
  [BMEAccessControlHandler hasVideoEnabled:^(BOOL isEnabled) {
- self.accessCameraView.selected = isEnabled;
+ _accessCameraView.selected = isEnabled;
  }];
  }
  }];
@@ -196,8 +196,8 @@ - (void)touchUpInsideNotificationsView
  if (self.accessNotificationsView.selected) {
  return;
  }
- [BMEAccessControlHandler requireNotificationsEnabled:^(BOOL isEnabled) {
- self.accessNotificationsView.selected = isEnabled;
+ [BMEAccessControlHandler requireNotificationsEnabled:^(BOOL isUserEnabled, BOOL validToken) {
+ self.accessNotificationsView.selected = isUserEnabled;
  [self checkAccess];
  }];
 }

BeMyEyes/Source/Controllers/BMEBaseViewController.m

@@ -18,11 +18,8 @@ - (BOOL)shouldAutorotate {
 }
 
 - (NSUInteger)supportedInterfaceOrientations {
- return UIInterfaceOrientationMaskPortrait;
-}
-
-- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
- return UIInterfaceOrientationPortrait;
+ BOOL isIpad = [UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad;
+ return isIpad ? UIInterfaceOrientationMaskAll : UIInterfaceOrientationMaskPortrait;
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle

BeMyEyes/Source/Controllers/BMECallViewController.m

@@ -16,6 +16,7 @@
 #import "BMERequest.h"
 #import "BMESpeaker.h"
 #import "BMECallAudioPlayer.h"
+#import "BMEOpenTokVideoCapture.h"
 
 static NSString *BMECallPostSegue = @"PostCall";
 
@@ -222,6 +223,7 @@ - (void)publish {
  self.publisher.cameraPosition = AVCaptureDevicePositionBack;
  self.publisher.publishAudio = YES;
  self.publisher.publishVideo = [self isUserBlind];
+ self.publisher.videoCapture = [BMEOpenTokVideoCapture new];
 
  OTError *error = nil;
  [self.session publish:self.publisher error:&error];

BeMyEyes/Source/Controllers/BMEHelperMainViewController.m

@@ -103,9 +103,10 @@ - (void)viewDidLoad {
 
  [MKLocalization registerForLocalization:self];
 
- self.tableView.estimatedRowHeight = self.tableView.rowHeight;
- self.tableView.rowHeight = UITableViewAutomaticDimension;
-
+ if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 8.0) {
+ self.tableView.estimatedRowHeight = self.tableView.rowHeight;
+ self.tableView.rowHeight = UITableViewAutomaticDimension;
+ }
 
  self.pointsHelpedPersonsLabel.colors =
  self.pointsTotalLabel.colors = @{ @(0.0f) : [UIColor lightTextColor],