Updated dependencies, moved hash to info.plist

Author: insidegui

Apple Events.xcodeproj/project.pbxproj

@@ -6,7 +6,7 @@
 //  Copyright © 2016 Guilherme Rambo. All rights reserved.
 //
 
-#import "EVTChromeCastViewController.h"
+#import "EVTChromecastViewController.h"
 
 @import EventsUI;
 @import ChromeCastCore;

Apple Events/EVTChromecastViewController.m

@@ -6,7 +6,7 @@
 //  Copyright © 2016 Guilherme Rambo. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Cocoa;
 
 @interface EVTEnvironment : NSObject
 

Apple Events/EVTEnvironment.h

@@ -51,7 +51,12 @@ + (instancetype)productionEnvironment
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         prodEnv = [[EVTEnvironment alloc] init];
-        prodEnv.baseURL = [NSURL URLWithString:@"https://itunesevents.apple.com/2216a55d7a4ed438cb6642049ae23cfff369ae9b/data/"];
+
+        NSString *eventHash = [NSBundle mainBundle].infoDictionary[@"EVTCurrentEventHash"];
+        NSString *urlString = [NSString stringWithFormat:@"https://itunesevents.apple.com/%@/data/", eventHash];
+
+        prodEnv.baseURL = [NSURL URLWithString:urlString];
+
         prodEnv.stateCheckInterval = 60.0;
     });
 

Apple Events/EVTEnvironment.m

@@ -15,13 +15,11 @@ @interface EVTEventStateProvider ()
 @property (nonatomic, strong) EVTEnvironment *environment;
 @property (nonatomic, strong) NSURLSession *session;
 @property (nonatomic, strong) NSTimer *timer;
+@property (nonatomic, assign) EVTEventState state;
 
 @end
 
 @implementation EVTEventStateProvider
-{
-    EVTEventState _state;
-}
 
 - (instancetype)initWithEnvironment:(EVTEnvironment *)environment
 {
@@ -70,22 +68,25 @@ - (void)__startMonitoring
 
 - (void)__stateCheck:(NSTimer *)sender
 {
+    __weak typeof(self) weakSelf = self;
+
     [self __fetchStateWithCompletionHandler:^(NSString *stateName) {
         #ifdef DEBUG
             NSLog(@"STATE = %@", stateName);
         #endif
         [self willChangeValueForKey:@"state"];
         if ([stateName isEqualToString:@"PRE"]) {
-            _state = EVTEventStatePre;
+            weakSelf.state = EVTEventStatePre;
         } else if ([stateName isEqualToString:@"LIVE"]) {
-            _state = EVTEventStateLive;
+            weakSelf.state = EVTEventStateLive;
         } else if ([stateName isEqualToString:@"INTERIM"]) {
-            _state = EVTEventStateInterim;
+            weakSelf.state = EVTEventStateInterim;
         } else if ([stateName isEqualToString:@"POST"]) {
-            _state = EVTEventStatePost;
+            weakSelf.state = EVTEventStatePost;
         } else {
             NSLog(@"Unknown event state: %@", stateName);
         }
+        
         [self didChangeValueForKey:@"state"];
     }];
 }

Apple Events/EVTEventStateProvider.m

@@ -177,11 +177,6 @@ - (void)__populateEventsWith:(NSArray <EVTEvent *> *)events
 
 - (void)__showError:(NSError *)error
 {
-    NSDictionary *errorDebugInfo = @{
-                                     @"lang": [[NSLocale currentLocale] objectForKey:NSLocaleLanguageCode],
-                                     @"zone": [NSTimeZone systemTimeZone].name
-                                     };
-    
     [[NSAlert alertWithError:error] beginSheetModalForWindow:self.view.window completionHandler:^(NSModalResponse returnCode) { }];
 }
 

Apple Events/EVTEventsViewController.m

@@ -11,7 +11,7 @@
 #import "EVTEventsViewController.h"
 #import "EVTEvent.h"
 
-#import "EVTChromeCastViewController.h"
+#import "EVTChromecastViewController.h"
 
 @import AVFoundation;
 @import AVKit;

Apple Events/EVTPlayerViewController.m

@@ -20,6 +20,8 @@
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
 	<string>18</string>
+	<key>EVTCurrentEventHash</key>
+	<string>c7c808b8426b5211088e00be67754024e0c3d171</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSAppTransportSecurity</key>

Apple Events/Info.plist

@@ -24,12 +24,11 @@ @interface EVTDockTilePlugIn ()
 
 @property (nonatomic, strong) NSTimer *updateTimer;
 
+@property (nonatomic, strong) NSDockTile *dockTile;
+
 @end
 
 @implementation EVTDockTilePlugIn
-{
-    NSDockTile *_dockTile;
-}
 
 - (instancetype)init
 {
@@ -64,9 +63,11 @@ - (void)setDockTile:(NSDockTile *)dockTile
 - (void)updateIconWithEventImageNamed:(NSString *)imageName
 {
     [[NSUserDefaults standardUserDefaults] setObject:imageName forKey:@"__EVT_currentIdentifier"];
+
+    __weak typeof(self) weakSelf = self;
     [self.imageFetcher fetchImageNamed:imageName completionHandler:^(NSImage *image) {
         self.iconView.eventImage = image;
-        [_dockTile display];
+        [weakSelf.dockTile display];
     }];
 }
 
@@ -81,7 +82,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 {
     if ([keyPath isEqualToString:@"state"]) {
         self.iconView.isLive = (self.stateProvider.state == EVTEventStateLive);
-        [_dockTile display];
+        [self.dockTile display];
     } else {
         [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
     }