Fix smith and physpuppet being selectable on higher 15 versions despi…

…te being unsupported
opa334 · Feb 21, 2024 · 2379e4b · 2379e4b
1 parent 8a40553
commit 2379e4b
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 27 deletions.
diff --git a/Application/Dopamine/Exploits/badRecovery/Info.plist b/Application/Dopamine/Exploits/badRecovery/Info.plist
@@ -8,10 +8,15 @@
 		<dict>
 			<key>DPFlavorPriority</key>
 			<integer>1000</integer>
-			<key>DPHighestSupported</key>
-			<string>15.4.1</string>
-			<key>DPLowestSupported</key>
-			<string>15.0</string>
+			<key>DPSupportedRanges</key>
+			<array>
+				<dict>
+					<key>Start</key>
+					<string>15.0</string>
+					<key>End</key>
+					<string>15.4.1</string>
+				</dict>
+			</array>
 			<key>DPSupportInclude</key>
 			<array>
 				<dict>

diff --git a/Application/Dopamine/Exploits/dmaFail/Info.plist b/Application/Dopamine/Exploits/dmaFail/Info.plist
@@ -8,10 +8,15 @@
 		<dict>
 			<key>DPFlavorPriority</key>
 			<integer>1000</integer>
-			<key>DPHighestSupported</key>
-			<string>16.5.1</string>
-			<key>DPLowestSupported</key>
-			<string>15.0</string>
+			<key>DPSupportedRanges</key>
+			<array>
+				<dict>
+					<key>Start</key>
+					<string>15.0</string>
+					<key>End</key>
+					<string>16.5.1</string>
+				</dict>
+			</array>
 			<key>DPSupportExclude</key>
 			<array>
 				<dict>

diff --git a/Application/Dopamine/Exploits/kfd/Info.plist b/Application/Dopamine/Exploits/kfd/Info.plist
@@ -8,10 +8,15 @@
 		<dict>
 			<key>DPFlavorPriority</key>
 			<integer>800</integer>
-			<key>DPHighestSupported</key>
-			<string>16.6.1</string>
-			<key>DPLowestSupported</key>
-			<string>15.0</string>
+			<key>DPSupportedRanges</key>
+			<array>
+				<dict>
+					<key>Start</key>
+					<string>15.0</string>
+					<key>End</key>
+					<string>16.6.1</string>
+				</dict>
+			</array>
 			<key>DPSupportExclude</key>
 			<array/>
 			<key>DPSupportInclude</key>
@@ -21,10 +26,21 @@
 		<dict>
 			<key>DPFlavorPriority</key>
 			<integer>1000</integer>
-			<key>DPHighestSupported</key>
-			<string>16.3.1</string>
-			<key>DPLowestSupported</key>
-			<string>15.0</string>
+			<key>DPSupportedRanges</key>
+			<array>
+				<dict>
+					<key>Start</key>
+					<string>15.0</string>
+					<key>End</key>
+					<string>15.7.3</string>
+				</dict>
+				<dict>
+					<key>Start</key>
+					<string>16.0</string>
+					<key>End</key>
+					<string>16.3.1</string>
+				</dict>
+			</array>
 			<key>DPSupportExclude</key>
 			<array/>
 			<key>DPSupportInclude</key>
@@ -34,10 +50,21 @@
 		<dict>
 			<key>DPFlavorPriority</key>
 			<integer>600</integer>
-			<key>DPHighestSupported</key>
-			<string>16.5</string>
-			<key>DPLowestSupported</key>
-			<string>15.0</string>
+			<key>DPSupportedRanges</key>
+			<array>
+				<dict>
+					<key>Start</key>
+					<string>15.0</string>
+					<key>End</key>
+					<string>15.7.6</string>
+				</dict>
+				<dict>
+					<key>Start</key>
+					<string>16.0</string>
+					<key>End</key>
+					<string>16.5</string>
+				</dict>
+			</array>
 			<key>DPSupportExclude</key>
 			<array/>
 			<key>DPSupportInclude</key>

diff --git a/Application/Dopamine/Jailbreak/DOExploit.m b/Application/Dopamine/Jailbreak/DOExploit.m
@@ -116,13 +116,17 @@ - (BOOL)isSupported
         NSString *thisIOSVersion = [[UIDevice currentDevice] systemVersion];
         BOOL isArm64e = [[DOEnvironmentManager sharedManager] isArm64e];
 
-        NSString *highestSupported = _flavorInfo[@"DPHighestSupported"];
-        NSString *lowestSupported = _flavorInfo[@"DPLowestSupported"];
-
-        NSComparisonResult highestResult = [thisIOSVersion compare:highestSupported options:NSNumericSearch];
-        NSComparisonResult lowestResult = [thisIOSVersion compare:lowestSupported options:NSNumericSearch];
-
-        _supported = ((highestResult == NSOrderedAscending || highestResult == NSOrderedSame) && (lowestResult == NSOrderedDescending || lowestResult == NSOrderedSame));
+        NSArray *supportedRanges = _flavorInfo[@"DPSupportedRanges"];
+        for (NSDictionary *supportedRange in supportedRanges) {
+            NSString *rangeStart = supportedRange[@"Start"];
+            NSString *rangeEnd = supportedRange[@"End"];
+
+            NSComparisonResult startResult = [thisIOSVersion compare:rangeStart options:NSNumericSearch];
+            NSComparisonResult endResult = [thisIOSVersion compare:rangeEnd options:NSNumericSearch];
+
+            _supported = ((endResult == NSOrderedAscending || endResult == NSOrderedSame) && (startResult == NSOrderedDescending || startResult == NSOrderedSame));
+            if (_supported) break;
+        }
 
         NSArray *exclusionInclusionSets = _supported ? _flavorInfo[@"DPSupportExclude"] : _flavorInfo[@"DPSupportInclude"];
         if (exclusionInclusionSets) {