Fix image mount error for iOS 14.0 (needs testing)

Schlaubischlump · Sep 18, 2020 · 70a1697 · 70a1697
1 parent 4d1a394
commit 70a1697
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 6 deletions.
diff --git a/LocationSimulator/DeveloperDiskImages.plist b/LocationSimulator/DeveloperDiskImages.plist
@@ -105,11 +105,55 @@
 	<dict>
 		<key>Image</key>
 		<array>
-			<string>https://github.com/pdfun/DeveloperDiskImage/raw/master/12.4%20(16G73)/DeveloperDiskImage.dmg</string>
+			<string>https://github.com/pdso/DeveloperDiskImage/raw/master/12.4/DeveloperDiskImage.dmg</string>
 		</array>
 		<key>Signature</key>
 		<array>
-			<string>https://github.com/pdfun/DeveloperDiskImage/raw/master/12.4%20(16G73)/DeveloperDiskImage.dmg.signature</string>
+			<string>https://github.com/pdso/DeveloperDiskImage/raw/master/12.4/DeveloperDiskImage.dmg.signature</string>
+		</array>
+	</dict>
+	<key>12.5</key>
+	<dict>
+		<key>Image</key>
+		<array>
+			<string>https://github.com/pdso/DeveloperDiskImage/raw/master/12.4/DeveloperDiskImage.dmg</string>
+		</array>
+		<key>Signature</key>
+		<array>
+			<string>https://github.com/pdso/DeveloperDiskImage/raw/master/12.4/DeveloperDiskImage.dmg.signature</string>
+		</array>
+	</dict>
+	<key>12.6</key>
+	<dict>
+		<key>Image</key>
+		<array>
+			<string>https://github.com/pdso/DeveloperDiskImage/raw/master/12.4/DeveloperDiskImage.dmg</string>
+		</array>
+		<key>Signature</key>
+		<array>
+			<string>https://github.com/pdso/DeveloperDiskImage/raw/master/12.4/DeveloperDiskImage.dmg.signature</string>
+		</array>
+	</dict>
+	<key>12.7</key>
+	<dict>
+		<key>Image</key>
+		<array>
+			<string>https://github.com/pdso/DeveloperDiskImage/raw/master/12.4/DeveloperDiskImage.dmg</string>
+		</array>
+		<key>Signature</key>
+		<array>
+			<string>https://github.com/pdso/DeveloperDiskImage/raw/master/12.4/DeveloperDiskImage.dmg.signature</string>
+		</array>
+	</dict>
+	<key>12.8</key>
+	<dict>
+		<key>Image</key>
+		<array>
+			<string>https://github.com/pdso/DeveloperDiskImage/raw/master/12.4/DeveloperDiskImage.dmg</string>
+		</array>
+		<key>Signature</key>
+		<array>
+			<string>https://github.com/pdso/DeveloperDiskImage/raw/master/12.4/DeveloperDiskImage.dmg.signature</string>
 		</array>
 	</dict>
 	<key>13.0</key>

diff --git a/LocationSimulator/Info.plist b/LocationSimulator/Info.plist
@@ -17,15 +17,15 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.2</string>
+	<string>0.1.3</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2019 David Klopp. All rights reserved.</string>
+	<string>Copyright © 2020 David Klopp. All rights reserved.</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>

diff --git a/LocationSimulator/mobiledevice/devicemount/deviceimagemounter.c b/LocationSimulator/mobiledevice/devicemount/deviceimagemounter.c
@@ -78,8 +78,13 @@ bool developerImageIsMountedForDevice(const char *udid) {
         plist_dict_next_item(result, it, &key, &subnode);
         while (subnode)
         {
-            // if we find the ImageSignature key in the returned plist we can stop
-            res = (strcmp(key, "ImageSignature") == 0);
+            // If the ImageSignature key in the returned plist contains a subentry the disk image is already uploaded.
+            // Hopefully this works for older iOS versions as well.
+            plist_type type = plist_get_node_type(subnode);
+            if (strcmp(key, "ImageSignature") == 0 && PLIST_ARRAY == type) {
+                res = (plist_array_get_size(subnode) != 0);
+            }
+
             free(key);
             key = NULL;
             if (res) break;