1.7~b1

opa334 · Apr 15, 2019 · 0b28128 · 0b28128
1 parent bbfc768
commit 0b28128
Show file tree

Hide file tree

Showing 170 changed files with 7,482 additions and 2,712 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.theos/
+.DS_Store
+packages/
diff --git a/Makefile b/Makefile
@@ -4,26 +4,28 @@ export NO_DEPENDENCIES ?= 0
 export DEBUG_LOGGING ?= 0
 export NO_CEPHEI ?= 0
 export NO_ROCKETBOOTSTRAP ?= 0
-export NO_LIBCOLORPICKER ?= 0
+export NO_LIBCSCOLORPICKER ?= 0
 export NO_LIBBULLETIN ?= 0
 
 ifeq ($(ROOTLESS),1)
 export NO_DEPENDENCIES = 1
 endif
 
 ifeq ($(SIMJECT),1)
-export NO_DEPENDENCIES = 1
-export TARGET = simulator:clang:9.2:8.0
+export NO_CEPHEI = 1
+export NO_ROCKETBOOTSTRAP = 1
+export NO_LIBBULLETIN = 1
+export TARGET = simulator:clang:12.1:8.0
 export ARCHS = x86_64 i386
 else
-export TARGET = iphone:clang:11.2:8.0
-export ARCHS = arm64 armv7
+export TARGET = iphone:clang:12.1.2:8.0
+export ARCHS = armv7 armv7s arm64
 endif
 
 ifeq ($(NO_DEPENDENCIES),1)
 export NO_CEPHEI = 1
 export NO_ROCKETBOOTSTRAP = 1
-export NO_LIBCOLORPICKER = 1
+export NO_LIBCSCOLORPICKER = 1
 export NO_LIBBULLETIN = 1
 endif
 

diff --git a/MobileSafari/Classes/AVActivityButton.h b/MobileSafari/Classes/AVActivityButton.h
@@ -1,5 +1,5 @@
 // AVActivityButton.h
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/AVActivityButton.xm b/MobileSafari/Classes/AVActivityButton.xm
@@ -1,5 +1,5 @@
 // AVActivityButton.mm
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPCacheManager.h b/MobileSafari/Classes/SPCacheManager.h
@@ -1,5 +1,5 @@
 // SPCacheManager.h
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 	NSURL* _cacheURL;
 	NSMutableDictionary* _miscPlist;
 	NSMutableDictionary* _desktopButtonStates;
+	NSMutableDictionary* _tabStateAdditions;
 }
 
 + (instancetype)sharedInstance;
@@ -41,4 +42,9 @@
 - (void)setDesktopButtonState:(BOOL)state forUUID:(NSUUID*)UUID;
 - (BOOL)desktopButtonStateForUUID:(NSUUID*)UUID;
 
+- (void)loadTabStateAdditions;
+- (void)saveTabStateAdditions;
+- (BOOL)isTabWithUUIDLocked:(NSUUID*)UUID;
+- (void)setLocked:(BOOL)locked forTabWithUUID:(NSUUID*)UUID;
+
 @end
