Merge branch 'release/1.2.8'

ygini · Nov 24, 2016 · 68c4fc7 · 68c4fc7
2 parents 35f5a21 + 71a4136
commit 68c4fc7
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 14 deletions.
diff --git a/package/Hello IT.pkgproj b/package/Hello IT.pkgproj
@@ -593,7 +593,7 @@
 			<key>RELOCATABLE</key>
 			<false/>
 			<key>VERSION</key>
-			<string>1.2.7</string>
+			<string>1.2.8</string>
 		</dict>
 		<key>PROJECT_COMMENTS</key>
 		<dict>

diff --git a/src/HITDevKit/HITDevKit/Info.plist b/src/HITDevKit/HITDevKit/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>133</string>
+	<string>137</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015 Yoann Gini (Open Source Project). All rights reserved.</string>
 	<key>NSPrincipalClass</key>

diff --git a/src/Hello IT/Info.plist b/src/Hello IT/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.7</string>
+	<string>1.2.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>133</string>
+	<string>137</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/src/Plugins/OpenApplication/OpenApplication/Info.plist b/src/Plugins/OpenApplication/OpenApplication/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>133</string>
+	<string>137</string>
 	<key>HITPFunctionIdentifier</key>
 	<string>public.open.application</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/src/Plugins/OpenResource/OpenResource/Info.plist b/src/Plugins/OpenResource/OpenResource/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>133</string>
+	<string>137</string>
 	<key>HITPFunctionIdentifier</key>
 	<string>public.open.resource</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/src/Plugins/Quit/Quit/Info.plist b/src/Plugins/Quit/Quit/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>133</string>
+	<string>137</string>
 	<key>HITPFunctionIdentifier</key>
 	<string>public.quit</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/src/Plugins/ScriptedItem/ScriptedItem/Info.plist b/src/Plugins/ScriptedItem/ScriptedItem/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>133</string>
+	<string>137</string>
 	<key>HITPFunctionIdentifier</key>
 	<string>public.script.item</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/src/Plugins/Separator/Separator/Info.plist b/src/Plugins/Separator/Separator/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>133</string>
+	<string>137</string>
 	<key>HITPFunctionIdentifier</key>
 	<string>public.separator</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/src/Plugins/SubMenu/SubMenu/Info.plist b/src/Plugins/SubMenu/SubMenu/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>133</string>
+	<string>137</string>
 	<key>HITPFunctionIdentifier</key>
 	<string>public.submenu</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/src/Plugins/TestHTTP/TestHTTP/HITPTestHTTP.m b/src/Plugins/TestHTTP/TestHTTP/HITPTestHTTP.m
@@ -15,13 +15,15 @@
 #define kHITPTestHTTPStringToCompare @"originalString"
 #define kHITPTestHTTPMode @"mode"
 #define kHITPTestHTTPTimeout @"timeout"
+#define kHITPTestHTTPIgnoreSystemState @"ignoreSystemState"
 
 @interface HITPTestHTTP ()
 @property NSURL *testPage;
 @property NSString *mode;
 @property NSString *originalString;
 @property NSInteger timeout;
 @property BOOL generalNetworkIsAvailable;
+@property BOOL ignoreSystemState;
 @end
 
 
@@ -35,6 +37,8 @@ - (instancetype)initWithSettings:(NSDictionary*)settings
         _testPage = [NSURL URLWithString:[settings objectForKey:kHITPTestHTTPURL]];
         _mode = [settings objectForKey:kHITPTestHTTPMode];
         _originalString = [settings objectForKey:kHITPTestHTTPStringToCompare];
+
+        _ignoreSystemState = [[settings objectForKey:kHITPTestHTTPIgnoreSystemState] boolValue];
 
         NSNumber *timeout = [settings objectForKey:kHITPTestHTTPTimeout];
         if (timeout) {
@@ -63,7 +67,7 @@ - (void)generalNetworkStateUpdate:(BOOL)state {
 }
 
 -(void)mainAction:(id)sender {
-    if (self.generalNetworkIsAvailable && self.allowedToRun) {
+    if ((self.generalNetworkIsAvailable || self.ignoreSystemState) && self.allowedToRun) {
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
             asl_log(NULL, NULL, ASL_LEVEL_INFO, "Start test request to %s.", [[self.testPage absoluteString] cStringUsingEncoding:NSUTF8StringEncoding]);
 

diff --git a/src/Plugins/TestHTTP/TestHTTP/Info.plist b/src/Plugins/TestHTTP/TestHTTP/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>133</string>
+	<string>137</string>
 	<key>HITPFunctionIdentifier</key>
 	<string>public.test.http</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/src/Plugins/Title/Title/Info.plist b/src/Plugins/Title/Title/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>133</string>
+	<string>137</string>
 	<key>HITPFunctionIdentifier</key>
 	<string>public.title</string>
 	<key>NSHumanReadableCopyright</key>