From 9e5447f1d4e022b21d3d7da4cb6374a21475b88b Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Thu, 6 Jul 2017 13:20:21 -0400
Subject: [PATCH] Respond to CR.

// FREEBIE
---
 Podfile                            | 8 ++++----
 Podfile.lock                       | 2 +-
 Signal/src/UIApplication+OWS.swift | 5 ++---
 Signal/src/util/AppUpdateNag.m     | 2 --
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Podfile b/Podfile
index ea2c74650..f6a3ff716 100644
--- a/Podfile
+++ b/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
diff --git a/Podfile.lock b/Podfile.lock
index afd93a393..a04f35fc8 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -164,6 +164,6 @@ SPEC CHECKSUMS:
   UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
   YapDatabase: cd911121580ff16675f65ad742a9eb0ab4d9e266
 
-PODFILE CHECKSUM: 5a4ab8a8b4bcbf3a032e42a049de98dba8a3c8d2
+PODFILE CHECKSUM: 4a21cd1bb2804a399fe7f9b696bd2f591f1df663
 
 COCOAPODS: 1.2.1
diff --git a/Signal/src/UIApplication+OWS.swift b/Signal/src/UIApplication+OWS.swift
index 90cfc5b24..11c5ad3a8 100644
--- a/Signal/src/UIApplication+OWS.swift
+++ b/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 {
-                let navigationController = viewController as? UINavigationController
-                if let nextViewController = navigationController?.topViewController {
+            } else if let navigationController = viewController as? UINavigationController {
+                if let nextViewController = navigationController.topViewController {
                     viewController = nextViewController
                 } else {
                     break
diff --git a/Signal/src/util/AppUpdateNag.m b/Signal/src/util/AppUpdateNag.m
index 0dad6e976..bec8a5a3f 100644
--- a/Signal/src/util/AppUpdateNag.m
+++ b/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.")];