Fix bugs in FLEXNetworkHistoryTableViewController

Also, rename it to FLEXNetworkMITMViewController

Classes/ExplorerInterface/FLEXExplorerViewController.m

@@ -17,7 +17,7 @@
 #import "FLEXGlobalsViewController.h"
 #import "FLEXObjectExplorerViewController.h"
 #import "FLEXObjectExplorerFactory.h"
-#import "FLEXNetworkHistoryTableViewController.h"
+#import "FLEXNetworkMITMViewController.h"
 #import "FLEXTabsViewController.h"
 
 static NSString *const kFLEXToolbarTopMarginDefaultsKey = @"com.flex.FLEXToolbar.topMargin";

Classes/GlobalStateExplorers/Globals/FLEXGlobalsViewController.m

@@ -19,7 +19,7 @@
 #import "FLEXGlobalsEntry.h"
 #import "FLEXManager+Private.h"
 #import "FLEXSystemLogTableViewController.h"
-#import "FLEXNetworkHistoryTableViewController.h"
+#import "FLEXNetworkMITMViewController.h"
 #import "FLEXAddressExplorerCoordinator.h"
 #import "FLEXGlobalsSection.h"
 
@@ -68,7 +68,7 @@
         case FLEXGlobalsRowSystemLog:
             return [FLEXSystemLogTableViewController flex_concreteGlobalsEntry:row];
         case FLEXGlobalsRowNetworkHistory:
-            return [FLEXNetworkHistoryTableViewController flex_concreteGlobalsEntry:row];
+            return [FLEXNetworkMITMViewController flex_concreteGlobalsEntry:row];
         case FLEXGlobalsRowKeyWindow:
         case FLEXGlobalsRowRootViewController:
         case FLEXGlobalsRowProcessInfo:

Classes/Manager/FLEXManager+Extensibility.m

@@ -13,7 +13,7 @@
 #import "FLEXObjectExplorerFactory.h"
 #import "FLEXKeyboardShortcutManager.h"
 #import "FLEXExplorerViewController.h"
-#import "FLEXNetworkHistoryTableViewController.h"
+#import "FLEXNetworkMITMViewController.h"
 #import "FLEXKeyboardHelpViewController.h"
 #import "FLEXFileBrowserTableViewController.h"
 
@@ -106,7 +106,7 @@
     } description:@"Toggle move tool"];
     
     [self registerSimulatorShortcutWithKey:@"n" modifiers:0 action:^{
-        [self toggleTopViewControllerOfClass:[FLEXNetworkHistoryTableViewController class]];
+        [self toggleTopViewControllerOfClass:[FLEXNetworkMITMViewController class]];
     } description:@"Toggle network history view"];
     
     // 't' is for testing: quickly present an object explorer for debugging

Classes/Network/FLEXNetworkHistoryTableViewController.h

@@ -1,5 +1,5 @@
 //
-//  FLEXNetworkHistoryTableViewController.h
+//  FLEXNetworkMITMViewController.h
 //  Flipboard
 //
 //  Created by Ryan Olson on 2/8/15.
@@ -9,6 +9,6 @@
 #import "FLEXTableViewController.h"
 #import "FLEXGlobalsEntry.h"
 
-@interface FLEXNetworkHistoryTableViewController : FLEXTableViewController <FLEXGlobalsEntry>
+@interface FLEXNetworkMITMViewController : FLEXTableViewController <FLEXGlobalsEntry>
 
 @end

Classes/Network/FLEXNetworkHistoryTableViewController.m

@@ -1,5 +1,5 @@
 //
-//  FLEXNetworkHistoryTableViewController.m
+//  FLEXNetworkMITMViewController.m
 //  Flipboard
 //
 //  Created by Ryan Olson on 2/8/15.
@@ -8,15 +8,16 @@
 
 #import "FLEXColor.h"
 #import "FLEXUtility.h"
-#import "FLEXNetworkHistoryTableViewController.h"
+#import "FLEXNetworkMITMViewController.h"
 #import "FLEXNetworkTransaction.h"
