Update MBProgressHUD with the crash fix

nimothy · Feb 25, 2019 · 4eb9e81 · 4eb9e81
1 parent 719c339
commit 4eb9e81
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "Frameworks/UICKeyChainStore"]
 	path = Frameworks/UICKeyChainStore
 	url = https://github.com/kishikawakatsumi/UICKeyChainStore.git
-[submodule "Frameworks/MBProgressHUD"]
-	path = Frameworks/MBProgressHUD
-	url = https://github.com/jdg/MBProgressHUD.git
 [submodule "Frameworks/PasscodeLock"]
 	path = Frameworks/PasscodeLock
 	url = https://github.com/blinksh/SwiftPasscodeLock.git
 [submodule "Frameworks/ios_system"]
 	path = Frameworks/ios_system
 	url = https://github.com/holzschu/ios_system.git
+[submodule "Frameworks/MBProgressHUD"]
+	path = Frameworks/MBProgressHUD
+	url = https://github.com/blinksh/MBProgressHUD.git
diff --git a/Blink.xcodeproj/project.pbxproj b/Blink.xcodeproj/project.pbxproj
@@ -19,8 +19,6 @@
 		0732F0D11D062BB400AB5438 /* openssl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0732F0841D062BB300AB5438 /* openssl.framework */; };
 		0732F11E1D062DDB00AB5438 /* UICKeyChainStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0732F1171D062CA000AB5438 /* UICKeyChainStore.framework */; };
 		0732F11F1D062DDB00AB5438 /* UICKeyChainStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0732F1171D062CA000AB5438 /* UICKeyChainStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		0732F1221D062DDB00AB5438 /* MBProgressHUD.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0732F10D1D062BF700AB5438 /* MBProgressHUD.framework */; };
-		0732F1231D062DDB00AB5438 /* MBProgressHUD.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0732F10D1D062BF700AB5438 /* MBProgressHUD.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		0732F1271D06323A00AB5438 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0732F1261D06323A00AB5438 /* libz.tbd */; };
 		0732F1291D06324200AB5438 /* libcurses.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0732F1281D06324200AB5438 /* libcurses.tbd */; };
 		073D26BC1DC4137000965AB2 /* SKButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 073D26B21DC4137000965AB2 /* SKButton.m */; };
@@ -157,6 +155,8 @@
 		D240806120BC8DF800F30099 /* tool_main.c in Sources */ = {isa = PBXBuildFile; fileRef = D240806020BC8DF800F30099 /* tool_main.c */; settings = {COMPILER_FLAGS = "-DHAVE_CONFIG_H -I Frameworks/ios_system/curl/curl/include/ -I Frameworks/ios_system/curl/curl/lib/ -I Frameworks/ios_system/curl/config_iphone/ -DBUILDING_LIBCURL -I Settings/Model/ -I Frameworks/libssh2.framework/Headers/ -DBLINKSHELL -I Frameworks/ios_system/"; }; };
 		D2496F3F20038B3300E75FE9 /* hterm_all.min.js in Resources */ = {isa = PBXBuildFile; fileRef = D2496F3B20038B3300E75FE9 /* hterm_all.min.js */; };
 		D2496F412003941B00E75FE9 /* term.js in Resources */ = {isa = PBXBuildFile; fileRef = D2496F402003941B00E75FE9 /* term.js */; };
+		D24AFD58222410E700CFD3C1 /* MBProgressHUD.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0732F10D1D062BF700AB5438 /* MBProgressHUD.framework */; };
+		D24AFD59222410E700CFD3C1 /* MBProgressHUD.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0732F10D1D062BF700AB5438 /* MBProgressHUD.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D24D18C921D4CFB200239C9D /* KeyInput.m in Sources */ = {isa = PBXBuildFile; fileRef = D24D18C821D4CFB200239C9D /* KeyInput.m */; };
 		D2512AC520BD4C3000A80257 /* curl_ios_static.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2E4F92E20B2BB4500B30F7B /* curl_ios_static.framework */; };
 		D263489820BEBFE000A8E89F /* libsshd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D263489720BEBFE000A8E89F /* libsshd.a */; };
@@ -270,20 +270,20 @@
 			remoteGlobalIDString = 14796A461C1CD9A500169D09;
 			remoteInfo = UICKeyChainStore;
 		};
-		0732F1241D062DDC00AB5438 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0732F1051D062BF700AB5438 /* MBProgressHUD.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 1D104D791ACA36CC00973364;
-			remoteInfo = "MBProgressHUD Framework";
-		};
 		0747D63D2018182D00CF8F0C /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0732F1101D062C9F00AB5438 /* UICKeyChainStore.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 148993CF1D8F2515000132F7;
 			remoteInfo = TestHost;
 		};
+		D24AFD5A222410E700CFD3C1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0732F1051D062BF700AB5438 /* MBProgressHUD.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 1D104D791ACA36CC00973364;
+			remoteInfo = "MBProgressHUD Framework";
+		};
 		D2A3F4DC206909A8006BB305 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0732F1051D062BF700AB5438 /* MBProgressHUD.xcodeproj */;
