Merge remote-tracking branch 'refs/remotes/origin/main'

Author: crystall1nedev

.github/workflows/development.yml

@@ -18,10 +18,6 @@ jobs:
         include:
           - platform: 2
             platform_name: ios
-          - platform: 7
-            platform_name: iossimulator
-          - platform: 8
-            platform_name: tvossimulator
 
     runs-on: J316sAP
     steps:

Makefile

@@ -9,7 +9,7 @@ OUTPUTDIR   := $(SOURCEDIR)/artifacts
 WORKINGDIR  := $(SOURCEDIR)/Natives/build
 DETECTPLAT  := $(shell uname -s)
 DETECTARCH  := $(shell uname -m)
-VERSION     := 3.0
+VERSION     := 1.0
 BRANCH      := $(shell git branch --show-current)
 COMMIT      := $(shell git log --oneline | sed '2,10000000d' | cut -b 1-7)
 PLATFORM    ?= 2

Natives/AccountListViewController.m

@@ -95,7 +95,9 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     [self addActivityIndicatorTo:cell];
 
     id callback = ^(id status, BOOL success) {
-        [self callbackMicrosoftAuth:status success:success forCell:cell];
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            [self callbackMicrosoftAuth:status success:success forCell:cell];
+        });
     };
     [[BaseAuthenticator loadSavedName:self.accountList[indexPath.row][@"username"]] refreshTokenWithCallback:callback];
 }
