Fix: crash when user has no account, mitigate crash when presenting Details too fast

Author: khanhduytran0

Natives/LauncherNavigationController.m

@@ -18,6 +18,7 @@
 #import "ios_uikit_bridge.h"
 #import "utils.h"
 
+#import <objc/runtime.h>
 #include <sys/time.h>
 
 #define AUTORESIZE_MASKS UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin
@@ -28,7 +29,7 @@ @interface LauncherNavigationController () <UIDocumentPickerDelegate, UIPickerVi
 }
 
 @property(nonatomic) MinecraftResourceDownloadTask* task;
-@property(nonatomic) DownloadProgressViewController* progressVC;
+@property(nonatomic) UINavigationController* progressVC;
 @property(nonatomic) NSArray* globalToolbarItems;
 @property(nonatomic) PLPickerView* versionPickerView;
 @property(nonatomic) UITextField* versionTextField;
@@ -85,7 +86,7 @@ - (void)viewDidLoad
                                                                  action:@selector(performInstallOrShowDetails:)];
         self.buttonInstallItem.enabled = NO;
         dispatch_async(dispatch_get_main_queue(), ^{
-            self.buttonInstallItem.view.superview.superview.superview.superview.backgroundColor = [UIColor colorWithRed:121/255.0 green:56/255.0 blue:162/255.0 alpha:0.5];
+            self.buttonInstallItem.buttonGlassView.backgroundColor = [UIColor colorWithRed:121/255.0 green:56/255.0 blue:162/255.0 alpha:0.5];
         });
         [textFieldContainer addSubview:self.versionTextField];
         UIBarButtonItem *textFieldItem = [[UIBarButtonItem alloc] initWithCustomView:textFieldContainer];
@@ -257,12 +258,6 @@ - (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocum
 }
 
 - (void)setInteractionEnabled:(BOOL)enabled forDownloading:(BOOL)downloading {
-    for (UIControl *view in self.toolbar.subviews) {
-        if ([view isKindOfClass:UIControl.class]) {
-            view.alpha = enabled ? 1 : 0.2;
-            view.enabled = enabled;
-        }
-    }
     self.versionTextField.alpha = enabled ? 1 : 0.2;
     self.versionTextField.enabled = enabled;
     self.progressViewMain.hidden = enabled;
@@ -276,6 +271,7 @@ - (void)setInteractionEnabled:(BOOL)enabled forDownloading:(BOOL)downloading {
             self.buttonInstallItem.enabled = YES;
         }
     } else {
+        self.buttonInstall.enabled = enabled;
         self.buttonInstallItem.enabled = enabled;
     }
     UIApplication.sharedApplication.idleTimerDisabled = !enabled;
@@ -327,18 +323,31 @@ - (void)launchMinecraft:(UIButton *)sender {
     });
 }
 
-- (void)performInstallOrShowDetails:(UIBarButtonItem *)sender {
+- (void)performInstallOrShowDetails:(id)sender {
+    BOOL usesBarButtonItem = [sender isKindOfClass:UIBarButtonItem.class];
     if (self.task) {
         if (!self.progressVC) {
-            self.progressVC = [[DownloadProgressViewController alloc] initWithTask:self.task];
+            UIViewController *vc = [[DownloadProgressViewController alloc] initWithTask:self.task];
+            self.progressVC = [[UINavigationController alloc] initWithRootViewController:vc];
+            self.progressVC.modalPresentationStyle = UIModalPresentationPopover;
+        } else if (self.progressVC.popoverPresentationController._isDismissing) {
+            // FIXME: stock bug? it crashes when users dismisses and presents this vc too fast
+            // "UIPopoverPresentationController () should have a non-nil sourceView or barButtonItem set before the presentation occurs."
+            return;
         }
-        UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:self.progressVC];
-        nav.modalPresentationStyle = UIModalPresentationPopover;
-        nav.popoverPresentationController.sourceView = sender.view;
-        [self presentViewController:nav animated:YES completion:nil];
+        
+        if (usesBarButtonItem) {
+            self.progressVC.popoverPresentationController.barButtonItem = sender;
+        } else {
+            self.progressVC.popoverPresentationController.sourceView = sender;
+        }
+        [self presentViewController:self.progressVC animated:YES completion:nil];
     } else {
+        if (usesBarButtonItem) {
+            sender = ((UIBarButtonItem *)sender).buttonGlassView;
+        }
         [self launchMinecraft:sender];
-    } 
+    }
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {

Natives/UIKit+hook.h

@@ -15,6 +15,10 @@ extern NSNotificationName UIPresentationControllerPresentationTransitionWillBegi
 - (UIImage *)hook_imageWithSize:(CGSize)size;
 @end
 
+@interface UIBarButtonItem(addition)
+- (UIView *)buttonGlassView;
+@end
+
 // private functions
 extern BOOL _UISolariumEnabled(void) __attribute__((weak_import));
 
@@ -65,6 +69,10 @@ extern BOOL _UISolariumEnabled(void) __attribute__((weak_import));
 - (id<_UIPointerInteractionDriver>)driver;
 @end
 
+@interface UIPopoverPresentationController(private)
+- (BOOL)_isDismissing;
+@end
+
 /*
 @interface WFTextTokenTextView : UITextField
 @property(nonatomic) NSString* placeholder

Natives/UIKit+hook.m

@@ -55,6 +55,12 @@ void init_hookUIKitConstructor(void) {
    }
 }
 
+@implementation UIBarButtonItem(addition)
+- (UIView *)buttonGlassView {
+    return self.view.superview.superview.superview.superview;
+}
+@end
+
 @implementation UIDevice(hook)
 
 - (NSString *)completeOSVersion {