@@ -315,11 +315,11 @@
 			dstSubfolderSpec = 10;
 			files = (
 				22A9494B2067FD5E003A0666 /* files.framework in Embed Frameworks */,
+				D24AFD59222410E700CFD3C1 /* MBProgressHUD.framework in Embed Frameworks */,
 				D2A3F4FC20690D08006BB305 /* shell.framework in Embed Frameworks */,
 				22A9494C2067FD5E003A0666 /* tar.framework in Embed Frameworks */,
 				22E1F3352036EE87001FCC5C /* openssl.framework in Embed Frameworks */,
 				22E1F3362036EE87001FCC5C /* libssh2.framework in Embed Frameworks */,
-				0732F1231D062DDB00AB5438 /* MBProgressHUD.framework in Embed Frameworks */,
 				D2A3F4F820690CB0006BB305 /* awk.framework in Embed Frameworks */,
 				D2A3F50020690D44006BB305 /* network_ios.framework in Embed Frameworks */,
 				0732F11F1D062DDB00AB5438 /* UICKeyChainStore.framework in Embed Frameworks */,
@@ -689,13 +689,13 @@
 				076FBD521DB6BE1D00F6D997 /* libprotobuf.a in Frameworks */,
 				0732F11E1D062DDB00AB5438 /* UICKeyChainStore.framework in Frameworks */,
 				D2A3F4EC20690B71006BB305 /* shell.framework in Frameworks */,
+				D24AFD58222410E700CFD3C1 /* MBProgressHUD.framework in Frameworks */,
 				D2A3F4F020690B71006BB305 /* tar.framework in Frameworks */,
 				D2A3F50320690D7E006BB305 /* ssh_cmd.framework in Frameworks */,
 				B700AED81DD0F2C200100EBF /* CloudKit.framework in Frameworks */,
 				D2A3F4EA20690B71006BB305 /* text.framework in Frameworks */,
 				D2A3F4F620690C24006BB305 /* awk.framework in Frameworks */,
 				D263489820BEBFE000A8E89F /* libsshd.a in Frameworks */,
-				0732F1221D062DDB00AB5438 /* MBProgressHUD.framework in Frameworks */,
 				0732F0D11D062BB400AB5438 /* openssl.framework in Frameworks */,
 				0732F0BE1D062BB400AB5438 /* libssh2.framework in Frameworks */,
 				076FBD501DB6BD9400F6D997 /* libmoshios.framework in Frameworks */,
@@ -1421,7 +1421,7 @@
 			);
 			dependencies = (
 				0732F1211D062DDB00AB5438 /* PBXTargetDependency */,
-				0732F1251D062DDC00AB5438 /* PBXTargetDependency */,
+				D24AFD5B222410E700CFD3C1 /* PBXTargetDependency */,
 			);
 			name = Blink;
 			productName = Blink;
@@ -1812,10 +1812,10 @@
 			name = UICKeyChainStore;
 			targetProxy = 0732F1201D062DDB00AB5438 /* PBXContainerItemProxy */;
 		};
-		0732F1251D062DDC00AB5438 /* PBXTargetDependency */ = {
+		D24AFD5B222410E700CFD3C1 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = "MBProgressHUD Framework";
-			targetProxy = 0732F1241D062DDC00AB5438 /* PBXContainerItemProxy */;
+			targetProxy = D24AFD5A222410E700CFD3C1 /* PBXContainerItemProxy */;
 		};
 		EA0BA1A61C0CC57B00719C1A /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;

diff --git a/Blink/SpaceController.m b/Blink/SpaceController.m
@@ -448,7 +448,6 @@ - (void)_toggleMusicHUD
   [_hud hideAnimated:NO];
 
   _musicHUD = [MBProgressHUD showHUDAddedTo:_touchOverlay animated:YES];
-  _musicHUD.defaultMotionEffectsEnabled = NO; // Do not use core motion
   _musicHUD.mode = MBProgressHUDModeCustomView;
   _musicHUD.bezelView.style = MBProgressHUDBackgroundStyleSolidColor;
   _musicHUD.bezelView.color = [UIColor clearColor];
@@ -481,7 +480,6 @@ - (void)_displayHUD
   }
 
   _hud = [MBProgressHUD showHUDAddedTo:_touchOverlay animated:_hud == nil];
-  _hud.defaultMotionEffectsEnabled = NO; // Do not use core motion
   _hud.mode = MBProgressHUDModeCustomView;
   _hud.bezelView.color = [UIColor darkGrayColor];
   _hud.contentColor = [UIColor whiteColor];

diff --git a/Frameworks/MBProgressHUD b/Frameworks/MBProgressHUD
+7 −1		Demo/HudDemo.xcodeproj/project.pbxproj
+1 −3		Demo/HudDemo.xcodeproj/xcshareddata/xcschemes/HudDemo.xcscheme
+1 −3		Demo/HudDemo.xcodeproj/xcshareddata/xcschemes/HudDemoTV.xcscheme
+1 −3		Demo/HudDemo.xcodeproj/xcshareddata/xcschemes/HudTests.xcscheme
+44 −2		Demo/HudTests/HudTests.m
+1 −5		MBProgressHUD.h
+32 −121		MBProgressHUD.m
+3 −3		MBProgressHUD.podspec
+5 −1		MBProgressHUD.xcodeproj/project.pbxproj
+1 −1		MBProgressHUD.xcodeproj/xcshareddata/xcschemes/MBProgressHUD Framework tvOS.xcscheme
+1 −3		MBProgressHUD.xcodeproj/xcshareddata/xcschemes/MBProgressHUD Framework.xcscheme
+1 −3		MBProgressHUD.xcodeproj/xcshareddata/xcschemes/MBProgressHUD.xcscheme
+8 −0		MBProgressHUD.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist