Merge pull request #29 from MonoHelixLabs/crash-fix

v 1.1.1
MonoHelixLabs · Jul 21, 2017 · d9bbbf1 · d9bbbf1
2 parents 0110ac6 + 52a0c0d
commit d9bbbf1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/DataFeeds-iOS/FeedDetailsViewController.swift b/DataFeeds-iOS/FeedDetailsViewController.swift
@@ -250,11 +250,11 @@ class FeedDetailsViewController: UIViewController, UITableViewDataSource, UITabl
         if self.histItems.count > 0 && indexPath.row < self.histItems.count {
             let histItem:JSON =  JSON(self.histItems[indexPath.row])
 
-            if let timestamp: AnyObject = histItem["created_at"].string! as String as AnyObject {
-                cell!.textLabel?.text = dayTimePeriodFormatterOut.string(from: dayTimePeriodFormatterIn.date(from: timestamp as! String)!)
+            if let timestamp = histItem["created_at"].string {
+                cell!.textLabel?.text = dayTimePeriodFormatterOut.string(from: dayTimePeriodFormatterIn.date(from: timestamp)!)
 
-                if let val: AnyObject = histItem["value"].string! as String as AnyObject {
-                    cell!.textLabel?.text = (cell!.textLabel?.text)! + "\t\t" + (val as! String)
+                if let val = histItem["value"].string {
+                    cell!.textLabel?.text = (cell!.textLabel?.text)! + "\t\t" + val
                     cell!.textLabel!.isEnabled = true
                 }
 

diff --git a/DataFeeds-iOS/Info.plist b/DataFeeds-iOS/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1</string>
+	<string>1.1.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/DataFeeds-iOS/RefreshRateViewController.swift b/DataFeeds-iOS/RefreshRateViewController.swift
@@ -43,11 +43,11 @@ class RefreshRateViewController: UIViewController {
         UserDefaultsManager.sharedInstance.setRefreshRateDetailsFeed(sender.selectedSegmentIndex)
     }
     #else
-    @IBAction func onMainFeedRefreshRateChanged(sender: UISegmentedControl) {
+    @IBAction func onMainFeedRefreshRateChanged(_ sender: UISegmentedControl) {
 
         UserDefaultsManager.sharedInstance.setRefreshRateMainFeed(sender.selectedSegmentIndex)
     }
-    @IBAction func onFeedDetailsRefreshRateChanged(sender: UISegmentedControl) {
+    @IBAction func onFeedDetailsRefreshRateChanged(_ sender: UISegmentedControl) {
 
         UserDefaultsManager.sharedInstance.setRefreshRateDetailsFeed(sender.selectedSegmentIndex)
     }

diff --git a/DataFeeds-iOS/ViewController.swift b/DataFeeds-iOS/ViewController.swift
@@ -124,7 +124,7 @@ class ViewController: UIViewController, UITableViewDataSource, UITableViewDelega
                 let feeds: JSON = json
                 if feeds.count > 0 {
                     for (_, subJson) in feeds {
-                        if let feed: AnyObject = subJson.object as AnyObject {
+                        if let feed: AnyObject = subJson.object as AnyObject{
                             self.items.add(feed)
                             self.items.sort(using: [NSSortDescriptor(key: "name", ascending: true)])
                             if (self.items.count != 0) {
@@ -169,20 +169,20 @@ class ViewController: UIViewController, UITableViewDataSource, UITableViewDelega
 
             let imgPrefs = UserDefaultsManager.sharedInstance.getImagesPreferences()
 
-            if let feedname: AnyObject = feed["name"].string as AnyObject {
+            if let feedname = feed["name"].string {
 
                 cell!.accessoryType = .disclosureIndicator
 
-                if let feedkey: AnyObject = feed["key"].string as AnyObject {
-                    if let val = imgPrefs[feedkey as! String] {
+                if let feedkey = feed["key"].string {
+                    if let val = imgPrefs[feedkey] {
                         cell!.imageView!.image = getImageFromText(val)
                     }
                     else {
                         cell!.imageView!.image = getImageFromText(defaultEmoji)
                     }
                 }
 
-                cell!.textLabel?.text = (feedname as! String)
+                cell!.textLabel?.text = (feedname)
 
                 if let feedvalue = feed["last_value"].string {
                     cell!.textLabel?.text = (cell!.textLabel?.text)! + ": " + feedvalue
@@ -191,8 +191,8 @@ class ViewController: UIViewController, UITableViewDataSource, UITableViewDelega
             }
             else {
                 cell!.imageView!.image = getImageFromText(warningEmoji)
-                if let error: AnyObject = feed.string as AnyObject {
-                    cell!.textLabel?.text = "Connection problem: " + (error as! String)
+                if let error = feed.string {
+                    cell!.textLabel?.text = "Connection problem: " + error
                 }
                 else {
                     cell!.textLabel?.text = "Connection problem."
@@ -225,11 +225,11 @@ class ViewController: UIViewController, UITableViewDataSource, UITableViewDelega
 
         let feed:JSON =  JSON(self.items[indexPath.row])
 
-        if let feedname: AnyObject = feed["name"].string as AnyObject {
-            selectedFeedName = feedname as! String
+        if let feedname = feed["name"].string {
+            selectedFeedName = feedname
 
-            if let feedkey: AnyObject = feed["key"].string as AnyObject {
-                selectedFeedKey = feedkey as! String
+            if let feedkey = feed["key"].string {
+                selectedFeedKey = feedkey
             }
 
             performSegue(withIdentifier: "tableCellDetails", sender: self)

diff --git a/DataFeeds-tvOS/Info.plist b/DataFeeds-tvOS/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1</string>
+	<string>1.1.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>

diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/Paula.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/Paula.xcuserdatad/UserInterfaceState.xcuserstate