diff --git a/MobileSafari/Classes/SPCacheManager.mm b/MobileSafari/Classes/SPCacheManager.mm
@@ -1,5 +1,5 @@
 // SPCacheManager.mm
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -148,7 +148,7 @@ - (void)saveDownloadCache:(NSDictionary*)downloadCache
 {
 	NSURL* downloadCacheURL = [_cacheURL URLByAppendingPathComponent:@"downloads.plist"];
 
-	//Create data from pendingDownloads
+	//Create archived data from pendingDownloads
 	NSData *data = [NSKeyedArchiver archivedDataWithRootObject:downloadCache];
 
 	//Write data to file
@@ -217,7 +217,11 @@ - (void)setDesktopButtonState:(BOOL)state forUUID:(NSUUID*)UUID
 //Get desktop button state for browserController UUID
 - (BOOL)desktopButtonStateForUUID:(NSUUID*)UUID
 {
-	[self loadDesktopButtonStates];
+	if(!_desktopButtonStates)
+	{
+		[self loadDesktopButtonStates];
+	}
+
 
 	if(UUID)
 	{
@@ -227,4 +231,72 @@ - (BOOL)desktopButtonStateForUUID:(NSUUID*)UUID
 	return [[_desktopButtonStates objectForKey:@"Enabled"] boolValue];
 }
 
+- (void)loadTabStateAdditions
+{
+	NSURL* tabStateAdditionsURL = [_cacheURL URLByAppendingPathComponent:@"tabStateAdditions.plist"];
+
+	//Get data
+	NSData* data = [NSData dataWithContentsOfURL:tabStateAdditionsURL];
+
+	//Unarchive data
+	_tabStateAdditions = [NSKeyedUnarchiver unarchiveObjectWithData:data];
+
+	if(!_tabStateAdditions)
+	{
+		_tabStateAdditions = [NSMutableDictionary new];
+	}
+}
+
+- (void)saveTabStateAdditions
+{
+	NSURL* tabStateAdditionsURL = [_cacheURL URLByAppendingPathComponent:@"tabStateAdditions.plist"];
+
+	//Get archived data from dictionary
+	NSData* data = [NSKeyedArchiver archivedDataWithRootObject:_tabStateAdditions];
+
+	//Save data to file
+	[data writeToURL:tabStateAdditionsURL atomically:YES];
+
+	[self updateExcludedFromBackup];
+}
+
+- (BOOL)isTabWithUUIDLocked:(NSUUID*)UUID
+{
+	if(!_tabStateAdditions)
+	{
+		[self loadTabStateAdditions];
+	}
+
+	NSMutableSet* lockedTabs = [_tabStateAdditions objectForKey:@"lockedTabs"];
+
+	BOOL locked = [lockedTabs containsObject:UUID];
+
+	return locked;
+}
+
+- (void)setLocked:(BOOL)locked forTabWithUUID:(NSUUID*)UUID
+{
+	NSMutableSet* lockedTabs = [_tabStateAdditions objectForKey:@"lockedTabs"];
+
+	if(!lockedTabs)
+	{
+		lockedTabs = [NSMutableSet new];
+		[_tabStateAdditions setObject:lockedTabs forKey:@"lockedTabs"];
+	}
+
+	if(locked)
+	{
+		[lockedTabs addObject:UUID];
+	}
+	else
+	{
+		[lockedTabs removeObject:UUID];
+	}
+
+	dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^
+	{
+		[self saveTabStateAdditions];
+	});
+}
+
 @end
diff --git a/MobileSafari/Classes/SPCommunicationManager.h b/MobileSafari/Classes/SPCommunicationManager.h
@@ -1,5 +1,5 @@
 // SPCommunicationManager.h
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPCommunicationManager.mm b/MobileSafari/Classes/SPCommunicationManager.mm
@@ -1,5 +1,5 @@
 // SPCommunicationManager.mm
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDirectoryPickerNavigationController.h b/MobileSafari/Classes/SPDirectoryPickerNavigationController.h
@@ -1,5 +1,5 @@
 // SPDirectoryPickerNavigationController.h
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDirectoryPickerNavigationController.mm b/MobileSafari/Classes/SPDirectoryPickerNavigationController.mm
@@ -1,5 +1,5 @@
 // SPDirectoryPickerNavigationController.mm
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDirectoryPickerTableViewController.h b/MobileSafari/Classes/SPDirectoryPickerTableViewController.h
@@ -1,5 +1,5 @@
 // SPDirectoryPickerTableViewController.h
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDirectoryPickerTableViewController.mm b/MobileSafari/Classes/SPDirectoryPickerTableViewController.mm
@@ -1,5 +1,5 @@
 // SPDirectoryPickerTableViewController.mm
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownload.h b/MobileSafari/Classes/SPDownload.h
@@ -1,5 +1,5 @@
 // SPDownload.h
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownload.mm b/MobileSafari/Classes/SPDownload.mm
@@ -1,5 +1,5 @@
 // SPDownload.mm
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownloadBrowserTableViewController.h b/MobileSafari/Classes/SPDownloadBrowserTableViewController.h
@@ -1,5 +1,5 @@
 // SPDownloadBrowserTableViewController.h
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownloadBrowserTableViewController.mm b/MobileSafari/Classes/SPDownloadBrowserTableViewController.mm
@@ -1,5 +1,5 @@
 // SPDownloadBrowserTableViewController.mm
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownloadInfo.h b/MobileSafari/Classes/SPDownloadInfo.h
@@ -1,5 +1,5 @@
 // SPDownloadInfo.h
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownloadInfo.mm b/MobileSafari/Classes/SPDownloadInfo.mm
@@ -1,5 +1,5 @@
 // SPDownloadInfo.mm
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownloadListFinishedTableViewCell.h b/MobileSafari/Classes/SPDownloadListFinishedTableViewCell.h
@@ -1,5 +1,5 @@
 // SPDownloadListTableViewCell.h
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownloadListFinishedTableViewCell.mm b/MobileSafari/Classes/SPDownloadListFinishedTableViewCell.mm
@@ -1,5 +1,5 @@
 // SPDownloadListTableViewCell.mm
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownloadListTableViewCell.h b/MobileSafari/Classes/SPDownloadListTableViewCell.h
@@ -1,5 +1,5 @@
 // SPDownloadListTableViewCell.h
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownloadListTableViewCell.mm b/MobileSafari/Classes/SPDownloadListTableViewCell.mm
@@ -1,5 +1,5 @@
 // SPDownloadListTableViewCell.mm
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownloadListTableViewController.h b/MobileSafari/Classes/SPDownloadListTableViewController.h
@@ -1,5 +1,5 @@
 // SPDownloadListTableViewController.h
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownloadListTableViewController.mm b/MobileSafari/Classes/SPDownloadListTableViewController.mm
@@ -1,5 +1,5 @@
 // SPDownloadListTableViewController.mm
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownloadManager.h b/MobileSafari/Classes/SPDownloadManager.h
@@ -1,5 +1,5 @@
 // SPDownloadManager.h
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownloadManager.mm b/MobileSafari/Classes/SPDownloadManager.mm
@@ -1,5 +1,5 @@
 // SPDownloadManager.mm
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -363,9 +363,14 @@ - (void)removeTemporaryFileForResumeData:(NSData*)resumeData
 	dlog(@"removeTemporaryFileForResumeData");
 	dlogDownloadManager();
 
-	NSURL* tmpFileURL = [NSURL fileURLWithPath:[self pathForResumeData:resumeData]];
+	NSString* resumeDataPath = [self pathForResumeData:resumeData];
 
-	[fileManager removeItemAtURL:tmpFileURL error:nil];
+	if(resumeDataPath)
+	{
+		NSURL* tmpFileURL = [NSURL fileURLWithPath:resumeDataPath];
+
+		[fileManager removeItemAtURL:tmpFileURL error:nil];
+	}
 }
 
 - (void)loadDownloadsFromDisk
