Drop rocketbootstrap, drop Cephei on iOS >=11, switch to libSandy, ad…

…d get_webkit.sh script

.gitignore

@@ -1,3 +1,5 @@
 .theos/
 .DS_Store
 packages/
+.WebKit
+.vscode

Makefile

@@ -2,27 +2,21 @@ export SIMJECT ?= 0
 export ROOTLESS ?= 0
 export NO_DEPENDENCIES ?= 0
 export DEBUG_LOGGING ?= 0
-export NO_CEPHEI ?= 0
-export NO_ROCKETBOOTSTRAP ?= 0
 export NO_LIBCSCOLORPICKER ?= 0
 
 ifeq ($(ROOTLESS),1)
 export NO_DEPENDENCIES = 1
 endif
 
 ifeq ($(SIMJECT),1)
-export NO_CEPHEI = 1
-export NO_ROCKETBOOTSTRAP = 1
 export TARGET = simulator:clang:14.5:8.0
 export ARCHS = x86_64 i386
 else
-export TARGET = iphone:clang:14.4:8.0
+export TARGET = iphone:clang:14.5:8.0
 export ARCHS = armv7 armv7s arm64 arm64e
 endif
 
 ifeq ($(NO_DEPENDENCIES),1)
-export NO_CEPHEI = 1
-export NO_ROCKETBOOTSTRAP = 1
 export NO_LIBCSCOLORPICKER = 1
 endif
 
@@ -32,13 +26,7 @@ include $(THEOS)/makefiles/common.mk
 
 include $(THEOS_MAKE_PATH)/tweak.mk
 
-SUBPROJECTS += MobileSafari WebContent
-
-ifeq ($(NO_ROCKETBOOTSTRAP),0)
-		SUBPROJECTS += SpringBoard
-endif
-
-SUBPROJECTS += Preferences
+SUBPROJECTS = MobileSafari WebContent SpringBoard Preferences
 
 include $(THEOS_MAKE_PATH)/aggregate.mk
 

MobileSafari/Classes/SPDownloadBrowserTableViewController.mm

@@ -28,7 +28,6 @@
 #import "SPFileBrowserTableViewController.h"
 #import "SPFileTableViewCell.h"
 #import "SPLocalizationManager.h"
-#import "SPCommunicationManager.h"
 #import "SPFileManager.h"
 #import "../../Shared/SPFile.h"
 
@@ -276,6 +275,7 @@ - (void)previewControllerDidDismiss:(QLPreviewController *)controller
 
 - (void)didSelectFile:(SPFile*)file atIndexPath:(NSIndexPath*)indexPath
 {
+	BOOL callSuper = YES;
 	if([file displaysAsRegularFile])
 	{
 		//Only cache one hard link at most
@@ -299,6 +299,7 @@ - (void)didSelectFile:(SPFile*)file atIndexPath:(NSIndexPath*)indexPath
 		if(!file.isRegularFile)
 		{
 			[openAlert addAction:[self showContentActionForFile:file withIndexPath:indexPath]];
+			callSuper = NO;
 		}
 
 		if([file isHLSStream])
@@ -361,7 +362,10 @@ - (void)didSelectFile:(SPFile*)file atIndexPath:(NSIndexPath*)indexPath
 		[self presentViewController:openAlert animated:YES completion:nil];
 	}
 
-	[super didSelectFile:file atIndexPath:indexPath];
+	if(callSuper)
+	{
+		[super didSelectFile:file atIndexPath:indexPath];
+	}
 }
 
 //Downloads are section 0, files are section 1

MobileSafari/Classes/SPDownloadManager.mm

@@ -30,7 +30,6 @@
 #import "SPDownloadInfo.h"
 #import "SPLocalizationManager.h"
 #import "SPPreferenceManager.h"
-#import "SPCommunicationManager.h"
 #import "SPCacheManager.h"
 #import "SPStatusBarNotification.h"
 #import "SPStatusBarNotificationWindow.h"
