Merge branch 'master' into regen-builds-fix

tidev · Jan 20, 2024 · 2aa5637 · 2aa5637
2 parents 4f42b88 + 4a1d20f
commit 2aa5637
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 51 deletions.
diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiApp.h b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiApp.h
@@ -13,10 +13,17 @@
 #import "TiRootViewController.h"
 #import <JavaScriptCore/JavaScriptCore.h>
 
+extern BOOL applicationInMemoryPanic; // TODO: Remove in SDK 9.0+
+
+// TODO: Remove in SDK 9.0+
+TI_INLINE void waitForMemoryPanicCleared() //WARNING: This must never be run on main thread, or else there is a risk of deadlock!
+{
+}
+
 /**
  TiApp represents an instance of an application. There is always only one instance per application which could be accessed through <app> class method.
  */
-@interface TiApp : TiHost <UIApplicationDelegate, NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDownloadDelegate, UNUserNotificationCenterDelegate, UIWindowSceneDelegate> {
+@interface TiApp : TiHost <UIApplicationDelegate, NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDownloadDelegate, UNUserNotificationCenterDelegate> {
   UIWindow *window;
   UIImageView *loadView;
   UIView *splashScreenView;

diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiApp.m b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiApp.m
@@ -33,6 +33,11 @@
 
 #define SHUTDOWN_TIMEOUT_IN_SEC 3
 
+BOOL applicationInMemoryPanic = NO; // TODO: Remove in SDK 9.0+
+
+// TODO: Remove in SDK 9.0+
+TI_INLINE void waitForMemoryPanicCleared(void); //WARNING: This must never be run on main thread, or else there is a risk of deadlock!
+
 @interface TiApp ()
 - (void)checkBackgroundServices;
 - (void)appBoot;
@@ -322,9 +327,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [[TiLogServer defaultLogServer] start];
   }
 
+  // Initialize the root-window
+  window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+
   // Initialize the launch options to be used by the client
   launchOptions = [[NSMutableDictionary alloc] initWithDictionary:launchOptions_];
 
+  // Initialize the root-controller
+  [self initController];
+
   // If we have a APNS-UUID, assign it
   NSString *apnsUUID = [[NSUserDefaults standardUserDefaults] stringForKey:@"APNSRemoteDeviceUUID"];
   if (apnsUUID != nil) {
@@ -1224,22 +1235,6 @@ - (KrollBridge *)krollBridge
   return kjsBridge;
 }
 
-#pragma mark UIWindowSceneDelegate
-
-- (UISceneConfiguration *)application:(UIApplication *)application configurationForConnectingSceneSession:(UISceneSession *)connectingSceneSession options:(UISceneConnectionOptions *)options
-{
-  return [[UISceneConfiguration alloc] initWithName:@"Default Configuration" sessionRole:connectingSceneSession.role];
-}
-
-- (void)scene:(UIScene *)scene willConnectToSession:(UISceneSession *)session options:(UISceneConnectionOptions *)connectionOptions
-{
-  // Initialize the root-window
-  window = [[UIWindow alloc] initWithWindowScene:(UIWindowScene *)scene];
-
-  // Initialize the root-controller
-  [self initController];
-}
-
 #pragma mark Background Tasks
 
 - (void)beginBackgrounding

diff --git a/iphone/iphone/Titanium.plist b/iphone/iphone/Titanium.plist
@@ -78,22 +78,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UIApplicationSceneManifest</key>
-	<dict>
-		<key>UIApplicationSupportsMultipleScenes</key>
-		<true/>
-		<key>UISceneConfigurations</key>
-		<dict>
-			<key>UIWindowSceneSessionRoleApplication</key>
-			<array>
-				<dict>
-					<key>UISceneConfigurationName</key>
-					<string>Default Configuration</string>
-					<key>UISceneDelegateClassName</key>
-					<string>TiApp</string>
-				</dict>
-			</array>
-		</dict>
-	</dict>
 </dict>
 </plist>
diff --git a/support/iphone/Info.plist b/support/iphone/Info.plist
@@ -36,22 +36,5 @@
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>UIApplicationSceneManifest</key>
-	<dict>
-		<key>UIApplicationSupportsMultipleScenes</key>
-		<false/>
-		<key>UISceneConfigurations</key>
-		<dict>
-			<key>UIWindowSceneSessionRoleApplication</key>
-			<array>
-				<dict>
-					<key>UISceneConfigurationName</key>
-					<string>Default Configuration</string>
-					<key>UISceneDelegateClassName</key>
-					<string>TiApp</string>
-				</dict>
-			</array>
-		</dict>
-	</dict>
 </dict>
 </plist>