Respond to CR.

// FREEBIE

Podfile

@@ -2,16 +2,16 @@ platform :ios, '8.0'
 source 'https://github.com/CocoaPods/Specs.git'
 
 target 'Signal' do
-    pod 'SocketRocket',               :git => 'https://github.com/facebook/SocketRocket.git'
+    pod 'ATAppUpdater'
     pod 'AxolotlKit',                 git: 'https://github.com/WhisperSystems/SignalProtocolKit.git'
     #pod 'AxolotlKit',                 path: '../SignalProtocolKit'
-    pod 'ATAppUpdater'
-    pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
-    #pod 'SignalServiceKit',           path: '../SignalServiceKit'
     pod 'JSQMessagesViewController',  git: 'https://github.com/WhisperSystems/JSQMessagesViewController.git', branch: 'mkirk/retain-keyboard-view'
     #pod 'JSQMessagesViewController',   path: '../JSQMessagesViewController'
     pod 'PureLayout'
     pod 'Reachability'
+    pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
+    #pod 'SignalServiceKit',           path: '../SignalServiceKit'
+    pod 'SocketRocket',               :git => 'https://github.com/facebook/SocketRocket.git'
     target 'SignalTests' do
         inherit! :search_paths
     end

Podfile.lock

@@ -164,6 +164,6 @@ SPEC CHECKSUMS:
   UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
   YapDatabase: cd911121580ff16675f65ad742a9eb0ab4d9e266
 
-PODFILE CHECKSUM: 5a4ab8a8b4bcbf3a032e42a049de98dba8a3c8d2
+PODFILE CHECKSUM: 4a21cd1bb2804a399fe7f9b696bd2f591f1df663
 
 COCOAPODS: 1.2.1

Signal/src/UIApplication+OWS.swift

@@ -13,9 +13,8 @@ extension UIApplication {
         while true {
             if let nextViewController = viewController?.presentedViewController {
                 viewController = nextViewController
-            } else if viewController is UINavigationController {
+            } else if let navigationController = viewController as? UINavigationController {
-                let navigationController = viewController as? UINavigationController
+                if let nextViewController = navigationController.topViewController {
-                if let nextViewController = navigationController?.topViewController {
                     viewController = nextViewController
                 } else {
                     break

Signal/src/util/AppUpdateNag.m

@@ -79,8 +79,6 @@ NSString *const TSStorageManagerAppUpgradeNagDate = @"TSStorageManagerAppUpgrade
         return;
     }
 
-    // NOTE: The iTunes app store API exposes "short" version numbers, so
-    // it isn't possible to nag about hotfix releases.
     ATAppUpdater *updater = [ATAppUpdater sharedUpdater];
     [updater setAlertTitle:NSLocalizedString(
                                @"APP_UPDATE_NAG_ALERT_TITLE", @"Title for the 'new app version available' alert.")];