Merge pull request #17 from rajabishek/master

Removes redundant addition of adding the block to run on the background thread
analogcode · Mar 16, 2016 · d32ff79 · d32ff79
2 parents 7bcbdee + 1c012fa
commit d32ff79
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/SwiftRadio/DataManager.swift b/SwiftRadio/DataManager.swift
@@ -37,16 +37,16 @@ class DataManager {
 
     class func getDataFromFileWithSuccess(success: (data: NSData) -> Void) {
 
-        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)) {
-
-            let filePath = NSBundle.mainBundle().pathForResource("stations", ofType:"json")
+        if let filePath = NSBundle.mainBundle().pathForResource("stations", ofType:"json") {
             do {
-                let data = try NSData(contentsOfFile:filePath!,
+                let data = try NSData(contentsOfFile:filePath,
                     options: NSDataReadingOptions.DataReadingUncached)
                 success(data: data)
             } catch {
                 fatalError()
             }
+        } else {
+            print("The local JSON file could not be found")
         }
     }
 

diff --git a/SwiftRadio/StationsViewController.swift b/SwiftRadio/StationsViewController.swift
@@ -121,7 +121,7 @@ class StationsViewController: UIViewController {
 
     func setupPullToRefresh() {
         self.refreshControl = UIRefreshControl()
-        self.refreshControl.attributedTitle = NSAttributedString(string: "Pull to refresh")
+        self.refreshControl.attributedTitle = NSAttributedString(string: "Pull to refresh", attributes: [NSForegroundColorAttributeName:UIColor.whiteColor()])
         self.refreshControl.backgroundColor = UIColor.blackColor()
         self.refreshControl.tintColor = UIColor.whiteColor()
         self.refreshControl.addTarget(self, action: "refresh:", forControlEvents: UIControlEvents.ValueChanged)