chore: update integerationapp for newer OS env (#891)

* fix deprecated self.interfaceOrientation * fix notification * fix typo * tweak indentations
appium · Apr 19, 2024 · 2c78348 · 2c78348
1 parent 32be3b4
commit 2c78348
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/WebDriverAgentTests/IntegrationApp/Classes/AppDelegate.h b/WebDriverAgentTests/IntegrationApp/Classes/AppDelegate.h
@@ -8,8 +8,9 @@
  */
 
 #import <UIKit/UIKit.h>
+#import <UserNotifications/UserNotifications.h>
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
+@interface AppDelegate : UIResponder <UIApplicationDelegate,UNUserNotificationCenterDelegate>
 @property (strong, nonatomic) UIWindow *window;
 
 @end
diff --git a/WebDriverAgentTests/IntegrationApp/Classes/FBAlertViewController.h b/WebDriverAgentTests/IntegrationApp/Classes/FBAlertViewController.h
@@ -8,6 +8,7 @@
  */
 
 #import <UIKit/UIKit.h>
+#import <UserNotifications/UserNotifications.h>
 
 @interface FBAlertViewController : UIViewController
 

diff --git a/WebDriverAgentTests/IntegrationApp/Classes/FBAlertViewController.m b/WebDriverAgentTests/IntegrationApp/Classes/FBAlertViewController.m
@@ -37,7 +37,14 @@ - (IBAction)createAppSheet:(UIButton *)sender
 
 - (IBAction)createNotificationAlert:(UIButton *)sender
 {
-  [[UIApplication sharedApplication] registerUserNotificationSettings:[UIUserNotificationSettings settingsForTypes:UIUserNotificationTypeAlert categories:nil]];
+  UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+  [center requestAuthorizationWithOptions:(UNAuthorizationOptionSound|UNAuthorizationOptionAlert|UNAuthorizationOptionBadge) 
+                        completionHandler:^(BOOL granted, NSError * _Nullable error)
+   {
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [[UIApplication sharedApplication] registerForRemoteNotifications];
+    });
+  }];
 }
 
 - (IBAction)createCameraRollAccessAlert:(UIButton *)sender

diff --git a/WebDriverAgentTests/IntegrationApp/Classes/ViewController.m b/WebDriverAgentTests/IntegrationApp/Classes/ViewController.m
@@ -37,7 +37,7 @@ - (void)viewDidLayoutSubviews
 - (void)updateOrentationLabel
 {
   NSString *orientation = nil;
-  switch (self.interfaceOrientation) {
+  switch (UIDevice.currentDevice.orientation) {
     case UIInterfaceOrientationPortrait:
       orientation = @"Portrait";
       break;
@@ -50,6 +50,12 @@ - (void)updateOrentationLabel
     case UIInterfaceOrientationLandscapeRight:
       orientation = @"LandscapeRight";
       break;
+    case UIDeviceOrientationFaceUp:
+      orientation = @"FaceUp";
+      break;
+    case UIDeviceOrientationFaceDown:
+      orientation = @"FaceDown";
+      break;
     case UIInterfaceOrientationUnknown:
       orientation = @"Unknown";
       break;

diff --git a/WebDriverAgentTests/IntegrationApp/Info.plist b/WebDriverAgentTests/IntegrationApp/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.facebook.wda.integrationApp</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -22,12 +22,12 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>Yo Yo</string>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>Yo Yo</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Yo Yo</string>
-	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>Yo Yo</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Yo Yo</string>
 	<key>UILaunchStoryboardName</key>
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
      */
     #import <UIKit/UIKit.h>
+    #import <UserNotifications/UserNotifications.h>
     @interface FBAlertViewController : UIViewController
@@ Expand Down @@