@@ -97,7 +96,7 @@ - (instancetype)init
 
 - (void)setUpDefaultDownloadURL
 {
-	if(preferenceManager.customDefaultPathEnabled && preferenceManager.customDefaultPath && preferenceManager.unsandboxSafariEnabled && rocketBootstrapWorks)
+	if(preferenceManager.customDefaultPathEnabled && preferenceManager.customDefaultPath && [preferenceManager unsandboxSafariEnabled] && libSandyWorks)
 	{
 		self.defaultDownloadURL = [fileManager resolveSymlinkForURL:[NSURL fileURLWithPath:[@"/var" stringByAppendingString:preferenceManager.customDefaultPath]]];
 
@@ -106,9 +105,9 @@ - (void)setUpDefaultDownloadURL
 			return;
 		}
 	}
-	else if(!rocketBootstrapWorks || !preferenceManager.unsandboxSafariEnabled)
+	else if(![preferenceManager unsandboxSafariEnabled] || !libSandyWorks)
 	{
-		self.defaultDownloadURL = [NSURL fileURLWithPath:[NSHomeDirectory() stringByAppendingString:@"/Documents/Downloads"]];
+		self.defaultDownloadURL = [NSURL fileURLWithPath:SANDBOXED_DOWNLOAD_PATH];
 
 		if([self createDownloadDirectoryIfNeeded])
 		{
@@ -133,11 +132,9 @@ - (BOOL)createDownloadDirectoryIfNeeded
 
 - (void)migrateFromSandbox
 {
-#ifndef NO_ROCKETBOOTSTRAP
-	HBLogDebugWeak(@"migrateFromSandbox sandboxed: %d", fileManager.sandboxed);
-	if(!fileManager.sandboxed)
+	if([preferenceManager unsandboxSafariEnabled] && libSandyWorks)
 	{
-		NSURL* oldDownloadURL = [NSURL fileURLWithPath:OLD_DOWNLOAD_PATH];
+		NSURL* oldDownloadURL = [NSURL fileURLWithPath:SANDBOXED_DOWNLOAD_PATH];
 
 		if([fileManager fileExistsAtURL:oldDownloadURL error:nil])
 		{
@@ -155,11 +152,10 @@ - (void)migrateFromSandbox
 				[fileManager removeItemAtURL:oldDownloadURL error:nil];
 
 				sendSimpleAlert([localizationManager localizedSPStringForKey:@"MIGRATION_TITLE"],
-						[NSString stringWithFormat:[localizationManager localizedSPStringForKey:@"MIGRATION_MESSAGE"], OLD_DOWNLOAD_PATH, self.defaultDownloadURL.path]);
+						[NSString stringWithFormat:[localizationManager localizedSPStringForKey:@"MIGRATION_MESSAGE"], SANDBOXED_DOWNLOAD_PATH, self.defaultDownloadURL.path]);
 			}
 		}
 	}
-#endif
 }
 
 - (void)verifyDownloadStorageRevision

MobileSafari/Classes/SPFileManager.h

@@ -33,22 +33,19 @@ typedef NSString *NSFileAttributeKey;
 	NSDictionary* _displayNamesForPaths;
 }
 
-@property (nonatomic, getter=isSandboxed) BOOL sandboxed;
-
 + (instancetype)sharedInstance;
 #ifndef PREFERENCES
 - (void)resetHardLinks;
 - (NSURL*)accessibleHardLinkForFileAtURL:(NSURL*)URL;
 - (NSString*)applicationDisplayNameForURL:(NSURL*)URL;
-#ifndef NO_ROCKETBOOTSTRAP
 - (BOOL)_isReadable:(const char*)str;
 - (BOOL)_isWritable:(const char*)str;
 - (BOOL)isPathReadable:(NSString*)path;
 - (BOOL)isURLReadable:(NSURL*)URL;
 - (BOOL)isPathWritable:(NSString*)path;
 - (BOOL)isURLWritable:(NSURL*)URL;
 #endif
-#endif
+- (void)populateApplicationDisplayNamesForPath;
 - (NSArray<SPFile*>*)filesAtURL:(NSURL*)URL error:(NSError**)error;
 - (BOOL)fileExistsAtURL:(NSURL*)url error:(NSError**)error;
 - (BOOL)isDirectoryAtURL:(NSURL*)url error:(NSError**)error;