-#import "FLEXNetworkTransactionTableViewCell.h"
 #import "FLEXNetworkRecorder.h"
-#import "FLEXNetworkTransactionDetailTableViewController.h"
 #import "FLEXNetworkObserver.h"
+#import "FLEXNetworkTransactionTableViewCell.h"
+#import "FLEXNetworkTransactionDetailTableViewController.h"
 #import "FLEXNetworkSettingsTableViewController.h"
+#import "UIBarButtonItem+FLEX.h"
 
-@interface FLEXNetworkHistoryTableViewController ()
+@interface FLEXNetworkMITMViewController ()
 
 /// Backing model
 @property (nonatomic, copy) NSArray<FLEXNetworkTransaction *> *networkTransactions;
@@ -26,10 +27,13 @@
 
 @property (nonatomic) BOOL rowInsertInProgress;
 @property (nonatomic) BOOL isPresentingSearch;
+@property (nonatomic) BOOL pendingReload;
 
 @end
 
-@implementation FLEXNetworkHistoryTableViewController
+@implementation FLEXNetworkMITMViewController
+
+#pragma mark - Initialization
 
 - (id)init {
     self = [super initWithStyle:UITableViewStylePlain];
@@ -52,6 +56,8 @@
     [NSNotificationCenter.defaultCenter removeObserver:self];
 }
 
+#pragma mark - Lifecycle
+
 - (void)viewDidLoad {
     [super viewDidLoad];
 
@@ -67,19 +73,39 @@
     [self updateTransactions];
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    
+    // Reload the table if we received updates while not on-screen
+    if (self.pendingReload) {
+        [self.tableView reloadData];
+        self.pendingReload = NO;
+    }
+}
+
+
+#pragma mark - Private
+
+#pragma mark Button Actions
+
 - (void)settingsButtonTapped:(id)sender {
-    FLEXNetworkSettingsTableViewController *settingsViewController = [FLEXNetworkSettingsTableViewController new];
-    settingsViewController.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(settingsViewControllerDoneTapped:)];
-    settingsViewController.title = @"Network Debugging Settings";
+    UIViewController *settings = [FLEXNetworkSettingsTableViewController new];
+    settings.navigationItem.rightBarButtonItem = FLEXBarButtonItemSystem(
+        Done, self, @selector(settingsViewControllerDoneTapped:)
+    );
+    settings.title = @"Network Debugging Settings";
+    
     // This is not a FLEXNavigationController because it is not intended as a new tab
-    UINavigationController *wrapperNavigationController = [[UINavigationController alloc] initWithRootViewController:settingsViewController];
-    [self presentViewController:wrapperNavigationController animated:YES completion:nil];
+    UIViewController *nav = [[UINavigationController alloc] initWithRootViewController:settings];
+    [self presentViewController:nav animated:YES completion:nil];
 }
 
 - (void)settingsViewControllerDoneTapped:(id)sender {
     [self dismissViewControllerAnimated:YES completion:nil];
 }
 
+#pragma mark Transactions
+
 - (void)updateTransactions {
     self.networkTransactions = [[FLEXNetworkRecorder defaultRecorder] networkTransactions];
 }
@@ -101,9 +127,9 @@
     [self updateFirstSectionHeader];
 }
 
