Auto Shutdown MAC

getappbox · Sep 7, 2016 · 34659bc · 34659bc
1 parent 121ad58
commit 34659bc
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/AppBox/Common/Common.h b/AppBox/Common/Common.h
@@ -11,6 +11,7 @@
 
 @interface Common : NSObject
 
++ (void)shutdownSystem;
 + (NSString*)generateUUID;
 + (NSModalResponse)showAlertWithTitle:(NSString *)title andMessage:(NSString *)message;
 + (void)showLocalNotificationWithTitle:(NSString *)title andMessage:(NSString *)message;

diff --git a/AppBox/Common/Common.m b/AppBox/Common/Common.m
@@ -12,11 +12,13 @@ @implementation Common
 
 + (NSString*)generateUUID {
     NSMutableData *data = [NSMutableData dataWithLength:32];
-    int result = SecRandomCopyBytes(NULL, 32, data.mutableBytes);
-    NSAssert(result == 0, @"Error generating random bytes: %d", errno);
-    NSString *base64EncodedData = [data base64EncodedStringWithOptions:0];
-    base64EncodedData = [base64EncodedData stringByReplacingOccurrencesOfString:@"/" withString:@""];
-    return base64EncodedData;
+    if (((NSInteger *)SecRandomCopyBytes(NULL, 32, data.mutableBytes)) == 0){
+        return @"";
+    }else{
+        NSString *base64EncodedData = [data base64EncodedStringWithOptions:0];
+        base64EncodedData = [base64EncodedData stringByReplacingOccurrencesOfString:@"/" withString:@""];
+        return base64EncodedData;
+    }
 }
 
 #pragma mark - Notifications
@@ -60,4 +62,15 @@ + (void)sendEmailToAddress:(NSString *)address withSubject:(NSString *)subject a
     [emailScript executeAndReturnError:nil];
     NSLog(@"Message passed to Mail");
 }
+
+#pragma mark - Handle System
++ (void)shutdownSystem{
+    NSString *scriptAction = @"shut down"; // @"restart"/@"shut down"/@"sleep"/@"log out"
+    NSString *scriptSource = [NSString stringWithFormat:@"tell application \"Finder\" to %@", scriptAction];
+    NSAppleScript *appleScript = [[NSAppleScript alloc] initWithSource:scriptSource];
+    NSDictionary *errDict = nil;
+    if (![appleScript executeAndReturnError:&errDict]) {
+        NSLog(@"%@", errDict);
+    }
+}
 @end
diff --git a/AppBox/Info.plist b/AppBox/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2</string>
+	<string>0.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/AppBox/ViewController/HomeViewController/HomeViewController.m b/AppBox/ViewController/HomeViewController/HomeViewController.m
@@ -160,9 +160,15 @@ -(void)restClient:(DBRestClient *)restClient loadedSharableLink:(NSString *)link
             if (textFieldEmail.stringValue.length > 0) {
                 [Common sendEmailToAddress:textFieldEmail.stringValue withSubject:textFieldEmailSubject.stringValue andBody:[NSString stringWithFormat:@"%@\n\n%@\n\n---\n%@",textViewEmailContent.string,shortURL.absoluteString,@"Build generated and distributed by AppBox - http://bit.ly/GetAppBox"]];
             }
-            dispatch_async(dispatch_get_main_queue(), ^{
-                [self performSegueWithIdentifier:@"ShowLink" sender:self];
-            });
+            if (buttonShutdownMac.state == NSOffState){
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [self performSegueWithIdentifier:@"ShowLink" sender:self];
+                });
+            }else{
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(600 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    [Common shutdownSystem];
+                });
+            }
             [self progressCompletedViewState];
         }];
     }