Merge branch 'hotfix-1.4.1'

lanayotech · May 12, 2014 · 157b599 · 157b599
2 parents 41618f0 + 41da3d6
commit 157b599
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 24 deletions.
diff --git a/Vagrant Manager/AppDelegate.m b/Vagrant Manager/AppDelegate.m
@@ -811,33 +811,42 @@ - (void)checkForUpdates:(BOOL)displayResult {
                 NSString *currentVersion = [responseObj objectForKey:@"current_version"];
                 NSString *installedVersion = [[[NSBundle mainBundle] infoDictionary] valueForKey:@"CFBundleShortVersionString"];
 
-                NSComparisonResult versionComparison = [Util compareVersion:currentVersion toVersion:installedVersion];
-
-                BOOL updateAvailable = (versionComparison == NSOrderedDescending);
-
-                if(updateAvailable) {
-                    if(![[NSUserDefaults standardUserDefaults] boolForKey:@"dontShowUpdateNotification"]) {
-                        [self updateCheckUpdatesIcon:YES];
-                    }
+                if(downloadURL && currentVersion) {
+                    NSComparisonResult versionComparison = [Util compareVersion:currentVersion toVersion:installedVersion];
 
-                    if(displayResult) {
-                        dispatch_async(dispatch_get_main_queue(), ^{
-                            NSAlert *confirmAlert = [NSAlert alertWithMessageText:[NSString stringWithFormat:@"There is a new version available.\nCurrent Version:  %@\nLatest Version: %@", [[[NSBundle mainBundle] infoDictionary] valueForKey:@"CFBundleShortVersionString"], currentVersion] defaultButton:@"Download Latest Version" alternateButton:@"Cancel" otherButton:nil informativeTextWithFormat:@""];
-                            NSInteger button = [confirmAlert runModal];
-
-                            if(button == NSAlertDefaultReturn) {
-                                [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:downloadURL]];
-                            }
-                        });
+                    BOOL updateAvailable = (versionComparison == NSOrderedDescending);
+
+                    if(updateAvailable) {
+                        if(![[NSUserDefaults standardUserDefaults] boolForKey:@"dontShowUpdateNotification"]) {
+                            [self updateCheckUpdatesIcon:YES];
+                        }
+
+                        if(displayResult) {
+                            dispatch_async(dispatch_get_main_queue(), ^{
+                                NSAlert *confirmAlert = [NSAlert alertWithMessageText:[NSString stringWithFormat:@"There is a new version available.\nCurrent Version:  %@\nLatest Version: %@", [[[NSBundle mainBundle] infoDictionary] valueForKey:@"CFBundleShortVersionString"], currentVersion] defaultButton:@"Download Latest Version" alternateButton:@"Cancel" otherButton:nil informativeTextWithFormat:@""];
+                                NSInteger button = [confirmAlert runModal];
+
+                                if(button == NSAlertDefaultReturn) {
+                                    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:downloadURL]];
+                                }
+                            });
+                        }
+                    } else {
+                        [self updateCheckUpdatesIcon:NO];
+
+                        if(displayResult) {
+                            dispatch_async(dispatch_get_main_queue(), ^{
+                                NSAlert *alert = [NSAlert alertWithMessageText:@"There are no updates available." defaultButton:@"OK" alternateButton:nil otherButton:nil informativeTextWithFormat:@""];
+                                [alert runModal];
+                            });
+                        }
                     }
                 } else {
-                    [self updateCheckUpdatesIcon:NO];
-
                     if(displayResult) {
                         dispatch_async(dispatch_get_main_queue(), ^{
-                            NSAlert *alert = [NSAlert alertWithMessageText:@"There are no updates available." defaultButton:@"OK" alternateButton:nil otherButton:nil informativeTextWithFormat:@""];
-                            [alert runModal];
-                        });
+                            NSAlert *errorAlert = [NSAlert alertWithMessageText:@"There was an error checking for a new version. Please try again later." defaultButton:@"OK" alternateButton:nil otherButton:nil informativeTextWithFormat:@""];
+                            [errorAlert runModal];
+                        });                        
                     }
                 }
             }

diff --git a/Vagrant Manager/Vagrant Manager-Info.plist b/Vagrant Manager/Vagrant Manager-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0</string>
+	<string>1.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>6</string>
 	<key>Configuration</key>
 	<string>${CONFIGURATION}</string>
 	<key>LSApplicationCategoryType</key>