-- (void)setFilteredNetworkTransactions:(NSArray<FLEXNetworkTransaction *> *)filteredNetworkTransactions {
-    if (![_filteredNetworkTransactions isEqual:filteredNetworkTransactions]) {
-        _filteredNetworkTransactions = filteredNetworkTransactions;
+- (void)setFilteredNetworkTransactions:(NSArray<FLEXNetworkTransaction *> *)networkTransactions {
+    if (![_filteredNetworkTransactions isEqual:networkTransactions]) {
+        _filteredNetworkTransactions = networkTransactions;
         [self updateFilteredBytesReceived];
     }
 }
@@ -117,6 +143,8 @@
     [self updateFirstSectionHeader];
 }
 
+#pragma mark Header
+
 - (void)updateFirstSectionHeader {
     UIView *view = [self.tableView headerViewForSection:0];
     if ([view isKindOfClass:[UITableViewHeaderFooterView class]]) {
@@ -147,6 +175,7 @@
     return headerText;
 }
 
+
 #pragma mark - FLEXGlobalsEntry
 
 + (NSString *)globalsEntryTitle:(FLEXGlobalsRow)row {
@@ -157,15 +186,19 @@
     return [self new];
 }
 
+
 #pragma mark - Notification Handlers
 
 - (void)handleNewTransactionRecordedNotification:(NSNotification *)notification {
-    if (self.viewIfLoaded.window) {
-        [self tryUpdateTransactions];
-    }
+    [self tryUpdateTransactions];
 }
 
 - (void)tryUpdateTransactions {
+    // Don't do any updating if we aren't in the view hierarchy
+    if (!self.viewIfLoaded.window) {
+        self.pendingReload = YES;
+        return;
+    }
     // Let the previous row insert animation finish before starting a new one to avoid stomping.
     // We'll try calling the method again when the insertion completes, and we properly no-op if there haven't been changes.
     if (self.rowInsertInProgress) {
@@ -240,6 +273,7 @@
     [self updateFirstSectionHeader];
 }
 
+
 #pragma mark - Table view data source
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
@@ -278,6 +312,7 @@
     [self.navigationController pushViewController:detailViewController animated:YES];
 }
 
+
 #pragma mark - Menu Actions
 
 - (BOOL)tableView:(UITableView *)tableView shouldShowMenuForRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -326,6 +361,7 @@
     return self.searchController.isActive ? self.filteredNetworkTransactions[indexPath.row] : self.networkTransactions[indexPath.row];
 }
 
+
 #pragma mark - Search Bar
 
 - (void)updateSearchResults:(NSString *)searchString {

FLEX.xcodeproj/project.pbxproj

@@ -88,8 +88,8 @@
 		3A4C95331B5B21410088C3F2 /* FLEXSystemLogTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A4C94B11B5B21410088C3F2 /* FLEXSystemLogTableViewCell.m */; };
 		3A4C95341B5B21410088C3F2 /* FLEXSystemLogTableViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A4C94B21B5B21410088C3F2 /* FLEXSystemLogTableViewController.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		3A4C95351B5B21410088C3F2 /* FLEXSystemLogTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A4C94B31B5B21410088C3F2 /* FLEXSystemLogTableViewController.m */; };
-		3A4C95361B5B21410088C3F2 /* FLEXNetworkHistoryTableViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A4C94B51B5B21410088C3F2 /* FLEXNetworkHistoryTableViewController.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		3A4C95371B5B21410088C3F2 /* FLEXNetworkHistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A4C94B61B5B21410088C3F2 /* FLEXNetworkHistoryTableViewController.m */; };
+		3A4C95361B5B21410088C3F2 /* FLEXNetworkMITMViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A4C94B51B5B21410088C3F2 /* FLEXNetworkMITMViewController.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		3A4C95371B5B21410088C3F2 /* FLEXNetworkMITMViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A4C94B61B5B21410088C3F2 /* FLEXNetworkMITMViewController.m */; };
 		3A4C95381B5B21410088C3F2 /* FLEXNetworkRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A4C94B71B5B21410088C3F2 /* FLEXNetworkRecorder.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		3A4C953A1B5B21410088C3F2 /* FLEXNetworkSettingsTableViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A4C94B91B5B21410088C3F2 /* FLEXNetworkSettingsTableViewController.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		3A4C953B1B5B21410088C3F2 /* FLEXNetworkSettingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A4C94BA1B5B21410088C3F2 /* FLEXNetworkSettingsTableViewController.m */; };