@@ -210,14 +212,18 @@ - (void)actionLoginMicrosoft:(UITableViewCell *)sender {
 
         NSDictionary *queryItems = [self parseQueryItems:callbackURL.absoluteString];
         if (queryItems[@"code"]) {
-            self.modalInPresentation = YES;
-            self.tableView.userInteractionEnabled = NO;
-            [self addActivityIndicatorTo:sender];
+            dispatch_async(dispatch_get_main_queue(), ^(){
+                self.modalInPresentation = YES;
+                self.tableView.userInteractionEnabled = NO;
+                [self addActivityIndicatorTo:sender];
+            });
             id callback = ^(id status, BOOL success) {
                 if ([status isKindOfClass:NSString.class] && [status isEqualToString:@"DEMO"] && success) {
                     showDialog(localize(@"login.warn.title.demomode", nil), localize(@"login.warn.message.demomode", nil));
                 }
-                [self callbackMicrosoftAuth:status success:success forCell:sender];
+                dispatch_async(dispatch_get_main_queue(), ^(){
+                    [self callbackMicrosoftAuth:status success:success forCell:sender];
+                });
             };
             [[[MicrosoftAuthenticator alloc] initWithInput:queryItems[@"code"]] loginWithCallback:callback];
         } else {

Natives/CustomControlsViewController.m

@@ -37,7 +37,6 @@ - (void)viewDidLoad
     [self setNeedsUpdateOfScreenEdgesDeferringSystemGestures];
     [self setNeedsUpdateOfHomeIndicatorAutoHidden];
 
-    CGRect screenBounds = [[UIScreen mainScreen] bounds];
     UIEdgeInsets insets = UIApplication.sharedApplication.windows.firstObject.safeAreaInsets;
 
     UILabel *guideLabel = [[UILabel alloc] initWithFrame:self.view.frame];
@@ -48,7 +47,7 @@ - (void)viewDidLoad
     guideLabel.text = localize(@"custom_controls.hint", nil);
     [self.view addSubview:guideLabel]; 
 
-    self.ctrlView = [[ControlLayout alloc] initWithFrame:getSafeArea()];
+    self.ctrlView = [[ControlLayout alloc] initWithFrame:getSafeArea(self.view.frame)];
     self.ctrlView.layer.borderColor = UIColor.labelColor.CGColor;
     [self.view addSubview:self.ctrlView];
 
@@ -173,7 +172,7 @@ - (void)loadControlFile:(NSString *)file {
 
 - (void)viewDidLayoutSubviews {
     if (self.navigationBar.hidden) {
-        self.ctrlView.frame = getSafeArea();
+        self.ctrlView.frame = getSafeArea(self.view.frame);
     }
 
     // Update dynamic position for each view
@@ -193,7 +192,7 @@ - (void)changeSafeAreaSelection:(UISegmentedControl *)sender {
             self.ctrlView.frame = UIEdgeInsetsInsetRect(self.view.frame, getDefaultSafeArea());
             break;
         case 2:
-            self.ctrlView.frame = getSafeArea();
+            self.ctrlView.frame = getSafeArea(self.view.frame);
             break;
     }
     self.ctrlView.userInteractionEnabled = sender.selectedSegmentIndex == 2;
@@ -345,12 +344,12 @@ - (void)actionMenuSafeArea {
 }
 
 - (void)actionMenuSafeAreaCancel {
-    self.ctrlView.frame = getSafeArea();
+    self.ctrlView.frame = getSafeArea(self.view.frame);
     [self actionMenuSafeArea];
 }
 
 - (void)actionMenuSafeAreaDone {
-    setSafeArea(self.ctrlView.frame);
+    setSafeArea(self.view.frame.size, self.ctrlView.frame);
     [self actionMenuSafeArea];
 }
 

Natives/Info.plist

@@ -82,7 +82,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0</string>
+	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -97,7 +97,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3.0</string>
+	<string>1.0</string>
 	<key>GCSupportsControllerUserInteraction</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

Natives/JavaLauncher.m

@@ -20,6 +20,15 @@
 
 extern char **environ;
 
+BOOL validateVirtualMemorySpace(int size) {
+    size <<= 20; // convert to MB
+    void *map = mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+    // check if process successfully maps and unmaps a contiguous range
+    if(map == MAP_FAILED || munmap(map, size) != 0)
+        return NO;
+    return YES;
+}
+
 void init_loadDefaultEnv() {
     /* Define default env */
 
@@ -162,11 +171,16 @@ int launchJVM(NSString *username, id launchTarget, int width, int height, int mi
     int allocmem;
     if (getPrefBool(@"java.auto_ram")) {
         CGFloat autoRatio = getEntitlementValue(@"com.apple.private.memorystatus") ? 0.4 : 0.25;
-        allocmem = roundf((NSProcessInfo.processInfo.physicalMemory / 1048576) * autoRatio);
+        allocmem = roundf((NSProcessInfo.processInfo.physicalMemory >> 20) * autoRatio);
     } else {
         allocmem = getPrefInt(@"java.allocated_memory");
     }
     NSLog(@"[JavaLauncher] Max RAM allocation is set to %d MB", allocmem);
+    if (!validateVirtualMemorySpace(allocmem)) {
+        UIKit_returnToSplitView();
+        showDialog(localize(@"Error", nil), @"Insufficient contiguous virtual memory space. Lower memory allocation and try again.");
+        return 1;
+    }
 
     int margc = -1;
     const char *margv[1000];

Natives/LauncherPreferences.h

@@ -18,8 +18,8 @@ void resetWarnings();
 BOOL getEntitlementValue(NSString *key);
 
 UIEdgeInsets getDefaultSafeArea();
-CGRect getSafeArea();
-void setSafeArea(CGRect safeArea);
+CGRect getSafeArea(CGRect screenBounds);
+void setSafeArea(CGSize screenSize, CGRect safeArea);
 
 NSString* getSelectedJavaHome(NSString* defaultJRETag, int minVersion);
 

Natives/LauncherPreferences.m

@@ -58,17 +58,15 @@ void resetWarnings() {
 
 #pragma mark Safe area
 
-CGRect getSafeArea() {
-    CGRect screenBounds = UIScreen.mainScreen.bounds;
+CGRect getSafeArea(CGRect screenBounds) {
     UIEdgeInsets safeArea = UIEdgeInsetsFromString(getPrefObject(@"control.control_safe_area"));
     if (screenBounds.size.width < screenBounds.size.height) {
         safeArea = UIEdgeInsetsMake(safeArea.right, safeArea.top, safeArea.left, safeArea.bottom);
     }
     return UIEdgeInsetsInsetRect(screenBounds, safeArea);
 }
 
-void setSafeArea(CGRect frame) {
-    CGSize screenSize = UIScreen.mainScreen.bounds.size;
+void setSafeArea(CGSize screenSize, CGRect frame) {
     UIEdgeInsets safeArea;
     // TODO: make safe area consistent across opposite orientations?
     if (screenSize.width < screenSize.height) {

Natives/LauncherPreferencesViewController.m

@@ -211,6 +211,11 @@ - (void)viewDidLoad
               @"icon": @"speaker.zzz",
               @"type": self.typeSwitch
             },
+            @{@"key": @"allow_microphone",
+              @"hasDetail": @YES,
+              @"icon": @"mic",
+              @"type": self.typeSwitch
+            },
         ], @[
             // Control settings
             @{@"icon": @"gamecontroller"},
@@ -395,6 +400,12 @@ - (void)viewDidLoad
     if (self.navigationController == nil) {
         self.tableView.alpha = 0.9;
     }
+    if (NSProcessInfo.processInfo.isMacCatalystApp) {
+        UIButton *closeButton = [UIButton buttonWithType:UIButtonTypeClose];
+        closeButton.frame = CGRectOffset(closeButton.frame, 10, 10);
+        [closeButton addTarget:self action:@selector(actionClose) forControlEvents:UIControlEventTouchUpInside];
+        [self.view addSubview:closeButton];
+    }
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
@@ -404,6 +415,10 @@ - (void)viewWillDisappear:(BOOL)animated {
     }
 }
 
+- (void)actionClose {
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
 #pragma mark UITableView
 
 - (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section {

Natives/LauncherProfilesViewController.m

@@ -7,7 +7,10 @@
 #import "LauncherProfilesViewController.h"
 //#import "NSFileManager+NRFileManager.h"
 #import "PLProfiles.h"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability-new"
 #import "UIKit+AFNetworking.h"
+#pragma clang diagnostic pop
 #import "UIKit+hook.h"
 #import "installer/FabricInstallViewController.h"
 #import "installer/ForgeInstallViewController.h"