updates for upcoming version

Much improves update notification, code optimisation
fabulouspanda · Feb 8, 2014 · 6aa5373 · 6aa5373
1 parent 220c383
commit 6aa5373
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 38 deletions.
diff --git a/MacMiner/AppDelegate.h b/MacMiner/AppDelegate.h
@@ -10,7 +10,7 @@
 #import "TaskWrapper.h"
 
 
-@interface AppDelegate : NSObject <NSApplicationDelegate, NSURLAuthenticationChallengeSender, NSURLConnectionDelegate, NSURLConnectionDataDelegate, NSURLConnectionDownloadDelegate>
+@interface AppDelegate : NSObject <NSApplicationDelegate, NSURLAuthenticationChallengeSender, NSURLConnectionDelegate, NSURLConnectionDataDelegate, NSURLConnectionDownloadDelegate, NSUserNotificationCenterDelegate>
 
 
 //@property (assign) IBOutlet NSWindow *window;

diff --git a/MacMiner/AppDelegate.m b/MacMiner/AppDelegate.m
@@ -24,6 +24,38 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
     // Insert code here to initialize your application
 
 
+        [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:self];
+
+    BOOL notificationCenterIsAvailable = (NSClassFromString(@"NSUserNotificationCenter")!=nil);
+
+    if (notificationCenterIsAvailable) {
+        NSString *stringVersion = [NSString stringWithContentsOfURL:[NSURL URLWithString:@"http://downloads.fabulouspanda.co.uk/version.html"]encoding:NSUTF8StringEncoding error:nil];
+
+
+        NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary];
+        //        NSString *appVersion = [infoDict objectForKey:@"CFBundleShortVersionString"]; // example: 1.0.0
+        NSNumber *buildNumber = [infoDict objectForKey:@"CFBundleVersion"];
+        NSString *checkString = [NSString stringWithFormat:@"%@", buildNumber];
+
+        if ([checkString rangeOfString:stringVersion].location == NSNotFound) {
+
+
+
+            NSUserNotification *notification = [[NSUserNotification alloc] init];
+            [notification setTitle:@"Update Available"];
+            NSString *messageText = [NSString stringWithFormat:@"You have version %@, %@ is available", checkString, stringVersion];
+            [notification setInformativeText:messageText];
+            [notification setSoundName:NSUserNotificationDefaultSoundName];
+
+
+            NSUserNotificationCenter *center = [NSUserNotificationCenter defaultUserNotificationCenter];
+            [center scheduleNotification: notification];
+
+        }
+
+    }
+
+
     [[NSApp dockTile] setContentView:self.dockView];
 
         [[NSApp dockTile] display];