@@ -413,8 +413,8 @@
 		3A4C94B11B5B21410088C3F2 /* FLEXSystemLogTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLEXSystemLogTableViewCell.m; sourceTree = "<group>"; };
 		3A4C94B21B5B21410088C3F2 /* FLEXSystemLogTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLEXSystemLogTableViewController.h; sourceTree = "<group>"; };
 		3A4C94B31B5B21410088C3F2 /* FLEXSystemLogTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLEXSystemLogTableViewController.m; sourceTree = "<group>"; };
-		3A4C94B51B5B21410088C3F2 /* FLEXNetworkHistoryTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLEXNetworkHistoryTableViewController.h; sourceTree = "<group>"; };
-		3A4C94B61B5B21410088C3F2 /* FLEXNetworkHistoryTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLEXNetworkHistoryTableViewController.m; sourceTree = "<group>"; };
+		3A4C94B51B5B21410088C3F2 /* FLEXNetworkMITMViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLEXNetworkMITMViewController.h; sourceTree = "<group>"; };
+		3A4C94B61B5B21410088C3F2 /* FLEXNetworkMITMViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLEXNetworkMITMViewController.m; sourceTree = "<group>"; };
 		3A4C94B71B5B21410088C3F2 /* FLEXNetworkRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLEXNetworkRecorder.h; sourceTree = "<group>"; };
 		3A4C94B81B5B21410088C3F2 /* FLEXNetworkRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLEXNetworkRecorder.m; sourceTree = "<group>"; };
 		3A4C94B91B5B21410088C3F2 /* FLEXNetworkSettingsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLEXNetworkSettingsTableViewController.h; sourceTree = "<group>"; };
@@ -882,8 +882,8 @@
 		3A4C94B41B5B21410088C3F2 /* Network */ = {
 			isa = PBXGroup;
 			children = (
-				3A4C94B51B5B21410088C3F2 /* FLEXNetworkHistoryTableViewController.h */,
-				3A4C94B61B5B21410088C3F2 /* FLEXNetworkHistoryTableViewController.m */,
+				3A4C94B51B5B21410088C3F2 /* FLEXNetworkMITMViewController.h */,
+				3A4C94B61B5B21410088C3F2 /* FLEXNetworkMITMViewController.m */,
 				3A4C94B71B5B21410088C3F2 /* FLEXNetworkRecorder.h */,
 				3A4C94B81B5B21410088C3F2 /* FLEXNetworkRecorder.m */,
 				3A4C94B91B5B21410088C3F2 /* FLEXNetworkSettingsTableViewController.h */,
@@ -1307,7 +1307,7 @@
 				C3F646F623A04A7500D4A011 /* FLEXShortcut.h in Headers */,
 				C3531B9D23E69BB200A184AD /* FLEXManager+Networking.h in Headers */,
 				C3878DBB23A749960038FDBE /* FLEXVariableEditorViewController.h in Headers */,
-				3A4C95361B5B21410088C3F2 /* FLEXNetworkHistoryTableViewController.h in Headers */,
+				3A4C95361B5B21410088C3F2 /* FLEXNetworkMITMViewController.h in Headers */,
 				3A4C94DD1B5B21410088C3F2 /* FLEXHeapEnumerator.h in Headers */,
 				C3F527BD2318603F009CBA07 /* FLEXShortcutsSection.h in Headers */,
 				C398626B23AD71C1007E6793 /* TBRuntime.h in Headers */,
@@ -1687,7 +1687,7 @@
 				71E1C2182307FBB800F5032A /* FLEXKeychainTableViewController.m in Sources */,
 				94A5151E1C4CA1F10063292F /* FLEXExplorerViewController.m in Sources */,
 				C398625A23AD6C88007E6793 /* TBToken.m in Sources */,
-				3A4C95371B5B21410088C3F2 /* FLEXNetworkHistoryTableViewController.m in Sources */,
+				3A4C95371B5B21410088C3F2 /* FLEXNetworkMITMViewController.m in Sources */,
 				C3511B9222D7C99E0057BAB7 /* FLEXGlobalsSection.m in Sources */,
 				C32A19632317378C00EB02AC /* FLEXDefaultsContentSection.m in Sources */,
 				C3EE76C022DFC63600EC0AA0 /* FLEXScopeCarousel.m in Sources */,