@@ -874,26 +879,25 @@ - (void)presentDirectoryPickerWithDownloadInfo:(SPDownloadInfo*)downloadInfo
 
 - (void)presentPinnedLocationsWithDownloadInfo:(SPDownloadInfo*)downloadInfo
 {
-	//Get pinned location names & paths
-	NSArray* pinnedLocationNames = [preferenceManager pinnedLocationNames];
-	NSArray* pinnedLocationPaths = [preferenceManager pinnedLocationPaths];
+	//Get pinned locations
+	NSArray* pinnedLocations = preferenceManager.pinnedLocations;
 
 	UIAlertController* pinnedLocationAlert = [UIAlertController
 						  alertControllerWithTitle:[localizationManager
 									    localizedSPStringForKey:@"PINNED_LOCATIONS"] message:nil
 						  preferredStyle:UIAlertControllerStyleActionSheet];
 
-	for(NSString* name in pinnedLocationNames)
+	for(NSDictionary* pinnedLocation in pinnedLocations)
 	{
 		//Add option for each location
-		[pinnedLocationAlert addAction:[UIAlertAction actionWithTitle:name
+		[pinnedLocationAlert addAction:[UIAlertAction actionWithTitle:[pinnedLocation objectForKey:@"name"]
 						style:UIAlertActionStyleDefault handler:^(UIAlertAction * action)
 		{
 			//Get index of tapped action
 			NSInteger index = [pinnedLocationAlert.actions indexOfObject:action];
 
 			//Get URL from index
-			__block NSURL* pathURL = [NSURL fileURLWithPath:[pinnedLocationPaths objectAtIndex:index]];
+			__block NSURL* pathURL = [NSURL fileURLWithPath:[pinnedLocations[index] objectForKey:@"path"]];
 
 			//Alert for filename
 			UIAlertController* filenameAlert = [UIAlertController

diff --git a/MobileSafari/Classes/SPDownloadNavigationController.h b/MobileSafari/Classes/SPDownloadNavigationController.h
@@ -1,5 +1,5 @@
 // SPDownloadNavigationController.h
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownloadNavigationController.mm b/MobileSafari/Classes/SPDownloadNavigationController.mm
@@ -1,5 +1,5 @@
 // SPDownloadNavigationController.mm
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownloadTableViewCell.h b/MobileSafari/Classes/SPDownloadTableViewCell.h
@@ -1,5 +1,5 @@
 // SPDownloadTableViewCell.h
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/MobileSafari/Classes/SPDownloadTableViewCell.mm b/MobileSafari/Classes/SPDownloadTableViewCell.mm
@@ -1,5 +1,5 @@
 // SPDownloadTableViewCell.mm
-// (c) 2019 opa334
+// (c) 2017 - 2019 opa334
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by