@@ -46,6 +78,18 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 }
 
 
+- (void) userNotificationCenter: (NSUserNotificationCenter *) center didActivateNotification: (NSUserNotification *) notification
+	{
+
+ if ([notification activationType] == NSUserNotificationActivationTypeContentsClicked)
+        	    {
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://fabulouspanda.co.uk/macminer/"]];
+        }
+    }
+
+- (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center shouldPresentNotification:(NSUserNotification *)notification{
+    return YES;
+}
 
 // Returns the directory the application uses to store the Core Data store file. This code uses a directory named "fabulouspanda.MacMiner" in the user's Application Support directory.
 - (NSURL *)applicationFilesDirectory
@@ -292,9 +336,11 @@ -(void)mobileCommandsThread {
         NSData *oResponseData = [NSURLConnection sendSynchronousRequest:request2 returningResponse:&responseCode error:&error];
 
         if([responseCode statusCode] != 200){
+        if([responseCode statusCode] != 0){
             NSLog(@"Error getting %@, HTTP status code %li", getString, (long)[responseCode statusCode]);
             //            return nil;
         }
+        }
 
         NSString *responseString = [[NSString alloc] initWithData:oResponseData encoding:NSUTF8StringEncoding];
 
@@ -329,8 +375,10 @@ -(void)mobileCommandsThread {
             NSData *oResponseData3 = [NSURLConnection sendSynchronousRequest:request3 returningResponse:&responseCode3 error:&error3];
 
             if([responseCode3 statusCode] != 200){
+                            if([responseCode3 statusCode] != 0){
                 NSLog(@"Error getting %@, HTTP status code %li", getString, (long)[responseCode statusCode]);
                 //            return nil;
+                            }
             }
             else {
                 //        NSLog(@"DELETE SUCCESS");
@@ -599,4 +647,5 @@ - (NSString *)getDataBetweenFromString:(NSString *)data leftString:(NSString *)l
     else return nil;
 }
 
+
 @end
diff --git a/MacMiner/MacMiner-Info.plist b/MacMiner/MacMiner-Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.12</string>
+	<string>1.5.13</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1512</string>
+	<string>1513</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/MacMiner/asicMiner.m b/MacMiner/asicMiner.m
@@ -45,33 +45,7 @@ - (id)initWithCoder:(NSCoder *)aDecoder
 //        self.minerAddressesArray = [self.prefs objectForKey:@"ipAddress"];
 
 
-        BOOL notificationCenterIsAvailable = (NSClassFromString(@"NSUserNotificationCenter")!=nil);
-
-        if (notificationCenterIsAvailable) {
-        NSString *stringVersion = [NSString stringWithContentsOfURL:[NSURL URLWithString:@"http://downloads.fabulouspanda.co.uk/version.html"]encoding:NSUTF8StringEncoding error:nil];
-
-
-        NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary];
-//        NSString *appVersion = [infoDict objectForKey:@"CFBundleShortVersionString"]; // example: 1.0.0
-        NSNumber *buildNumber = [infoDict objectForKey:@"CFBundleVersion"];
-        NSString *checkString = [NSString stringWithFormat:@"%@", buildNumber];
-
-            if ([checkString rangeOfString:stringVersion].location == NSNotFound) {
-
-
-
-                    NSUserNotification *note = [[NSUserNotification alloc] init];
-                    [note setTitle:@"Update Available"];
-                    [note setInformativeText:@"Please upgrade at http://macminer.net/"];
-
-
-                    NSUserNotificationCenter *center = [NSUserNotificationCenter defaultUserNotificationCenter];
-                    [center scheduleNotification: note];
-
-                }
-
-            }
-
+
     }
 
 
@@ -804,10 +778,15 @@ - (void)toggleTimerFired:(NSTimer*)timer
     if (findTwoRunning == YES) {
         [apiTask stopTask];
         apiTask = nil;
+        findRunning = NO;
     }
-
-    if (findTwoRunning == NO) {
+    else {
 
+        // If the task is still sitting around from the last run, release it
+        if (apiTask!=nil) {
+            apiTask = nil;
+        }
+
         if (self.acceptLabel.tag == 0) {
         self.acceptLabel.tag = 1;
         }

diff --git a/MacMiner/bfgminer.conf b/MacMiner/bfgminer.conf
@@ -15,7 +15,7 @@
 		"user" : "user2",
 		"pass" : "pass2"
 	}
-],
+]
+
 
-"kernel-path" : "/Applications/MacMiner.app/Contents/Resources/bfgminer/bin"
 }
diff --git a/MacMiner/litecoin.conf b/MacMiner/litecoin.conf
@@ -15,7 +15,6 @@
 		"user" : "user2",
 		"pass" : "pass2"
 	}
-],
+]
 
-"kernel-path" : "/Applications/MacMiner.app/Contents/Resources/bfgminer/bin"
 }
diff --git a/MacMiner/nobackup.conf b/MacMiner/nobackup.conf
@@ -5,7 +5,6 @@
 		"user" : "user1",
 		"pass" : "pass1"
 	}
-],
+]
 
-"kernel-path" : "/Applications/MacMiner.app/Contents/Resources/bfgminer/bin"
 }