Clean up FLEXObjcInternal.mm

Previously, it assumed any address you gave it was valid and readable. It no longer makes this assumption.

Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontsPickerView.h

@@ -1,6 +1,6 @@
 //
 //  FLEXArgumentInputFontsPickerView.h
-//  UICatalog
+//  FLEX
 //
 //  Created by 啟倫 陳 on 2014/7/27.
 //  Copyright (c) 2014年 f. All rights reserved.

Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontsPickerView.m

@@ -1,6 +1,6 @@
 //
 //  FLEXArgumentInputFontsPickerView.m
-//  UICatalog
+//  FLEX
 //
 //  Created by 啟倫 陳 on 2014/7/27.
 //  Copyright (c) 2014年 f. All rights reserved.

Classes/Editing/ArgumentInputViews/FLEXArgumentInputJSONObjectView.h

@@ -8,6 +8,7 @@
 
 #import "FLEXArgumentInputTextView.h"
 
+// #warning TODO This is never supported
 @interface FLEXArgumentInputJSONObjectView : FLEXArgumentInputTextView
 
 @end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputViewFactory.m

@@ -39,26 +39,23 @@
 + (Class)argumentInputViewSubclassForTypeEncoding:(const char *)typeEncoding currentValue:(id)currentValue
 {
     Class argumentInputViewSubclass = nil;
+    NSArray<Class> *inputViewClasses = @[[FLEXArgumentInputColorView class],
+                                         [FLEXArgumentInputFontView class],
+                                         [FLEXArgumentInputStringView class],
+                                         [FLEXArgumentInputStructView class],
+                                         [FLEXArgumentInputSwitchView class],
+                                         [FLEXArgumentInputDateView class],
+                                         [FLEXArgumentInputNumberView class],
+                                         [FLEXArgumentInputJSONObjectView class]];
     
     // Note that order is important here since multiple subclasses may support the same type.
     // An example is the number subclass and the bool subclass for the type @encode(BOOL).
     // Both work, but we'd prefer to use the bool subclass.
-    if ([FLEXArgumentInputColorView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
-        argumentInputViewSubclass = [FLEXArgumentInputColorView class];
-    } else if ([FLEXArgumentInputFontView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
-        argumentInputViewSubclass = [FLEXArgumentInputFontView class];
-    } else if ([FLEXArgumentInputStringView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
-        argumentInputViewSubclass = [FLEXArgumentInputStringView class];
-    } else if ([FLEXArgumentInputStructView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
-        argumentInputViewSubclass = [FLEXArgumentInputStructView class];
-    } else if ([FLEXArgumentInputSwitchView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
-        argumentInputViewSubclass = [FLEXArgumentInputSwitchView class];
-    } else if ([FLEXArgumentInputDateView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
-        argumentInputViewSubclass = [FLEXArgumentInputDateView class];
-    } else if ([FLEXArgumentInputNumberView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
-        argumentInputViewSubclass = [FLEXArgumentInputNumberView class];
-    } else if ([FLEXArgumentInputJSONObjectView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
-        argumentInputViewSubclass = [FLEXArgumentInputJSONObjectView class];
+    for (Class inputView in inputViewClasses) {
+        if ([inputView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
+            argumentInputViewSubclass = inputView;
+            break;
+        }
     }
     
     return argumentInputViewSubclass;

Classes/Editing/FLEXDefaultEditorViewController.h

@@ -6,9 +6,9 @@
 //  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
-#import "FLEXFieldEditorViewController.h"
+#import "FLEXMutableFieldEditorViewController.h"
 
-@interface FLEXDefaultEditorViewController : FLEXFieldEditorViewController
+@interface FLEXDefaultEditorViewController : FLEXMutableFieldEditorViewController
 
 - (id)initWithDefaults:(NSUserDefaults *)defaults key:(NSString *)key;
 

Classes/Editing/FLEXDefaultEditorViewController.m

@@ -64,6 +64,13 @@
     self.firstInputView.inputValue = [self.defaults objectForKey:self.key];
 }
 
+- (void)getterButtonPressed:(id)sender
+{
+    [super getterButtonPressed:sender];
+    id returnedObject = [self.defaults objectForKey:self.key];
+    [self exploreObjectOrPopViewController:returnedObject];
+}
+
 + (BOOL)canEditDefaultWithValue:(id)currentValue
 {
     return [FLEXArgumentInputViewFactory canEditFieldWithTypeEncoding:@encode(id) currentValue:currentValue];

Classes/Editing/FLEXMethodCallingViewController.m

@@ -9,6 +9,8 @@
 #import "FLEXMethodCallingViewController.h"
 #import "FLEXRuntimeUtility.h"
 #import "FLEXFieldEditorView.h"
+#import "FLEXObjectExplorerFactory.h"
+#import "FLEXObjectExplorerViewController.h"
 #import "FLEXArgumentInputView.h"
 #import "FLEXArgumentInputViewFactory.h"
 
@@ -96,6 +98,11 @@
         NSString *message = [error localizedDescription];
         UIAlertView *alert = [[UIAlertView alloc] initWithTitle:title message:message delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil];
         [alert show];
+    } else if (returnedObject) {
+        // For non-nil (or void) return types, push an explorer view controller to display the returned object
+        returnedObject = [FLEXRuntimeUtility potentiallyUnwrapBoxedPointer:returnedObject type:self.returnType];
+        FLEXObjectExplorerViewController *explorerViewController = [FLEXObjectExplorerFactory explorerViewControllerForObject:returnedObject];
+        [self.navigationController pushViewController:explorerViewController animated:YES];
     } else {
         [self exploreObjectOrPopViewController:returnedObject];
     }

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXMultiColumnTableView.m

@@ -51,6 +51,13 @@ static const CGFloat kColumnMargin = 1;
     CGFloat height = self.frame.size.height;
     CGFloat topheaderHeight = [self topHeaderHeight];
     CGFloat leftHeaderWidth = [self leftHeaderWidth];
+    CGFloat topInsets = 0.f;
+
+#if FLEX_AT_LEAST_IOS11_SDK
+    if (@available (iOS 11.0, *)) {
+        topInsets = self.safeAreaInsets.top;
+    }
+#endif
     
     CGFloat contentWidth = 0.0;
     NSInteger rowsCount = [self numberOfColumns];
@@ -58,13 +65,13 @@ static const CGFloat kColumnMargin = 1;
         contentWidth += [self contentWidthForColumn:i];
     }
     
-    self.leftTableView.frame           = CGRectMake(0, topheaderHeight, leftHeaderWidth, height - topheaderHeight);
-    self.headerScrollView.frame        = CGRectMake(leftHeaderWidth, 0, width - leftHeaderWidth, topheaderHeight);
+    self.leftTableView.frame           = CGRectMake(0, topheaderHeight + topInsets, leftHeaderWidth, height - topheaderHeight - topInsets);
+    self.headerScrollView.frame        = CGRectMake(leftHeaderWidth, topInsets, width - leftHeaderWidth, topheaderHeight);
     self.headerScrollView.contentSize  = CGSizeMake( self.contentTableView.frame.size.width, self.headerScrollView.frame.size.height);
-    self.contentTableView.frame        = CGRectMake(0, 0, contentWidth + [self numberOfColumns] * [self columnMargin] , height - topheaderHeight);
-    self.contentScrollView.frame       = CGRectMake(leftHeaderWidth, topheaderHeight, width - leftHeaderWidth, height - topheaderHeight);
+    self.contentTableView.frame        = CGRectMake(0, 0, contentWidth + [self numberOfColumns] * [self columnMargin] , height - topheaderHeight - topInsets);
+    self.contentScrollView.frame       = CGRectMake(leftHeaderWidth, topheaderHeight + topInsets, width - leftHeaderWidth, height - topheaderHeight - topInsets);
     self.contentScrollView.contentSize = self.contentTableView.frame.size;
-    self.leftHeader.frame              = CGRectMake(0, 0, [self leftHeaderWidth], [self topHeaderHeight]);
+    self.leftHeader.frame              = CGRectMake(0, topInsets, [self leftHeaderWidth], [self topHeaderHeight]);
 }
 
 

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableColumnHeader.h

@@ -1,6 +1,6 @@
 //
 //  FLEXTableContentHeaderCell.h
-//  UICatalog
+//  FLEX
 //
 //  Created by Peng Tao on 15/11/26.
 //  Copyright © 2015年 f. All rights reserved.

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableColumnHeader.m

@@ -1,6 +1,6 @@
 //
 //  FLEXTableContentHeaderCell.m
-//  UICatalog
+//  FLEX
 //
 //  Created by Peng Tao on 15/11/26.
 //  Copyright © 2015年 f. All rights reserved.

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableContentCell.h

@@ -1,6 +1,6 @@
 //
 //  FLEXTableContentCell.h
-//  UICatalog
+//  FLEX
 //
 //  Created by Peng Tao on 15/11/24.
 //  Copyright © 2015年 f. All rights reserved.

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableContentCell.m

@@ -1,6 +1,6 @@
 //
 //  FLEXTableContentCell.m
-//  UICatalog
+//  FLEX
 //
 //  Created by Peng Tao on 15/11/24.
 //  Copyright © 2015年 f. All rights reserved.

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableLeftCell.h

@@ -1,6 +1,6 @@
 //
 //  FLEXTableLeftCell.h
-//  UICatalog
+//  FLEX
 //
 //  Created by Peng Tao on 15/11/24.
 //  Copyright © 2015年 f. All rights reserved.

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableLeftCell.m

@@ -1,6 +1,6 @@
 //
 //  FLEXTableLeftCell.m
-//  UICatalog
+//  FLEX
 //
 //  Created by Peng Tao on 15/11/24.
 //  Copyright © 2015年 f. All rights reserved.

Classes/GlobalStateExplorers/FLEXFileBrowserSearchOperation.h

@@ -1,6 +1,6 @@
 //
 //  FLEXFileBrowserSearchOperation.h
-//  UICatalog
+//  FLEX
 //
 //  Created by 啟倫 陳 on 2014/8/4.
 //  Copyright (c) 2014年 f. All rights reserved.

Classes/GlobalStateExplorers/FLEXFileBrowserSearchOperation.m

@@ -1,6 +1,6 @@
 //
 //  FLEXFileBrowserSearchOperation.m
-//  UICatalog
+//  FLEX
 //
 //  Created by 啟倫 陳 on 2014/8/4.
 //  Copyright (c) 2014年 f. All rights reserved.

Classes/GlobalStateExplorers/FLEXFileBrowserTableViewController.m

@@ -12,6 +12,8 @@
 #import "FLEXWebViewController.h"
 #import "FLEXImagePreviewViewController.h"
 #import "FLEXTableListViewController.h"
+#import "FLEXObjectExplorerFactory.h"
+#import "FLEXObjectExplorerViewController.h"
 
 @interface FLEXFileBrowserTableViewCell : UITableViewCell
 @end
@@ -88,6 +90,12 @@
 
 }
 
+#pragma mark - Misc
+
+- (void)alert:(NSString *)title message:(NSString *)message {
+    [[[UIAlertView alloc] initWithTitle:title message:message delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil] show];
+}
+
 #pragma mark - FLEXFileBrowserSearchOperationDelegate
 
 - (void)fileBrowserSearchOperationResult:(NSArray<NSString *> *)searchResult size:(uint64_t)size
@@ -185,56 +193,70 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
+    [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
+
     NSString *fullPath = [self filePathAtIndexPath:indexPath];
-    NSString *subpath = [fullPath lastPathComponent];
-    NSString *pathExtension = [subpath pathExtension];
+    NSString *subpath = fullPath.lastPathComponent;
+    NSString *pathExtension = subpath.pathExtension;
 
     BOOL isDirectory = NO;
     BOOL stillExists = [[NSFileManager defaultManager] fileExistsAtPath:fullPath isDirectory:&isDirectory];
-    if (stillExists) {
-        UIViewController *drillInViewController = nil;
-        if (isDirectory) {
-            drillInViewController = [[[self class] alloc] initWithPath:fullPath];
-        } else if ([FLEXUtility isImagePathExtension:pathExtension]) {
-            UIImage *image = [UIImage imageWithContentsOfFile:fullPath];
-            drillInViewController = [[FLEXImagePreviewViewController alloc] initWithImage:image];
+
+    if (!stillExists) {
+        [self alert:@"File Not Found" message:@"The file at the specified path no longer exists."];
+        [self reloadDisplayedPaths];
+        return;
+    }
+
+    UIViewController *drillInViewController = nil;
+    if (isDirectory) {
+        drillInViewController = [[[self class] alloc] initWithPath:fullPath];
+    } else if ([FLEXUtility isImagePathExtension:pathExtension]) {
+        UIImage *image = [UIImage imageWithContentsOfFile:fullPath];
+        drillInViewController = [[FLEXImagePreviewViewController alloc] initWithImage:image];
+    } else {
+        NSData *fileData = [NSData dataWithContentsOfFile:fullPath];
+        if (!fileData.length) {
+            [self alert:@"Empty File" message:@"No data returned from the file."];
+            return;
+        }
+
+        // Special case keyed archives, json, and plists to get more readable data.
+        NSString *prettyString = nil;
+        if ([pathExtension isEqualToString:@"json"]) {
+            prettyString = [FLEXUtility prettyJSONStringFromData:fileData];
         } else {
-            // Special case keyed archives, json, and plists to get more readable data.
-            NSString *prettyString = nil;
-            if ([pathExtension isEqual:@"archive"] || [pathExtension isEqual:@"coded"]) {
-                prettyString = [[NSKeyedUnarchiver unarchiveObjectWithFile:fullPath] description];
-            } else if ([pathExtension isEqualToString:@"json"]) {
-                prettyString = [FLEXUtility prettyJSONStringFromData:[NSData dataWithContentsOfFile:fullPath]];
-            } else if ([pathExtension isEqualToString:@"plist"]) {
-                NSData *fileData = [NSData dataWithContentsOfFile:fullPath];
+            @try {
+                // Try to decode an archived object regardless of file extension
+                id object = [NSKeyedUnarchiver unarchiveObjectWithData:fileData];
+                drillInViewController = [FLEXObjectExplorerFactory explorerViewControllerForObject:object];
+            } @catch (NSException *e) {
+                // Try to decode a property list instead, also regardless of file extension
                 prettyString = [[NSPropertyListSerialization propertyListWithData:fileData options:0 format:NULL error:NULL] description];
             }
-
-            if ([prettyString length] > 0) {
-                drillInViewController = [[FLEXWebViewController alloc] initWithText:prettyString];
-            } else if ([FLEXWebViewController supportsPathExtension:pathExtension]) {
-                drillInViewController = [[FLEXWebViewController alloc] initWithURL:[NSURL fileURLWithPath:fullPath]];
-            } else if ([FLEXTableListViewController supportsExtension:subpath.pathExtension]) {
-                drillInViewController = [[FLEXTableListViewController alloc] initWithPath:fullPath];
-            }
-            else {
-                NSString *fileString = [NSString stringWithContentsOfFile:fullPath encoding:NSUTF8StringEncoding error:NULL];
-                if ([fileString length] > 0) {
-                    drillInViewController = [[FLEXWebViewController alloc] initWithText:fileString];
-                }
-            }
         }
 
-        if (drillInViewController) {
-            drillInViewController.title = [subpath lastPathComponent];
-            [self.navigationController pushViewController:drillInViewController animated:YES];
-        } else {
-            [self openFileController:fullPath];
-            [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
+        if (prettyString.length) {
+            drillInViewController = [[FLEXWebViewController alloc] initWithText:prettyString];
+        } else if ([FLEXWebViewController supportsPathExtension:pathExtension]) {
+            drillInViewController = [[FLEXWebViewController alloc] initWithURL:[NSURL fileURLWithPath:fullPath]];
+        } else if ([FLEXTableListViewController supportsExtension:pathExtension]) {
+            drillInViewController = [[FLEXTableListViewController alloc] initWithPath:fullPath];
         }
+        else if (!drillInViewController) {
+            NSString *fileString = [NSString stringWithUTF8String:fileData.bytes];
+            if (fileString.length) {
+                drillInViewController = [[FLEXWebViewController alloc] initWithText:fileString];
+            }
+        }
+    }
+
+    if (drillInViewController) {
+        drillInViewController.title = subpath.lastPathComponent;
+        [self.navigationController pushViewController:drillInViewController animated:YES];
     } else {
-        [[[UIAlertView alloc] initWithTitle:@"File Removed" message:@"The file at the specified path no longer exists." delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil] show];
-        [self reloadDisplayedPaths];
+        // Share the file otherwise
+        [self openFileController:fullPath];
     }
 }
 

Classes/GlobalStateExplorers/FLEXGlobalsTableViewController.m

@@ -8,6 +8,7 @@
 
 #import "FLEXGlobalsTableViewController.h"
 #import "FLEXUtility.h"
+#import "FLEXRuntimeUtility.h"
 #import "FLEXLibrariesTableViewController.h"
 #import "FLEXClassesTableViewController.h"
 #import "FLEXObjectExplorerViewController.h"
@@ -26,6 +27,7 @@ typedef NS_ENUM(NSUInteger, FLEXGlobalsRow) {
     FLEXGlobalsRowNetworkHistory,
     FLEXGlobalsRowSystemLog,
     FLEXGlobalsRowLiveObjects,
+    FLEXGlobalsRowAddressInspector,
     FLEXGlobalsRowFileBrowser,
     FLEXGlobalsCookies,    
     FLEXGlobalsRowSystemLibraries,
@@ -56,6 +58,7 @@ typedef NS_ENUM(NSUInteger, FLEXGlobalsRow) {
     for (FLEXGlobalsRow defaultRowIndex = 0; defaultRowIndex < FLEXGlobalsRowCount; defaultRowIndex++) {
         FLEXGlobalsTableViewControllerEntryNameFuture titleFuture = nil;
         FLEXGlobalsTableViewControllerViewControllerFuture viewControllerFuture = nil;
+        FLEXGlobalsTableViewControllerRowAction rowAction = nil;
 
         switch (defaultRowIndex) {
             case FLEXGlobalsRowAppClasses:
@@ -69,6 +72,49 @@ typedef NS_ENUM(NSUInteger, FLEXGlobalsRow) {
                     return classesViewController;
                 };
                 break;
+                
+            case FLEXGlobalsRowAddressInspector:
+                titleFuture = ^NSString *{
+                    return @"🔎 Address Explorer";
+                };
+                
+                rowAction = ^(FLEXGlobalsTableViewController *host) {
+                    NSString *title = @"Explore Object at Address";
+                    NSString *message = @"Paste a hexadecimal address below, starting with '0x'. "
+                    "Use the unsafe option if you need to bypass pointer validation, "
+                    "but know that it may crash the app if the address is invalid.";
+
+                    UIAlertController *addressInput = [UIAlertController alertControllerWithTitle:title
+                                                                                          message:message
+                                                                                   preferredStyle:UIAlertControllerStyleAlert];
+                    void (^handler)(UIAlertAction *) = ^(UIAlertAction *action) {
+                        if (action.style == UIAlertActionStyleCancel) {
+                            [host deselectSelectedRow]; return;
+                        }
+                        NSString *address = addressInput.textFields.firstObject.text;
+                        [host tryExploreAddress:address safely:action.style == UIAlertActionStyleDefault];
+                    };
+                    [addressInput addTextFieldWithConfigurationHandler:^(UITextField *textField) {
+                        NSString *copied = [UIPasteboard generalPasteboard].string;
+                        textField.placeholder = @"0x00000070deadbeef";
+                        // Go ahead and paste our clipboard if we have an address copied
+                        if ([copied hasPrefix:@"0x"]) {
+                            textField.text = copied;
+                            [textField selectAll:nil];
+                        }
+                    }];
+                    [addressInput addAction:[UIAlertAction actionWithTitle:@"Explore"
+                                                                     style:UIAlertActionStyleDefault
+                                                                   handler:handler]];
+                    [addressInput addAction:[UIAlertAction actionWithTitle:@"Unsafe Explore"
+                                                                     style:UIAlertActionStyleDestructive
+                                                                   handler:handler]];
+                    [addressInput addAction:[UIAlertAction actionWithTitle:@"Cancel"
+                                                                     style:UIAlertActionStyleCancel
+                                                                   handler:handler]];
+                    [host presentViewController:addressInput animated:YES completion:nil];
+                };
+                break;
 
             case FLEXGlobalsRowSystemLibraries: {
                 NSString *titleString = @"📚  System Libraries";
@@ -212,10 +258,18 @@ typedef NS_ENUM(NSUInteger, FLEXGlobalsRow) {
                 break;
         }
 
-        NSParameterAssert(titleFuture);
-        NSParameterAssert(viewControllerFuture);
+        NSAssert(viewControllerFuture || rowAction, @"The switch-case above must assign one of these");
+
+        if (viewControllerFuture) {
+            [defaultGlobalEntries addObject:[FLEXGlobalsTableViewControllerEntry
+                                             entryWithNameFuture:titleFuture
+                                             viewControllerFuture:viewControllerFuture]];
+        } else {
+            [defaultGlobalEntries addObject:[FLEXGlobalsTableViewControllerEntry
+                                             entryWithNameFuture:titleFuture
+                                             action:rowAction]];
+        }
 
-        [defaultGlobalEntries addObject:[FLEXGlobalsTableViewControllerEntry entryWithNameFuture:titleFuture viewControllerFuture:viewControllerFuture]];
     }
 
     return defaultGlobalEntries;
@@ -231,6 +285,11 @@ typedef NS_ENUM(NSUInteger, FLEXGlobalsRow) {
     return self;
 }
 
+- (void)deselectSelectedRow {
+    NSIndexPath *selected = self.tableView.indexPathForSelectedRow;
+    [self.tableView deselectRowAtIndexPath:selected animated:YES];
+}
+
 #pragma mark - Public
 
 + (void)setApplicationWindow:(UIWindow *)applicationWindow
@@ -247,13 +306,39 @@ typedef NS_ENUM(NSUInteger, FLEXGlobalsRow) {
     self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(donePressed:)];
 }
 
-#pragma mark -
+#pragma mark - Misc
 
 - (void)donePressed:(id)sender
 {
     [self.delegate globalsViewControllerDidFinish:self];
 }
 
+- (void)tryExploreAddress:(NSString *)addressString safely:(BOOL)safely {
+    NSScanner *scanner = [NSScanner scannerWithString:addressString];
+    unsigned long long hexValue = 0;
+    BOOL didParseAddress = [scanner scanHexLongLong:&hexValue];
+    const void *pointerValue = (void *)hexValue;
+
+    NSString *error = nil;
+
+    if (didParseAddress) {
+        if (safely && ![FLEXRuntimeUtility pointerIsValidObjcObject:pointerValue]) {
+            error = @"The given address is unlikely to be a valid object.";
+        }
+    } else {
+        error = @"Malformed address. Make sure it's not too long and starts with '0x'.";
+    }
+
+    if (!error) {
+        id object = (__bridge id)pointerValue;
+        FLEXObjectExplorerViewController *explorer = [FLEXObjectExplorerFactory explorerViewControllerForObject:object];
+        [self.navigationController pushViewController:explorer animated:YES];
+    } else {
+        [FLEXUtility alert:@"Uh-oh" message:error from:self];
+        [self deselectSelectedRow];
+    }
+}
+
 #pragma mark - Table Data Helpers
 
 - (FLEXGlobalsTableViewControllerEntry *)globalEntryAtIndexPath:(NSIndexPath *)indexPath
@@ -268,13 +353,6 @@ typedef NS_ENUM(NSUInteger, FLEXGlobalsRow) {
     return entry.entryNameFuture();
 }
 
-- (UIViewController *)viewControllerToPushForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-    FLEXGlobalsTableViewControllerEntry *entry = [self globalEntryAtIndexPath:indexPath];
-
-    return entry.viewControllerFuture();
-}
-
 #pragma mark - Table View Data Source
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
@@ -302,14 +380,16 @@ typedef NS_ENUM(NSUInteger, FLEXGlobalsRow) {
     return cell;
 }
 
-
 #pragma mark - Table View Delegate
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    UIViewController *viewControllerToPush = [self viewControllerToPushForRowAtIndexPath:indexPath];
-
-    [self.navigationController pushViewController:viewControllerToPush animated:YES];
+    FLEXGlobalsTableViewControllerEntry *entry = [self globalEntryAtIndexPath:indexPath];
+    if (entry.viewControllerFuture) {
+        [self.navigationController pushViewController:entry.viewControllerFuture() animated:YES];
+    } else {
+        entry.rowAction(self);
+    }
 }
 
 @end

Classes/GlobalStateExplorers/SystemLog/ActivityStreamAPI.h

@@ -0,0 +1,205 @@
+//
+// Taken from https://github.com/llvm-mirror/lldb/blob/master/tools/debugserver/source/MacOSX/DarwinLog/ActivityStreamSPI.h
+// by Tanner Bennett on 03/03/2019 with minimal modifications.
+//
+
+//===-- ActivityStreamAPI.h -------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef ActivityStreamSPI_h
+#define ActivityStreamSPI_h
+
+#include <sys/time.h>
+// #include <xpc/xpc.h>
+
+/* By default, XPC objects are declared as Objective-C types when building with
+ * an Objective-C compiler. This allows them to participate in ARC, in RR
+ * management by the Blocks runtime and in leaks checking by the static
+ * analyzer, and enables them to be added to Cocoa collections.
+ *
+ * See <os/object.h> for details.
+ */
+#if OS_OBJECT_USE_OBJC
+OS_OBJECT_DECL(xpc_object);
+#else
+typedef void * xpc_object_t;
+#endif 
+
+#define OS_ACTIVITY_MAX_CALLSTACK 32
+
+// Enums
+
+typedef NS_ENUM(uint32_t, os_activity_stream_flag_t) {
+    OS_ACTIVITY_STREAM_PROCESS_ONLY = 0x00000001,
+    OS_ACTIVITY_STREAM_SKIP_DECODE = 0x00000002,
+    OS_ACTIVITY_STREAM_PAYLOAD = 0x00000004,
+    OS_ACTIVITY_STREAM_HISTORICAL = 0x00000008,
+    OS_ACTIVITY_STREAM_CALLSTACK = 0x00000010,
+    OS_ACTIVITY_STREAM_DEBUG = 0x00000020,
+    OS_ACTIVITY_STREAM_BUFFERED = 0x00000040,
+    OS_ACTIVITY_STREAM_NO_SENSITIVE = 0x00000080,
+    OS_ACTIVITY_STREAM_INFO = 0x00000100,
+    OS_ACTIVITY_STREAM_PROMISCUOUS = 0x00000200,
+    OS_ACTIVITY_STREAM_PRECISE_TIMESTAMPS = 0x00000200
+};
+
+typedef NS_ENUM(uint32_t, os_activity_stream_type_t) {
+    OS_ACTIVITY_STREAM_TYPE_ACTIVITY_CREATE = 0x0201,
+    OS_ACTIVITY_STREAM_TYPE_ACTIVITY_TRANSITION = 0x0202,
+    OS_ACTIVITY_STREAM_TYPE_ACTIVITY_USERACTION = 0x0203,
+    
+    OS_ACTIVITY_STREAM_TYPE_TRACE_MESSAGE = 0x0300,
+    
+    OS_ACTIVITY_STREAM_TYPE_LOG_MESSAGE = 0x0400,
+    OS_ACTIVITY_STREAM_TYPE_LEGACY_LOG_MESSAGE = 0x0480,
+    
+    OS_ACTIVITY_STREAM_TYPE_SIGNPOST_BEGIN = 0x0601,
+    OS_ACTIVITY_STREAM_TYPE_SIGNPOST_END = 0x0602,
+    OS_ACTIVITY_STREAM_TYPE_SIGNPOST_EVENT = 0x0603,
+    
+    OS_ACTIVITY_STREAM_TYPE_STATEDUMP_EVENT = 0x0A00,
+};
+
+typedef NS_ENUM(uint32_t, os_activity_stream_event_t) {
+    OS_ACTIVITY_STREAM_EVENT_STARTED = 1,
+    OS_ACTIVITY_STREAM_EVENT_STOPPED = 2,
+    OS_ACTIVITY_STREAM_EVENT_FAILED = 3,
+    OS_ACTIVITY_STREAM_EVENT_CHUNK_STARTED = 4,
+    OS_ACTIVITY_STREAM_EVENT_CHUNK_FINISHED = 5,
+};
+
+// Types
+
+typedef uint64_t os_activity_id_t;
+typedef struct os_activity_stream_s *os_activity_stream_t;
+typedef struct os_activity_stream_entry_s *os_activity_stream_entry_t;
+
+#define OS_ACTIVITY_STREAM_COMMON()                                            \
+uint64_t trace_id;                                                           \
+uint64_t timestamp;                                                          \
+uint64_t thread;                                                             \
+const uint8_t *image_uuid;                                                   \
+const char *image_path;                                                      \
+struct timeval tv_gmt;                                                       \
+struct timezone tz;                                                          \
+uint32_t offset
+
+typedef struct os_activity_stream_common_s {
+    OS_ACTIVITY_STREAM_COMMON();
+} * os_activity_stream_common_t;
+
+struct os_activity_create_s {
+    OS_ACTIVITY_STREAM_COMMON();
+    const char *name;
+    os_activity_id_t creator_aid;
+    uint64_t unique_pid;
+};
+
+struct os_activity_transition_s {
+    OS_ACTIVITY_STREAM_COMMON();
+    os_activity_id_t transition_id;
+};
+
+typedef struct os_log_message_s {
+    OS_ACTIVITY_STREAM_COMMON();
+    const char *format;
+    const uint8_t *buffer;
+    size_t buffer_sz;
+    const uint8_t *privdata;
+    size_t privdata_sz;
+    const char *subsystem;
+    const char *category;
+    uint32_t oversize_id;
+    uint8_t ttl;
+    bool persisted;
+} * os_log_message_t;
+
+typedef struct os_trace_message_v2_s {
+    OS_ACTIVITY_STREAM_COMMON();
+    const char *format;
+    const void *buffer;
+    size_t bufferLen;
+    xpc_object_t __unsafe_unretained payload;
+} * os_trace_message_v2_t;
+
+typedef struct os_activity_useraction_s {
+    OS_ACTIVITY_STREAM_COMMON();
+    const char *action;
+    bool persisted;
+} * os_activity_useraction_t;
+
+typedef struct os_signpost_s {
+    OS_ACTIVITY_STREAM_COMMON();
+    const char *format;
+    const uint8_t *buffer;
+    size_t buffer_sz;
+    const uint8_t *privdata;
+    size_t privdata_sz;
+    const char *subsystem;
+    const char *category;
+    uint64_t duration_nsec;
+    uint32_t callstack_depth;
+    uint64_t callstack[OS_ACTIVITY_MAX_CALLSTACK];
+} * os_signpost_t;
+
+typedef struct os_activity_statedump_s {
+    OS_ACTIVITY_STREAM_COMMON();
+    char *message;
+    size_t message_size;
+    char image_path_buffer[PATH_MAX];
+} * os_activity_statedump_t;
+
+struct os_activity_stream_entry_s {
+    os_activity_stream_type_t type;
+    
+    // information about the process streaming the data
+    pid_t pid;
+    uint64_t proc_id;
+    const uint8_t *proc_imageuuid;
+    const char *proc_imagepath;
+    
+    // the activity associated with this streamed event
+    os_activity_id_t activity_id;
+    os_activity_id_t parent_id;
+    
+    union {
+        struct os_activity_stream_common_s common;
+        struct os_activity_create_s activity_create;
+        struct os_activity_transition_s activity_transition;
+        struct os_log_message_s log_message;
+        struct os_trace_message_v2_s trace_message;
+        struct os_activity_useraction_s useraction;
+        struct os_signpost_s signpost;
+        struct os_activity_statedump_s statedump;
+    };
+};
+
+// Blocks
+
+typedef bool (^os_activity_stream_block_t)(os_activity_stream_entry_t entry,
+                                           int error);
+
+typedef void (^os_activity_stream_event_block_t)(
+                                                 os_activity_stream_t stream, os_activity_stream_event_t event);
+
+// SPI entry point prototypes
+
+typedef os_activity_stream_t (*os_activity_stream_for_pid_t)(
+                                                             pid_t pid, os_activity_stream_flag_t flags,
+                                                             os_activity_stream_block_t stream_block);
+
+typedef void (*os_activity_stream_resume_t)(os_activity_stream_t stream);
+
+typedef void (*os_activity_stream_cancel_t)(os_activity_stream_t stream);
+
+typedef char *(*os_log_copy_formatted_message_t)(os_log_message_t log_message);
+
+typedef void (*os_activity_stream_set_event_handler_t)(
+                                                       os_activity_stream_t stream, os_activity_stream_event_block_t block);
+
+#endif /* ActivityStreamSPI_h */

Classes/GlobalStateExplorers/SystemLog/FLEXASLLogController.h

@@ -0,0 +1,18 @@
+//
+//  FLEXASLLogController.h
+//  FLEX
+//
+//  Created by Tanner on 3/14/19.
+//  Copyright © 2019 Flipboard. All rights reserved.
+//
+
+#import "FLEXLogController.h"
+
+@interface FLEXASLLogController : NSObject <FLEXLogController>
+
+/// Guaranteed to call back on the main thread.
++ (instancetype)withUpdateHandler:(void(^)(NSArray<FLEXSystemLogMessage *> *newMessages))newMessagesHandler;
+
+- (BOOL)startMonitoring;
+
+@end

Classes/GlobalStateExplorers/SystemLog/FLEXASLLogController.m

@@ -0,0 +1,154 @@
+//
+//  FLEXASLLogController.m
+//  FLEX
+//
+//  Created by Tanner on 3/14/19.
+//  Copyright © 2019 Flipboard. All rights reserved.
+//
+
+#import "FLEXASLLogController.h"
+#import <asl.h>
+
+// Querrying the ASL is much slower in the simulator. We need a longer polling interval to keep things repsonsive.
+#if TARGET_IPHONE_SIMULATOR
+    #define updateInterval 5.0
+#else
+    #define updateInterval 1.0
+#endif
+
+@interface FLEXASLLogController ()
+
+@property (nonatomic, readonly) void (^updateHandler)(NSArray<FLEXSystemLogMessage *> *);
+
+@property (nonatomic, strong) NSTimer *logUpdateTimer;
+@property (nonatomic, readonly) NSMutableIndexSet *logMessageIdentifiers;
+
+// ASL stuff
+
+@property (nonatomic) NSUInteger heapSize;
+@property (nonatomic) dispatch_queue_t logQueue;
+@property (nonatomic) dispatch_io_t io;
+@property (nonatomic) NSString *remaining;
+@property (nonatomic) int stderror;
+@property (nonatomic) NSString *lastTimestamp;
+
+@end
+
+@implementation FLEXASLLogController
+
++ (instancetype)withUpdateHandler:(void(^)(NSArray<FLEXSystemLogMessage *> *newMessages))newMessagesHandler
+{
+    return [[self alloc] initWithUpdateHandler:newMessagesHandler];
+}
+
+- (id)initWithUpdateHandler:(void(^)(NSArray<FLEXSystemLogMessage *> *newMessages))newMessagesHandler
+{
+    NSParameterAssert(newMessagesHandler);
+
+    self = [super init];
+    if (self) {
+        _updateHandler = newMessagesHandler;
+        _logMessageIdentifiers = [NSMutableIndexSet indexSet];
+        self.logUpdateTimer = [NSTimer scheduledTimerWithTimeInterval:updateInterval
+                                                               target:self
+                                                             selector:@selector(updateLogMessages)
+                                                             userInfo:nil
+                                                              repeats:YES];
+    }
+
+    return self;
+}
+
+- (void)dealloc
+{
+    [self.logUpdateTimer invalidate];
+}
+
+- (BOOL)startMonitoring {
+    [self.logUpdateTimer fire];
+    return YES;
+}
+
+- (void)updateLogMessages
+{
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        NSArray<FLEXSystemLogMessage *> *newMessages;
+        @synchronized (self) {
+            newMessages = [self newLogMessagesForCurrentProcess];
+            if (!newMessages.count) {
+                return;
+            }
+
+            for (FLEXSystemLogMessage *message in newMessages) {
+                [self.logMessageIdentifiers addIndex:(NSUInteger)message.messageID];
+            }
+
+            self.lastTimestamp = @(asl_get(newMessages.lastObject.aslMessage, ASL_KEY_TIME) ?: "null");
+        }
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+            self.updateHandler(newMessages);
+        });
+    });
+}
+
+#pragma mark - Log Message Fetching
+
+- (NSArray<FLEXSystemLogMessage *> *)newLogMessagesForCurrentProcess
+{
+    if (!self.logMessageIdentifiers.count) {
+        return [self allLogMessagesForCurrentProcess];
+    }
+
+    aslresponse response = [self ASLMessageListForCurrentProcess];
+    aslmsg aslMessage = NULL;
+
+    NSMutableArray<FLEXSystemLogMessage *> *newMessages = [NSMutableArray array];
+
+    while ((aslMessage = asl_next(response))) {
+        NSUInteger messageID = (NSUInteger)atoll(asl_get(aslMessage, ASL_KEY_MSG_ID));
+        if (![self.logMessageIdentifiers containsIndex:messageID]) {
+            [newMessages addObject:[FLEXSystemLogMessage logMessageFromASLMessage:aslMessage]];
+        }
+    }
+
+    asl_release(response);
+    return newMessages;
+}
+
+- (aslresponse)ASLMessageListForCurrentProcess
+{
+    static NSString *pidString = nil;
+    if (!pidString) {
+        pidString = @([[NSProcessInfo processInfo] processIdentifier]).stringValue;
+    }
+
+    // Create system log query object.
+    asl_object_t query = asl_new(ASL_TYPE_QUERY);
+
+    // Filter for messages from the current process.
+    // Note that this appears to happen by default on device, but is required in the simulator.
+    asl_set_query(query, ASL_KEY_PID, pidString.UTF8String, ASL_QUERY_OP_EQUAL);
+    // Filter for messages after the last retreived message.
+    if (self.lastTimestamp) {
+        asl_set_query(query, ASL_KEY_TIME, self.lastTimestamp.UTF8String, ASL_QUERY_OP_GREATER);
+    }
+
+    return asl_search(NULL, query);
+}
+
+- (NSArray<FLEXSystemLogMessage *> *)allLogMessagesForCurrentProcess
+{
+    aslresponse response = [self ASLMessageListForCurrentProcess];
+    aslmsg aslMessage = NULL;
+
+    NSMutableArray<FLEXSystemLogMessage *> *logMessages = [NSMutableArray array];
+    while ((aslMessage = asl_next(response))) {
+        [logMessages addObject:[FLEXSystemLogMessage logMessageFromASLMessage:aslMessage]];
+    }
+    asl_release(response);
+
+    return logMessages;
+}
+
+@end

Classes/GlobalStateExplorers/SystemLog/FLEXLogController.h

@@ -0,0 +1,19 @@
+//
+//  FLEXLogController.h
+//  FLEX
+//
+//  Created by Tanner on 3/17/19.
+//  Copyright © 2019 Flipboard. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "FLEXSystemLogMessage.h"
+
+@protocol FLEXLogController <NSObject>
+
+/// Guaranteed to call back on the main thread.
++ (instancetype)withUpdateHandler:(void(^)(NSArray<FLEXSystemLogMessage *> *newMessages))newMessagesHandler;
+
+- (BOOL)startMonitoring;
+
+@end

Classes/GlobalStateExplorers/SystemLog/FLEXOSLogController.h

@@ -0,0 +1,29 @@
+//
+//  FLEXOSLogController.h
+//  FLEX
+//
+//  Created by Tanner on 12/19/18.
+//  Copyright © 2018 Flipboard. All rights reserved.
+//
+
+#import "FLEXLogController.h"
+
+#define FLEXOSLogAvailable() ([NSProcessInfo processInfo].operatingSystemVersion.majorVersion >= 10)
+
+extern NSString * const kFLEXiOSPersistentOSLogKey;
+
+/// The log controller used for iOS 10 and up.
+@interface FLEXOSLogController : NSObject <FLEXLogController>
+
++ (instancetype)withUpdateHandler:(void(^)(NSArray<FLEXSystemLogMessage *> *newMessages))newMessagesHandler;
+
+- (BOOL)startMonitoring;
+
+/// Whether log messages are to be recorded and kept in-memory in the background.
+/// You do not need to initialize this value, only change it.
+@property (nonatomic) BOOL persistent;
+/// Used mostly internally, but also used by the log VC to persist messages
+/// that were created prior to enabling persistence.
+@property (nonatomic) NSMutableArray<FLEXSystemLogMessage *> *messages;
+
+@end

Classes/GlobalStateExplorers/SystemLog/FLEXOSLogController.m

@@ -0,0 +1,218 @@
+//
+//  FLEXOSLogController.m
+//  FLEX
+//
+//  Created by Tanner on 12/19/18.
+//  Copyright © 2018 Flipboard. All rights reserved.
+//
+
+#import "FLEXOSLogController.h"
+#include <dlfcn.h>
+#include "ActivityStreamAPI.h"
+
+NSString * const kFLEXiOSPersistentOSLogKey = @"com.flex.enablePersistentOSLogLogging";
+
+static os_activity_stream_for_pid_t OSActivityStreamForPID;
+static os_activity_stream_resume_t OSActivityStreamResume;
+static os_activity_stream_cancel_t OSActivityStreamCancel;
+static os_log_copy_formatted_message_t OSLogCopyFormattedMessage;
+static os_activity_stream_set_event_handler_t OSActivityStreamSetEventHandler;
+static int (*proc_name)(int, char *, unsigned int);
+static int (*proc_listpids)(uint32_t, uint32_t, void*, int);
+static uint8_t (*OSLogGetType)(void *);
+
+@interface FLEXOSLogController ()
+
++ (FLEXOSLogController *)sharedLogController;
+
+@property (nonatomic) void (^updateHandler)(NSArray<FLEXSystemLogMessage *> *);
+
+@property (nonatomic) BOOL canPrint;
+@property (nonatomic) int filterPid;
+@property (nonatomic) BOOL levelInfo;
+@property (nonatomic) BOOL subsystemInfo;
+
+@property (nonatomic) os_activity_stream_t stream;
+
+@end
+
+@implementation FLEXOSLogController
+
++ (void)load
+{
+    // Persist logs when the app launches on iOS 10 if we have persitent logs turned on
+    if (FLEXOSLogAvailable()) {
+        BOOL persistent = [[NSUserDefaults standardUserDefaults] boolForKey:kFLEXiOSPersistentOSLogKey];
+        if (persistent) {
+            [self sharedLogController].persistent = YES;
+            [[self sharedLogController] startMonitoring];
+        }
+    }
+}
+
++ (instancetype)sharedLogController {
+    static FLEXOSLogController *shared = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        shared = [self new];
+    });
+    
+    return shared;
+}
+
++ (instancetype)withUpdateHandler:(void(^)(NSArray<FLEXSystemLogMessage *> *newMessages))newMessagesHandler
+{
+    FLEXOSLogController *shared = [self sharedLogController];
+    shared.updateHandler = newMessagesHandler;
+    return shared;
+}
+
+- (id)init
+{
+    NSAssert(FLEXOSLogAvailable(), @"os_log is only available on iOS 10 and up");
+
+    self = [super init];
+    if (self) {
+        _filterPid = [NSProcessInfo processInfo].processIdentifier;
+        _levelInfo = NO;
+        _subsystemInfo = NO;
+    }
+    
+    return self;
+}
+
+- (void)dealloc {
+    OSActivityStreamCancel(self.stream);
+    _stream = nil;
+}
+
+- (void)setPersistent:(BOOL)persistent {
+    if (_persistent == persistent) return;
+    
+    _persistent = persistent;
+    self.messages = persistent ? [NSMutableArray array] : nil;
+}
+
+- (BOOL)startMonitoring {
+    if (![self lookupSPICalls]) {
+        // >= iOS 10 is required
+        return NO;
+    }
+    
+    // Are we already monitoring?
+    if (self.stream) {
+        // Should we send out the "persisted" messages?
+        if (self.updateHandler && self.messages.count) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                self.updateHandler(self.messages);
+            });
+        }
+        
+        return YES;
+    }
+
+    // Stream entry handler
+    os_activity_stream_block_t block = ^bool(os_activity_stream_entry_t entry, int error) {
+        return [self handleStreamEntry:entry error:error];
+    };
+
+    // Controls which types of messages we see
+    // 'Historical' appears to just show NSLog stuff
+    uint32_t activity_stream_flags = OS_ACTIVITY_STREAM_HISTORICAL;
+    activity_stream_flags |= OS_ACTIVITY_STREAM_PROCESS_ONLY;
+//    activity_stream_flags |= OS_ACTIVITY_STREAM_PROCESS_ONLY;
+
+    self.stream = OSActivityStreamForPID(self.filterPid, activity_stream_flags, block);
+
+    // Specify the stream-related event handler
+    OSActivityStreamSetEventHandler(self.stream, [self streamEventHandlerBlock]);
+    // Start the stream
+    OSActivityStreamResume(self.stream);
+
+    return YES;
+}
+
+- (BOOL)lookupSPICalls {
+    static BOOL hasSPI = NO;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        void *handle = dlopen("/System/Library/PrivateFrameworks/LoggingSupport.framework/LoggingSupport", RTLD_NOW);
+
+        OSActivityStreamForPID = (os_activity_stream_for_pid_t)dlsym(handle, "os_activity_stream_for_pid");
+        OSActivityStreamResume = (os_activity_stream_resume_t)dlsym(handle, "os_activity_stream_resume");
+        OSActivityStreamCancel = (os_activity_stream_cancel_t)dlsym(handle, "os_activity_stream_cancel");
+        OSLogCopyFormattedMessage = (os_log_copy_formatted_message_t)dlsym(handle, "os_log_copy_formatted_message");
+        OSActivityStreamSetEventHandler = (os_activity_stream_set_event_handler_t)dlsym(handle, "os_activity_stream_set_event_handler");
+        proc_name = (int(*)(int, char *, unsigned int))dlsym(handle, "proc_name");
+        proc_listpids = (int(*)(uint32_t, uint32_t, void*, int))dlsym(handle, "proc_listpids");
+        OSLogGetType = (uint8_t(*)(void *))dlsym(handle, "os_log_get_type");
+
+        hasSPI = (OSActivityStreamForPID != NULL) &&
+                (OSActivityStreamResume != NULL) &&
+                (OSActivityStreamCancel != NULL) &&
+                (OSLogCopyFormattedMessage != NULL) &&
+                (OSActivityStreamSetEventHandler != NULL) &&
+                (OSLogGetType != NULL) &&
+                (proc_name != NULL);
+    });
+    
+    return hasSPI;
+}
+
+- (BOOL)handleStreamEntry:(os_activity_stream_entry_t)entry error:(int)error {
+    if (!self.canPrint || (self.filterPid != -1 && entry->pid != self.filterPid)) {
+        return YES;
+    }
+
+    if (!error && entry) {
+        if (entry->type == OS_ACTIVITY_STREAM_TYPE_LOG_MESSAGE ||
+            entry->type == OS_ACTIVITY_STREAM_TYPE_LEGACY_LOG_MESSAGE) {
+            os_log_message_t log_message = &entry->log_message;
+            
+            // Get date
+            NSDate *date = [NSDate dateWithTimeIntervalSince1970:log_message->tv_gmt.tv_sec];
+            
+            // Get log message text
+            const char *messageText = OSLogCopyFormattedMessage(log_message);
+            // https://github.com/limneos/oslog/issues/1
+            if (entry->log_message.format && !(strcmp(entry->log_message.format, messageText))) {
+                messageText = (char *)entry->log_message.format;
+            }
+
+            dispatch_async(dispatch_get_main_queue(), ^{
+                FLEXSystemLogMessage *message = [FLEXSystemLogMessage logMessageFromDate:date text:@(messageText)];
+                if (self.persistent) {
+                    [self.messages addObject:message];
+                }
+                if (self.updateHandler) {
+                    self.updateHandler(@[message]);
+                }
+            });
+        }
+    }
+    
+    return YES;
+}
+
+- (os_activity_stream_event_block_t)streamEventHandlerBlock {
+    return [^void(os_activity_stream_t stream, os_activity_stream_event_t event) {
+        switch (event) {
+            case OS_ACTIVITY_STREAM_EVENT_STARTED:
+                self.canPrint = YES;
+                break;
+            case OS_ACTIVITY_STREAM_EVENT_STOPPED:
+                break;
+            case OS_ACTIVITY_STREAM_EVENT_FAILED:
+                break;
+            case OS_ACTIVITY_STREAM_EVENT_CHUNK_STARTED:
+                break;
+            case OS_ACTIVITY_STREAM_EVENT_CHUNK_FINISHED:
+                break;
+            default:
+                printf("=== Unhandled case ===\n");
+                break;
+        }
+    } copy];
+}
+
+@end

Classes/GlobalStateExplorers/SystemLog/FLEXSystemLogMessage.h

@@ -1,6 +1,6 @@
 //
 //  FLEXSystemLogMessage.h
-//  UICatalog
+//  FLEX
 //
 //  Created by Ryan Olson on 1/25/15.
 //  Copyright (c) 2015 f. All rights reserved.
@@ -8,14 +8,24 @@
 
 #import <Foundation/Foundation.h>
 #import <asl.h>
+#import "ActivityStreamAPI.h"
+
+NS_ASSUME_NONNULL_BEGIN
 
 @interface FLEXSystemLogMessage : NSObject
 
 + (instancetype)logMessageFromASLMessage:(aslmsg)aslMessage;
+//+ (instancetype)logMessageFromOSLog:(os_log_message_t)logMessage;
++ (instancetype)logMessageFromDate:(NSDate *)date text:(NSString *)text;
 
-@property (nonatomic, strong) NSDate *date;
-@property (nonatomic, copy) NSString *sender;
-@property (nonatomic, copy) NSString *messageText;
-@property (nonatomic, assign) long long messageID;
+// ASL specific properties
+@property (nonatomic, readonly, nullable) NSString *sender;
+@property (nonatomic, readonly, nullable) aslmsg aslMessage;
+
+@property (nonatomic, readonly) NSDate *date;
+@property (nonatomic, readonly) NSString *messageText;
+@property (nonatomic, readonly) long long messageID;
 
 @end
+
+NS_ASSUME_NONNULL_END

Classes/GlobalStateExplorers/SystemLog/FLEXSystemLogMessage.m

@@ -1,6 +1,6 @@
 //
 //  FLEXSystemLogMessage.m
-//  UICatalog
+//  FLEX
 //
 //  Created by Ryan Olson on 1/25/15.
 //  Copyright (c) 2015 f. All rights reserved.
@@ -12,7 +12,9 @@
 
 + (instancetype)logMessageFromASLMessage:(aslmsg)aslMessage
 {
-    FLEXSystemLogMessage *logMessage = [[FLEXSystemLogMessage alloc] init];
+    NSDate *date = nil;
+    NSString *sender = nil, *text = nil;
+    long long identifier = 0;
 
     const char *timestamp = asl_get(aslMessage, ASL_KEY_TIME);
     if (timestamp) {
@@ -21,30 +23,67 @@
         if (nanoseconds) {
             timeInterval += [@(nanoseconds) doubleValue] / NSEC_PER_SEC;
         }
-        logMessage.date = [NSDate dateWithTimeIntervalSince1970:timeInterval];
+        date = [NSDate dateWithTimeIntervalSince1970:timeInterval];
     }
 
-    const char *sender = asl_get(aslMessage, ASL_KEY_SENDER);
-    if (sender) {
-        logMessage.sender = @(sender);
+    const char *s = asl_get(aslMessage, ASL_KEY_SENDER);
+    if (s) {
+        sender = @(s);
     }
 
     const char *messageText = asl_get(aslMessage, ASL_KEY_MSG);
     if (messageText) {
-        logMessage.messageText = @(messageText);
+        text = @(messageText);
     }
 
     const char *messageID = asl_get(aslMessage, ASL_KEY_MSG_ID);
     if (messageID) {
-        logMessage.messageID = [@(messageID) longLongValue];
+        identifier = [@(messageID) longLongValue];
     }
 
-    return logMessage;
+    FLEXSystemLogMessage *message = [[self alloc] initWithDate:date sender:sender text:text messageID:identifier];
+    message->_aslMessage = aslMessage;
+    return message;
+}
+
++ (instancetype)logMessageFromOSLog:(os_log_message_t)logMessage
+{
+    abort();
+    return nil;
+}
+
++ (instancetype)logMessageFromDate:(NSDate *)date text:(NSString *)text
+{
+    return [[self alloc] initWithDate:date sender:nil text:text messageID:0];
+}
+
+- (id)initWithDate:(NSDate *)date sender:(NSString *)sender text:(NSString *)text messageID:(long long)identifier
+{
+    self = [super init];
+    if (self) {
+        _date = date;
+        _sender = sender;
+        _messageText = text;
+        _messageID = identifier;
+    }
+
+    return self;
 }
 
 - (BOOL)isEqual:(id)object
 {
-    return [object isKindOfClass:[FLEXSystemLogMessage class]] && self.messageID == [object messageID];
+    if ([object isKindOfClass:[self class]]) {
+        if (self.messageID) {
+            // Only ASL uses messageID, otherwise it is 0
+            return self.messageID == [object messageID];
+        } else {
+            // Test message texts and dates for OS Log
+            return [self.messageText isEqual:[object messageText]] &&
+                    [self.date isEqualToDate:[object date]];
+        }
+    }
+    
+    return NO;
 }
 
 - (NSUInteger)hash
@@ -52,4 +91,10 @@
     return (NSUInteger)self.messageID;
 }
 
+- (NSString *)description
+{
+    NSString *escaped = [self.messageText stringByReplacingOccurrencesOfString:@"\n" withString:@"\\n"];
+    return [NSString stringWithFormat:@"(%@) %@", @(self.messageText.length), escaped];
+}
+
 @end

Classes/GlobalStateExplorers/SystemLog/FLEXSystemLogTableViewCell.h

@@ -1,6 +1,6 @@
 //
 //  FLEXSystemLogTableViewCell.h
-//  UICatalog
+//  FLEX
 //
 //  Created by Ryan Olson on 1/25/15.
 //  Copyright (c) 2015 f. All rights reserved.

Classes/GlobalStateExplorers/SystemLog/FLEXSystemLogTableViewCell.m

@@ -1,6 +1,6 @@
 //
 //  FLEXSystemLogTableViewCell.m
-//  UICatalog
+//  FLEX
 //
 //  Created by Ryan Olson on 1/25/15.
 //  Copyright (c) 2015 f. All rights reserved.

Classes/GlobalStateExplorers/SystemLog/FLEXSystemLogTableViewController.h

@@ -1,6 +1,6 @@
 //
 //  FLEXSystemLogTableViewController.h
-//  UICatalog
+//  FLEX
 //
 //  Created by Ryan Olson on 1/19/15.
 //  Copyright (c) 2015 f. All rights reserved.

Classes/GlobalStateExplorers/SystemLog/FLEXSystemLogTableViewController.m

@@ -1,6 +1,6 @@
 //
 //  FLEXSystemLogTableViewController.m
-//  UICatalog
+//  FLEX
 //
 //  Created by Ryan Olson on 1/19/15.
 //  Copyright (c) 2015 f. All rights reserved.
@@ -8,17 +8,16 @@
 
 #import "FLEXSystemLogTableViewController.h"
 #import "FLEXUtility.h"
-#import "FLEXSystemLogMessage.h"
+#import "FLEXASLLogController.h"
+#import "FLEXOSLogController.h"
 #import "FLEXSystemLogTableViewCell.h"
-#import <asl.h>
 
 @interface FLEXSystemLogTableViewController () <UISearchResultsUpdating, UISearchControllerDelegate>
 
 @property (nonatomic, strong) UISearchController *searchController;
+@property (nonatomic, readonly) id<FLEXLogController> logController;
 @property (nonatomic, readonly) NSMutableArray<FLEXSystemLogMessage *> *logMessages;
 @property (nonatomic, copy) NSArray<FLEXSystemLogMessage *> *filteredLogMessages;
-@property (nonatomic, strong) NSTimer *logUpdateTimer;
-@property (nonatomic, readonly) NSMutableIndexSet *logMessageIdentifiers;
 
 @end
 
@@ -28,68 +27,56 @@
 {
     [super viewDidLoad];
 
+    id logHandler = ^(NSArray<FLEXSystemLogMessage *> *newMessages) {
+        self.title = @"System Log";
+
+        [self.logMessages addObjectsFromArray:newMessages];
+
+        // "Follow" the log as new messages stream in if we were previously near the bottom.
+        BOOL wasNearBottom = self.tableView.contentOffset.y >= self.tableView.contentSize.height - self.tableView.frame.size.height - 100.0;
+        [self.tableView reloadData];
+        if (wasNearBottom) {
+            [self scrollToLastRow];
+        }
+    };
+
     _logMessages = [NSMutableArray array];
-    _logMessageIdentifiers = [NSMutableIndexSet indexSet];
+    if ([NSProcessInfo processInfo].operatingSystemVersion.majorVersion <= 9) {
+        _logController = [FLEXASLLogController withUpdateHandler:logHandler];
+    } else {
+        _logController = [FLEXOSLogController withUpdateHandler:logHandler];
+    }
 
     [self.tableView registerClass:[FLEXSystemLogTableViewCell class] forCellReuseIdentifier:kFLEXSystemLogTableViewCellIdentifier];
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.title = @"Loading...";
-    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@" ⬇︎ " style:UIBarButtonItemStylePlain target:self action:@selector(scrollToLastRow)];
-
+    
+    UIBarButtonItem *scrollDown = [[UIBarButtonItem alloc] initWithTitle:@" ⬇︎ "
+                                                                   style:UIBarButtonItemStylePlain
+                                                                  target:self
+                                                                  action:@selector(scrollToLastRow)];
+    UIBarButtonItem *settings = [[UIBarButtonItem alloc] initWithTitle:@"Settings"
+                                                                 style:UIBarButtonItemStylePlain
+                                                                target:self
+                                                                action:@selector(showLogSettings)];
+    if (FLEXOSLogAvailable()) {
+        self.navigationItem.rightBarButtonItems = @[scrollDown, settings];
+    } else {
+        self.navigationItem.rightBarButtonItem = scrollDown;
+    }
+    
     self.searchController = [[UISearchController alloc] initWithSearchResultsController:nil];
     self.searchController.delegate = self;
     self.searchController.searchResultsUpdater = self;
     self.searchController.dimsBackgroundDuringPresentation = NO;
     self.tableView.tableHeaderView = self.searchController.searchBar;
-
-    [self updateLogMessages];
 }
 
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
 
-    NSTimeInterval updateInterval = 1.0;
-
-#if TARGET_IPHONE_SIMULATOR
-    // Querrying the ASL is much slower in the simulator. We need a longer polling interval to keep things repsonsive.
-    updateInterval = 5.0;
-#endif
-
-    self.logUpdateTimer = [NSTimer scheduledTimerWithTimeInterval:updateInterval target:self selector:@selector(updateLogMessages) userInfo:nil repeats:YES];
-}
-
-- (void)viewWillDisappear:(BOOL)animated
-{
-    [super viewWillDisappear:animated];
-
-    [self.logUpdateTimer invalidate];
-}
-
-- (void)updateLogMessages
-{
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        NSArray<FLEXSystemLogMessage *> *newMessages = [self newLogMessagesForCurrentProcess];
-        if (!newMessages.count) {
-            return;
-        }
-
-        dispatch_async(dispatch_get_main_queue(), ^{
-            self.title = @"System Log";
-
-            [self.logMessages addObjectsFromArray:newMessages];
-            for (FLEXSystemLogMessage *message in newMessages) {
-                [self.logMessageIdentifiers addIndex:(NSUInteger)message.messageID];
-            }
-
-            // "Follow" the log as new messages stream in if we were previously near the bottom.
-            BOOL wasNearBottom = self.tableView.contentOffset.y >= self.tableView.contentSize.height - self.tableView.frame.size.height - 100.0;
-            [self.tableView reloadData];
-            if (wasNearBottom) {
-                [self scrollToLastRow];
-            }
-        });
-    });
+    [self.logController startMonitoring];
 }
 
 - (void)scrollToLastRow
@@ -101,6 +88,27 @@
     }
 }
 
+- (void)showLogSettings
+{
+    FLEXOSLogController *logController = (FLEXOSLogController *)self.logController;
+    BOOL persistent = [[NSUserDefaults standardUserDefaults] boolForKey:kFLEXiOSPersistentOSLogKey];
+    NSString *toggle = persistent ? @"Disable" : @"Enable";
+    NSString *title = [@"Persistent logging: " stringByAppendingString:persistent ? @"ON" : @"OFF"];
+    NSString *body = @"In iOS 10 and up, ASL is gone. The OS Log API is much more limited. "
+    "To get as close to the old behavior as possible, logs must be collected manually at launch and stored.\n\n"
+    "Turn this feature on only when you need it.";
+    
+    UIAlertController *settings = [UIAlertController alertControllerWithTitle:title message:body preferredStyle:UIAlertControllerStyleAlert];
+    [settings addAction:[UIAlertAction actionWithTitle:toggle style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+        [[NSUserDefaults standardUserDefaults] setBool:!persistent forKey:kFLEXiOSPersistentOSLogKey];
+        logController.persistent = !persistent;
+        [logController.messages addObjectsFromArray:self.logMessages];
+    }]];
+    [settings addAction:[UIAlertAction actionWithTitle:@"Dismiss" style:UIAlertActionStyleCancel handler:nil]];
+    
+    [self presentViewController:settings animated:YES completion:nil];
+}
+
 #pragma mark - Table view data source
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
@@ -110,7 +118,7 @@
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    return self.searchController.isActive ? [self.filteredLogMessages count] : [self.logMessages count];
+    return self.searchController.isActive ? self.filteredLogMessages.count : self.logMessages.count;
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath 
@@ -149,9 +157,8 @@
 - (void)tableView:(UITableView *)tableView performAction:(SEL)action forRowAtIndexPath:(NSIndexPath *)indexPath withSender:(id)sender
 {
     if (action == @selector(copy:)) {
-        FLEXSystemLogMessage *logMessage = [self logMessageAtIndexPath:indexPath];
-        NSString *stringToCopy = [FLEXSystemLogTableViewCell displayedTextForLogMessage:logMessage] ?: @"";
-        [[UIPasteboard generalPasteboard] setString:stringToCopy];
+        // We usually only want to copy the log message itself, not any metadata associated with it.
+        [UIPasteboard generalPasteboard].string = [self logMessageAtIndexPath:indexPath].messageText;
     }
 }
 
@@ -179,59 +186,4 @@
     });
 }
 
-#pragma mark - Log Message Fetching
-
-- (NSArray<FLEXSystemLogMessage *> *)newLogMessagesForCurrentProcess
-{
-    if (!self.logMessages.count) {
-        return [[self class] allLogMessagesForCurrentProcess];
-    }
-
-    aslresponse response = [FLEXSystemLogTableViewController ASLMessageListForCurrentProcess];
-    aslmsg aslMessage = NULL;
-
-    NSMutableArray<FLEXSystemLogMessage *> *newMessages = [NSMutableArray array];
-
-    while ((aslMessage = asl_next(response))) {
-        NSUInteger messageID = (NSUInteger)atoll(asl_get(aslMessage, ASL_KEY_MSG_ID));
-        if (![self.logMessageIdentifiers containsIndex:messageID]) {
-            [newMessages addObject:[FLEXSystemLogMessage logMessageFromASLMessage:aslMessage]];
-        }
-    }
-
-    asl_release(response);
-    return newMessages;
-}
-
-+ (aslresponse)ASLMessageListForCurrentProcess
-{
-    static NSString *pidString = nil;
-    if (!pidString) {
-        pidString = @([[NSProcessInfo processInfo] processIdentifier]).stringValue;
-    }
-
-    // Create system log query object.
-    asl_object_t query = asl_new(ASL_TYPE_QUERY);
-
-    // Filter for messages from the current process.
-    // Note that this appears to happen by default on device, but is required in the simulator.
-    asl_set_query(query, ASL_KEY_PID, pidString.UTF8String, ASL_QUERY_OP_EQUAL);
-
-    return asl_search(NULL, query);
-}
-
-+ (NSArray<FLEXSystemLogMessage *> *)allLogMessagesForCurrentProcess
-{
-    aslresponse response = [self ASLMessageListForCurrentProcess];
-    aslmsg aslMessage = NULL;
-
-    NSMutableArray<FLEXSystemLogMessage *> *logMessages = [NSMutableArray array];
-    while ((aslMessage = asl_next(response))) {
-        [logMessages addObject:[FLEXSystemLogMessage logMessageFromASLMessage:aslMessage]];
-    }
-    asl_release(response);
-
-    return logMessages;
-}
-
 @end

Classes/GlobalStateExplorers/SystemLog/LLVM_LICENSE.TXT

@@ -0,0 +1,276 @@
+==============================================================================
+The LLVM Project is under the Apache License v2.0 with LLVM Exceptions:
+==============================================================================
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+    1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+    2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+    3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+    4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+    5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+    6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+    7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+    8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+    9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+    END OF TERMS AND CONDITIONS
+
+    APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+    Copyright [yyyy] [name of copyright owner]
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+
+---- LLVM Exceptions to the Apache 2.0 License ----
+
+As an exception, if, as a result of your compiling your source code, portions
+of this Software are embedded into an Object form of such source code, you
+may redistribute such embedded portions in such Object form without complying
+with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
+
+In addition, if you combine or link compiled forms of this Software with
+software that is licensed under the GPLv2 ("Combined Software") and if a
+court of competent jurisdiction determines that the patent provision (Section
+3), the indemnity provision (Section 9) or other Section of the License
+conflicts with the conditions of the GPLv2, you may retroactively and
+prospectively choose to deem waived or otherwise exclude such Section(s) of
+the License, but only in their entirety and only with respect to the Combined
+Software.
+
+==============================================================================
+Software from third parties included in the LLVM Project:
+==============================================================================
+The LLVM Project contains third party software which is under different license
+terms. All such code will be identified clearly using at least one of two
+mechanisms:
+1) It will be in a separate directory tree with its own `LICENSE.txt` or
+   `LICENSE` file at the top containing the specific license and restrictions
+   which apply to that software, or
+2) It will contain specific license and restriction terms at the top of every
+   file.
+
+==============================================================================
+Legacy LLVM License (https://llvm.org/docs/DeveloperPolicy.html#legacy):
+==============================================================================
+University of Illinois/NCSA
+Open Source License
+
+Copyright (c) 2010 Apple Inc.
+All rights reserved.
+
+Developed by:
+
+    LLDB Team
+
+    http://lldb.llvm.org/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimers.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimers in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the names of the LLDB Team, copyright holders, nor the names of 
+      its contributors may be used to endorse or promote products derived from 
+      this Software without specific prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
+

Classes/Network/FLEXNetworkCurlLogger.m

@@ -28,12 +28,7 @@
     }
 
     if (request.HTTPBody) {
-        if ([request.allHTTPHeaderFields[@"Content-Length"] intValue] < 1024) {
-            [curlCommandString appendFormat:@"-d \'%@\'",
-             [[NSString alloc] initWithData:request.HTTPBody encoding:NSUTF8StringEncoding]];
-        } else {
-            [curlCommandString appendFormat:@"[TOO MUCH DATA TO INCLUDE]"];
-        }
+            [curlCommandString appendFormat:@"-d \'%@\'", [[NSString alloc] initWithData:request.HTTPBody encoding:NSUTF8StringEncoding]];
     }
 
     return curlCommandString;

Classes/ObjectExplorers/Controllers/FLEXGlobalsTableViewControllerEntry.h

@@ -1,22 +1,28 @@
 //
 //  FLEXGlobalsTableViewControllerEntry.h
-//  UICatalog
+//  FLEX
 //
 //  Created by Javier Soto on 7/26/14.
 //  Copyright (c) 2014 f. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
+@class FLEXGlobalsTableViewController;
 
 typedef NSString *(^FLEXGlobalsTableViewControllerEntryNameFuture)(void);
+/// Simply return a view controller to be pushed on the navigation stack
 typedef UIViewController *(^FLEXGlobalsTableViewControllerViewControllerFuture)(void);
+/// Do something like present an alert, then use the host
+/// view controller to present or push another view controller.
+typedef void (^FLEXGlobalsTableViewControllerRowAction)(FLEXGlobalsTableViewController *host);
 
 @interface FLEXGlobalsTableViewControllerEntry : NSObject
 
 @property (nonatomic, readonly, copy) FLEXGlobalsTableViewControllerEntryNameFuture entryNameFuture;
 @property (nonatomic, readonly, copy) FLEXGlobalsTableViewControllerViewControllerFuture viewControllerFuture;
+@property (nonatomic, readonly, copy) FLEXGlobalsTableViewControllerRowAction rowAction;
 
 + (instancetype)entryWithNameFuture:(FLEXGlobalsTableViewControllerEntryNameFuture)nameFuture viewControllerFuture:(FLEXGlobalsTableViewControllerViewControllerFuture)viewControllerFuture;
++ (instancetype)entryWithNameFuture:(FLEXGlobalsTableViewControllerEntryNameFuture)nameFuture action:(FLEXGlobalsTableViewControllerRowAction)rowSelectedAction;
 
 @end

Classes/ObjectExplorers/Controllers/FLEXGlobalsTableViewControllerEntry.m

@@ -0,0 +1,39 @@
+//
+//  FLEXGlobalsTableViewControllerEntry.m
+//  FLEX
+//
+//  Created by Javier Soto on 7/26/14.
+//  Copyright (c) 2014 f. All rights reserved.
+//
+
+#import "FLEXGlobalsTableViewControllerEntry.h"
+
+@implementation FLEXGlobalsTableViewControllerEntry
+
++ (instancetype)entryWithNameFuture:(FLEXGlobalsTableViewControllerEntryNameFuture)nameFuture
+               viewControllerFuture:(FLEXGlobalsTableViewControllerViewControllerFuture)viewControllerFuture
+{
+    NSParameterAssert(nameFuture);
+    NSParameterAssert(viewControllerFuture);
+
+    FLEXGlobalsTableViewControllerEntry *entry = [[self alloc] init];
+    entry->_entryNameFuture = [nameFuture copy];
+    entry->_viewControllerFuture = [viewControllerFuture copy];
+
+    return entry;
+}
+
++ (instancetype)entryWithNameFuture:(FLEXGlobalsTableViewControllerEntryNameFuture)nameFuture
+                             action:(FLEXGlobalsTableViewControllerRowAction)rowSelectedAction
+{
+    NSParameterAssert(nameFuture);
+    NSParameterAssert(rowSelectedAction);
+
+    FLEXGlobalsTableViewControllerEntry *entry = [[self alloc] init];
+    entry->_entryNameFuture = [nameFuture copy];
+    entry->_rowAction = [rowSelectedAction copy];
+
+    return entry;
+}
+
+@end

Classes/ObjectExplorers/Controllers/FLEXLayerExplorerViewController.h

@@ -1,6 +1,6 @@
 //
 //  FLEXLayerExplorerViewController.h
-//  UICatalog
+//  FLEX
 //
 //  Created by Ryan Olson on 12/14/14.
 //  Copyright (c) 2014 f. All rights reserved.

Classes/ObjectExplorers/Controllers/FLEXLayerExplorerViewController.m

@@ -1,6 +1,6 @@
 //
 //  FLEXLayerExplorerViewController.m
-//  UICatalog
+//  FLEX
 //
 //  Created by Ryan Olson on 12/14/14.
 //  Copyright (c) 2014 f. All rights reserved.

Classes/ObjectExplorers/Controllers/FLEXObjectExplorerViewController.m

@@ -15,6 +15,7 @@
 #import "FLEXIvarEditorViewController.h"
 #import "FLEXMethodCallingViewController.h"
 #import "FLEXInstancesTableViewController.h"
+#import "FLEXTableView.h"
 #import <objc/runtime.h>
 
 typedef NS_ENUM(NSUInteger, FLEXObjectExplorerScope) {
@@ -90,10 +91,19 @@ typedef NS_ENUM(NSUInteger, FLEXMetadataKind) {
 
 @implementation FLEXObjectExplorerViewController
 
-- (id)initWithStyle:(UITableViewStyle)style
++ (void)initialize
 {
-    // Force grouped style
-    return [super initWithStyle:UITableViewStyleGrouped];
+    if (self == [FLEXObjectExplorerViewController class]) {
+        // Initialize custom menu items for entire app
+        UIMenuItem *copyObjectAddress = [[UIMenuItem alloc] initWithTitle:@"Copy Address" action:@selector(copyObjectAddress:)];
+        [UIMenuController sharedMenuController].menuItems = @[copyObjectAddress];
+        [[UIMenuController sharedMenuController] update];
+    }
+}
+
+- (void)loadView
+{
+    self.tableView = [[FLEXTableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
 }
 
 - (void)viewDidLoad
@@ -134,7 +144,8 @@ typedef NS_ENUM(NSUInteger, FLEXMetadataKind) {
 
 #pragma mark - Search
 
-- (void)refreshScopeTitles {
+- (void)refreshScopeTitles
+{
     if (!self.searchBar) return;
 
     Class parent = [self.object superclass];
@@ -172,7 +183,8 @@ typedef NS_ENUM(NSUInteger, FLEXMetadataKind) {
     [self updateDisplayedData];
 }
 
-- (NSArray *)metadata:(FLEXMetadataKind)metadataKind forScope:(FLEXObjectExplorerScope)scope {
+- (NSArray *)metadata:(FLEXMetadataKind)metadataKind forScope:(FLEXObjectExplorerScope)scope
+{
     switch (metadataKind) {
         case FLEXMetadataKindProperties:
             switch (self.scope) {
@@ -221,7 +233,8 @@ typedef NS_ENUM(NSUInteger, FLEXMetadataKind) {
     }
 }
 
-- (NSInteger)totalCountOfMetadata:(FLEXMetadataKind)metadataKind forScope:(FLEXObjectExplorerScope)scope {
+- (NSInteger)totalCountOfMetadata:(FLEXMetadataKind)metadataKind forScope:(FLEXObjectExplorerScope)scope
+{
     return [self metadata:metadataKind forScope:scope].count;
 }
 
@@ -273,20 +286,24 @@ typedef NS_ENUM(NSUInteger, FLEXMetadataKind) {
 
 - (BOOL)shouldShowDescription
 {
-    BOOL showDescription = YES;
-    
-    // Not if it's empty or nil.
-    NSString *descripition = [FLEXUtility safeDescriptionForObject:self.object];
-    if (showDescription) {
-        showDescription = [descripition length] > 0;
-    }
-    
     // Not if we have filter text that doesn't match the desctiption.
-    if (showDescription && [self.filterText length] > 0) {
-        showDescription = [descripition rangeOfString:self.filterText options:NSCaseInsensitiveSearch].length > 0;
+    if (self.filterText.length) {
+        NSString *description = [self displayedObjectDescription];
+        return [description rangeOfString:self.filterText options:NSCaseInsensitiveSearch].length > 0;
     }
     
-    return showDescription;
+    return YES;
+}
+
+- (NSString *)displayedObjectDescription {
+    NSString *desc = [FLEXUtility safeDescriptionForObject:self.object];
+
+    if (!desc.length) {
+        NSString *address = [FLEXUtility addressOfObject:self.object];
+        desc = [NSString stringWithFormat:@"Object at %@ returned empty description", address];
+    }
+
+    return desc;
 }
 
 
@@ -688,7 +705,7 @@ typedef NS_ENUM(NSUInteger, FLEXMetadataKind) {
     NSString *title = nil;
     switch (section) {
         case FLEXObjectExplorerSectionDescription:
-            title = [FLEXUtility safeDescriptionForObject:self.object];
+            title = [self displayedObjectDescription];
             break;
             
         case FLEXObjectExplorerSectionCustom:
@@ -808,19 +825,9 @@ typedef NS_ENUM(NSUInteger, FLEXMetadataKind) {
     return canDrillIn;
 }
 
-- (BOOL)canCopyRow:(NSInteger)row inExplorerSection:(FLEXObjectExplorerSection)section
+- (BOOL)sectionHasActions:(NSInteger)section
 {
-    BOOL canCopy = NO;
-    
-    switch (section) {
-        case FLEXObjectExplorerSectionDescription:
-            canCopy = YES;
-            break;
-            
-        default:
-            break;
-    }
-    return canCopy;
+    return [self explorerSectionAtIndex:section] == FLEXObjectExplorerSectionDescription;
 }
 
 - (NSString *)titleForExplorerSection:(FLEXObjectExplorerSection)section
@@ -1019,45 +1026,65 @@ typedef NS_ENUM(NSUInteger, FLEXMetadataKind) {
 
 - (BOOL)tableView:(UITableView *)tableView shouldShowMenuForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    FLEXObjectExplorerSection explorerSection = [self explorerSectionAtIndex:indexPath.section];
-    BOOL canCopy = [self canCopyRow:indexPath.row inExplorerSection:explorerSection];
-    return canCopy;
+    return [self sectionHasActions:indexPath.section];
 }
 
 - (BOOL)tableView:(UITableView *)tableView canPerformAction:(SEL)action forRowAtIndexPath:(NSIndexPath *)indexPath withSender:(id)sender
 {
-    BOOL canPerformAction = NO;
-    
-    if (action == @selector(copy:)) {
-        FLEXObjectExplorerSection explorerSection = [self explorerSectionAtIndex:indexPath.section];
-        BOOL canCopy = [self canCopyRow:indexPath.row inExplorerSection:explorerSection];
-        canPerformAction = canCopy;
+    FLEXObjectExplorerSection explorerSection = [self explorerSectionAtIndex:indexPath.section];
+    switch (explorerSection) {
+        case FLEXObjectExplorerSectionDescription:
+            return action == @selector(copy:) || action == @selector(copyObjectAddress:);
+
+        default:
+            return NO;
     }
-    
-    return canPerformAction;
 }
 
 - (void)tableView:(UITableView *)tableView performAction:(SEL)action forRowAtIndexPath:(NSIndexPath *)indexPath withSender:(id)sender
 {
-    if (action == @selector(copy:)) {
-        FLEXObjectExplorerSection explorerSection = [self explorerSectionAtIndex:indexPath.section];
-        NSString *stringToCopy = @"";
-        
-        NSString *title = [self titleForRow:indexPath.row inExplorerSection:explorerSection];
-        if ([title length] > 0) {
-            stringToCopy = [stringToCopy stringByAppendingString:title];
-        }
-        
-        NSString *subtitle = [self subtitleForRow:indexPath.row inExplorerSection:explorerSection];
-        if ([subtitle length] > 0) {
-            if ([stringToCopy length] > 0) {
-                stringToCopy = [stringToCopy stringByAppendingString:@"\n\n"];
-            }
-            stringToCopy = [stringToCopy stringByAppendingString:subtitle];
-        }
-        
-        [[UIPasteboard generalPasteboard] setString:stringToCopy];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+    [self performSelector:action withObject:indexPath];
+#pragma clang diagnostic pop
+}
+
+
+#pragma mark - UIMenuController
+
+/// Prevent the search bar from trying to use us as a responder
+///
+/// Our table cells will use the UITableViewDelegate methods
+/// to make sure we can perform the actions we want to
+- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+{
+    return NO;
+}
+
+- (void)copy:(NSIndexPath *)indexPath
+{
+    FLEXObjectExplorerSection explorerSection = [self explorerSectionAtIndex:indexPath.section];
+    NSString *stringToCopy = @"";
+
+    NSString *title = [self titleForRow:indexPath.row inExplorerSection:explorerSection];
+    if (title.length) {
+        stringToCopy = [stringToCopy stringByAppendingString:title];
     }
+
+    NSString *subtitle = [self subtitleForRow:indexPath.row inExplorerSection:explorerSection];
+    if (subtitle.length) {
+        if (stringToCopy.length) {
+            stringToCopy = [stringToCopy stringByAppendingString:@"\n\n"];
+        }
+        stringToCopy = [stringToCopy stringByAppendingString:subtitle];
+    }
+
+    [UIPasteboard generalPasteboard].string = stringToCopy;
+}
+
+- (void)copyObjectAddress:(NSIndexPath *)indexPath
+{
+    [UIPasteboard generalPasteboard].string = [FLEXUtility addressOfObject:self.object];
 }
 
 

Classes/ObjectExplorers/FLEXGlobalsTableViewControllerEntry.m

@@ -1,25 +0,0 @@
-//
-//  FLEXGlobalsTableViewControllerEntry.m
-//  UICatalog
-//
-//  Created by Javier Soto on 7/26/14.
-//  Copyright (c) 2014 f. All rights reserved.
-//
-
-#import "FLEXGlobalsTableViewControllerEntry.h"
-
-@implementation FLEXGlobalsTableViewControllerEntry
-
-+ (instancetype)entryWithNameFuture:(FLEXGlobalsTableViewControllerEntryNameFuture)nameFuture viewControllerFuture:(FLEXGlobalsTableViewControllerViewControllerFuture)viewControllerFuture
-{
-    NSParameterAssert(nameFuture);
-    NSParameterAssert(viewControllerFuture);
-
-    FLEXGlobalsTableViewControllerEntry *entry = [[self alloc] init];
-    entry->_entryNameFuture = [nameFuture copy];
-    entry->_viewControllerFuture = [viewControllerFuture copy];
-
-    return entry;
-}
-
-@end

Classes/ObjectExplorers/Views/FLEXMultilineTableViewCell.h

@@ -1,16 +1,16 @@
 //
 //  FLEXMultilineTableViewCell.h
-//  UICatalog
+//  FLEX
 //
 //  Created by Ryan Olson on 2/13/15.
 //  Copyright (c) 2015 f. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+#import "FLEXTableViewCell.h"
 
 extern NSString *const kFLEXMultilineTableViewCellIdentifier;
 
-@interface FLEXMultilineTableViewCell : UITableViewCell
+@interface FLEXMultilineTableViewCell : FLEXTableViewCell
 
 + (CGFloat)preferredHeightWithAttributedText:(NSAttributedString *)attributedText inTableViewWidth:(CGFloat)tableViewWidth style:(UITableViewStyle)style showsAccessory:(BOOL)showsAccessory;
 

Classes/ObjectExplorers/Views/FLEXMultilineTableViewCell.m

@@ -1,6 +1,6 @@
 //
 //  FLEXMultilineTableViewCell.m
-//  UICatalog
+//  FLEX
 //
 //  Created by Ryan Olson on 2/13/15.
 //  Copyright (c) 2015 f. All rights reserved.

Classes/ObjectExplorers/Views/FLEXSubtitleTableViewCell.h

@@ -0,0 +1,17 @@
+//
+//  FLEXSubtitleTableViewCell.h
+//  FLEX
+//
+//  Created by Tanner on 4/17/19.
+//  Copyright © 2019 Flipboard. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FLEXSubtitleTableViewCell : UITableViewCell
+
+@end
+
+NS_ASSUME_NONNULL_END

Classes/ObjectExplorers/Views/FLEXSubtitleTableViewCell.m

@@ -0,0 +1,18 @@
+//
+//  FLEXSubtitleTableViewCell.m
+//  FLEX
+//
+//  Created by Tanner on 4/17/19.
+//  Copyright © 2019 Flipboard. All rights reserved.
+//
+
+#import "FLEXSubtitleTableViewCell.h"
+
+@implementation FLEXSubtitleTableViewCell
+
+- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    return [super initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:reuseIdentifier];
+}
+
+@end

Classes/ObjectExplorers/Views/FLEXTableView.h

@@ -0,0 +1,17 @@
+//
+//  FLEXTableView.h
+//  FLEX
+//
+//  Created by Tanner on 4/17/19.
+//  Copyright © 2019 Flipboard. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface FLEXTableView : UITableView
+
+@property (nonatomic, readonly) NSString *defaultReuseIdentifier;
+@property (nonatomic, readonly) NSString *subtitleReuseIdentifier;
+@property (nonatomic, readonly) NSString *multilineReuseIdentifier;
+
+@end

Classes/ObjectExplorers/Views/FLEXTableView.m

@@ -0,0 +1,47 @@
+//
+//  FLEXTableView.m
+//  FLEX
+//
+//  Created by Tanner on 4/17/19.
+//  Copyright © 2019 Flipboard. All rights reserved.
+//
+
+#import "FLEXTableView.h"
+#import "FLEXSubtitleTableViewCell.h"
+#import "FLEXMultilineTableViewCell.h"
+
+@implementation FLEXTableView
+
+- (id)initWithFrame:(CGRect)frame style:(UITableViewStyle)style
+{    self = [super initWithFrame:frame style:style];
+    if (self) {
+        [self registerCells:@{
+            self.defaultReuseIdentifier: [FLEXTableViewCell class],
+            self.subtitleReuseIdentifier: [FLEXSubtitleTableViewCell class],
+            self.multilineReuseIdentifier: [FLEXMultilineTableViewCell class],
+        }];
+    }
+
+    return self;
+}
+
+- (void)registerCells:(NSDictionary<NSString*,Class> *)registrationMapping
+{    [registrationMapping enumerateKeysAndObjectsUsingBlock:^(NSString *identifier, Class cellClass, BOOL *stop) {
+        [self registerClass:cellClass forCellReuseIdentifier:identifier];
+    }];
+}
+
+- (NSString *)defaultReuseIdentifier
+{    return @"kFLEXTableViewCellIdentifier";
+}
+
+- (NSString *)subtitleReuseIdentifier
+{    return @"kFLEXSubtitleTableViewCellIdentifier";
+}
+
+- (NSString *)multilineReuseIdentifier
+{
+    return kFLEXMultilineTableViewCellIdentifier;
+}
+
+@end

Classes/ObjectExplorers/Views/FLEXTableViewCell.h

@@ -0,0 +1,13 @@
+//
+//  FLEXTableViewCell.h
+//  FLEX
+//
+//  Created by Tanner on 4/17/19.
+//  Copyright © 2019 Flipboard. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface FLEXTableViewCell : UITableViewCell
+
+@end

Classes/ObjectExplorers/Views/FLEXTableViewCell.m

@@ -0,0 +1,77 @@
+//
+//  FLEXTableViewCell.m
+//  FLEX
+//
+//  Created by Tanner on 4/17/19.
+//  Copyright © 2019 Flipboard. All rights reserved.
+//
+
+#import "FLEXTableViewCell.h"
+#import "FLEXUtility.h"
+#import "FLEXTableView.h"
+
+@interface UITableView (Internal)
+// Exists at least since iOS 5
+- (BOOL)_canPerformAction:(SEL)action forCell:(UITableViewCell *)cell sender:(id)sender;
+- (void)_performAction:(SEL)action forCell:(UITableViewCell *)cell sender:(id)sender;
+@end
+
+@interface UITableViewCell (Internal)
+// Exists at least since iOS 5
+@property (nonatomic, readonly) FLEXTableView *_tableView;
+@end
+
+@implementation FLEXTableViewCell
+
+- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self) {
+        UIFont *cellFont = [FLEXUtility defaultTableViewCellLabelFont];
+        self.textLabel.font = cellFont;
+        self.detailTextLabel.font = cellFont;
+        self.detailTextLabel.textColor = [UIColor grayColor];
+    }
+
+    return self;
+}
+
+- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+{
+    return [self._tableView _canPerformAction:action forCell:self sender:sender];
+}
+
+/// We use this to allow our table view to allow its delegate
+/// to handle any action it chooses to support, without
+/// explicitly implementing the method ourselelves.
+///
+/// Alternative considered: override respondsToSelector
+/// to return NO. I decided against this for simplicity's
+/// sake. I see this as "fixing" a poorly designed API.
+/// That approach would require lots of boilerplate to
+/// make the menu appear above this cell.
+- (void)forwardInvocation:(NSInvocation *)invocation
+{
+    // Must be unretained to avoid over-releasing
+    __unsafe_unretained id sender;
+    [invocation getArgument:&sender atIndex:2];
+    SEL action = invocation.selector;
+
+    // [self._tableView _performAction:action forCell:[self retain] sender:[sender retain]];
+    invocation.selector = @selector(_performAction:forCell:sender:);
+    [invocation setArgument:&action atIndex:2];
+    [invocation setArgument:(void *)&self atIndex:3];
+    [invocation setArgument:(void *)&sender atIndex:4];
+    [invocation invokeWithTarget:self._tableView];
+}
+
+- (NSMethodSignature *)methodSignatureForSelector:(SEL)selector
+{
+    if ([self canPerformAction:selector withSender:nil]) {
+        return [self._tableView methodSignatureForSelector:@selector(_performAction:forCell:sender:)];
+    }
+
+    return [super methodSignatureForSelector:selector];
+}
+
+@end

Classes/Utility/FLEXHeapEnumerator.m

@@ -73,6 +73,9 @@ static kern_return_t reader(__unused task_t remote_task, vm_address_t remote_add
             malloc_introspection_t *introspection = zone->introspect;
             NSString *zoneName = @(zone->zone_name);
 
+            // We only need to look at the default malloc zone.
+            // This may explain why some zone functions are
+            // sometimes invalid; perhaps not all zones support them?
             if (![zoneName isEqualToString:@"DefaultMallocZone"] || !introspection) {
                 continue;
             }
@@ -90,20 +93,23 @@ static kern_return_t reader(__unused task_t remote_task, vm_address_t remote_add
             // The largest realistic memory address varies by platform.
             // Only 48 bits are used by 64 bit machines while
             // 32 bit machines use all bits.
-#if __arm64__
-            static uintptr_t MAX_REALISTIC_ADDRESS = 0xFFFFFFFFFFFF;
+            //
+            // __LP64__ is defined as 1 for both arm64 and x86_64
+            // via: clang -dM -arch [arm64|x86_64] -E -x c /dev/null | grep LP
+#if __LP64__
+            static uintptr_t MAX_REALISTIC_ADDRESS = 0x0000FFFFFFFFFFFF;
+            BOOL lockZoneValid = lock_zone != nil && (uintptr_t)lock_zone < MAX_REALISTIC_ADDRESS;
+            BOOL unlockZoneValid = unlock_zone != nil && (uintptr_t)unlock_zone < MAX_REALISTIC_ADDRESS;
 #else
-            static uintptr_t MAX_REALISTIC_ADDRESS = INT_MAX;
+            BOOL lockZoneValid = lock_zone != nil;
+            BOOL unlockZoneValid = unlock_zone != nil;
 #endif
 
             // There is little documentation on when and why
             // any of these function pointers might be NULL
             // or garbage, so we resort to checking for NULL
             // and impossible memory addresses at least
-            if (lock_zone && unlock_zone &&
-                introspection->enumerator &&
-                (uintptr_t)lock_zone < MAX_REALISTIC_ADDRESS &&
-                (uintptr_t)unlock_zone < MAX_REALISTIC_ADDRESS) {
+            if (introspection->enumerator && lockZoneValid && unlockZoneValid) {
                 lock_zone(zone);
                 introspection->enumerator(TASK_NULL, (void *)&callback, MALLOC_PTR_IN_USE_RANGE_TYPE, (vm_address_t)zone, reader, &range_callback);
                 unlock_zone(zone);

Classes/Utility/FLEXKeyboardHelpViewController.h

@@ -1,6 +1,6 @@
 //
 //  FLEXKeyboardHelpViewController.h
-//  UICatalog
+//  FLEX
 //
 //  Created by Ryan Olson on 9/19/15.
 //  Copyright © 2015 f. All rights reserved.

Classes/Utility/FLEXKeyboardHelpViewController.m

@@ -1,6 +1,6 @@
 //
 //  FLEXKeyboardHelpViewController.m
-//  UICatalog
+//  FLEX
 //
 //  Created by Ryan Olson on 9/19/15.
 //  Copyright © 2015 f. All rights reserved.

Classes/Utility/FLEXObjcInternal.mm

@@ -30,7 +30,10 @@
 
 #import "FLEXObjcInternal.h"
 #import <objc/runtime.h>
+// For malloc_size
 #import <malloc/malloc.h>
+// For vm_region_64
+#include <mach/mach.h>
 
 #define ALWAYS_INLINE inline __attribute__((always_inline))
 #define NEVER_INLINE inline __attribute__((noinline))
@@ -40,14 +43,18 @@
 // as few modifications as possible. Changes are noted in boxed comments.
 // https://opensource.apple.com/source/objc4/objc4-723/
 // https://opensource.apple.com/source/objc4/objc4-723/runtime/objc-internal.h.auto.html
-// https://opensource.apple.com/source/objc4/objc4-723/runtime/objc-private.h.auto.html
-// https://opensource.apple.com/source/objc4/objc4-723/runtime/objc-config.h.auto.html
 // https://opensource.apple.com/source/objc4/objc4-723/runtime/objc-object.h.auto.html
 
 /////////////////////
 // objc-internal.h //
 /////////////////////
 
+#if __LP64__
+#define OBJC_HAVE_TAGGED_POINTERS 1
+#endif
+
+#if OBJC_HAVE_TAGGED_POINTERS
+
 #if TARGET_OS_OSX && __x86_64__
 // 64-bit Mac - tag bit is LSB
 #   define OBJC_MSB_TAGGED_POINTERS 0
@@ -56,38 +63,12 @@
 #   define OBJC_MSB_TAGGED_POINTERS 1
 #endif
 
-#define _OBJC_TAG_INDEX_MASK 0x7
-// array slot includes the tag bit itself
-#define _OBJC_TAG_SLOT_COUNT 16
-#define _OBJC_TAG_SLOT_MASK 0xf
-
-#define _OBJC_TAG_EXT_INDEX_MASK 0xff
-// array slot has no extra bits
-#define _OBJC_TAG_EXT_SLOT_COUNT 256
-#define _OBJC_TAG_EXT_SLOT_MASK 0xff
-
 #if OBJC_MSB_TAGGED_POINTERS
 #   define _OBJC_TAG_MASK (1UL<<63)
-#   define _OBJC_TAG_INDEX_SHIFT 60
-#   define _OBJC_TAG_SLOT_SHIFT 60
-#   define _OBJC_TAG_PAYLOAD_LSHIFT 4
-#   define _OBJC_TAG_PAYLOAD_RSHIFT 4
 #   define _OBJC_TAG_EXT_MASK (0xfUL<<60)
-#   define _OBJC_TAG_EXT_INDEX_SHIFT 52
-#   define _OBJC_TAG_EXT_SLOT_SHIFT 52
-#   define _OBJC_TAG_EXT_PAYLOAD_LSHIFT 12
-#   define _OBJC_TAG_EXT_PAYLOAD_RSHIFT 12
 #else
 #   define _OBJC_TAG_MASK 1UL
-#   define _OBJC_TAG_INDEX_SHIFT 1
-#   define _OBJC_TAG_SLOT_SHIFT 0
-#   define _OBJC_TAG_PAYLOAD_LSHIFT 0
-#   define _OBJC_TAG_PAYLOAD_RSHIFT 4
 #   define _OBJC_TAG_EXT_MASK 0xfUL
-#   define _OBJC_TAG_EXT_INDEX_SHIFT 4
-#   define _OBJC_TAG_EXT_SLOT_SHIFT 4
-#   define _OBJC_TAG_EXT_PAYLOAD_LSHIFT 0
-#   define _OBJC_TAG_EXT_PAYLOAD_RSHIFT 12
 #endif
 
 //////////////////////////////////////
@@ -98,137 +79,6 @@ static BOOL flex_isTaggedPointer(const void *ptr)
     return ((uintptr_t)ptr & _OBJC_TAG_MASK) == _OBJC_TAG_MASK;
 }
 
-///////////////////
-// objc-config.h //
-///////////////////
-
-// Define SUPPORT_INDEXED_ISA=1 on platforms that store the class in the isa 
-// field as an index into a class table.
-#if __ARM_ARCH_7K__ >= 2
-#   define SUPPORT_INDEXED_ISA 1
-#else
-#   define SUPPORT_INDEXED_ISA 0
-#endif
-
-// Define SUPPORT_PACKED_ISA=1 on platforms that store the class in the isa 
-// field as a maskable pointer with other data around it.
-#if (!__LP64__  ||  TARGET_OS_WIN32  ||  TARGET_OS_SIMULATOR)
-#   define SUPPORT_PACKED_ISA 0
-#else
-#   define SUPPORT_PACKED_ISA 1
-#endif
-
-// Define SUPPORT_NONPOINTER_ISA=1 on any platform that may store something
-// in the isa field that is not a raw pointer.
-#if !SUPPORT_INDEXED_ISA  &&  !SUPPORT_PACKED_ISA
-#   define SUPPORT_NONPOINTER_ISA 0
-#else
-#   define SUPPORT_NONPOINTER_ISA 1
-#endif
-
-////////////////////
-// objc-private.h //
-////////////////////
-
-union isa_t 
-{
-    isa_t() { }
-    isa_t(uintptr_t value) : bits(value) { }
-    
-    Class cls;
-    uintptr_t bits;
-    
-#if SUPPORT_PACKED_ISA
-    
-    // extra_rc must be the MSB-most field (so it matches carry/overflow flags)
-    // nonpointer must be the LSB (fixme or get rid of it)
-    // shiftcls must occupy the same bits that a real class pointer would
-    // bits + RC_ONE is equivalent to extra_rc + 1
-    // RC_HALF is the high bit of extra_rc (i.e. half of its range)
-    
-    // future expansion:
-    // uintptr_t fast_rr : 1;     // no r/r overrides
-    // uintptr_t lock : 2;        // lock for atomic property, @synch
-    // uintptr_t extraBytes : 1;  // allocated with extra bytes
-    
-# if __arm64__
-#   define ISA_MASK        0x0000000ffffffff8ULL
-#   define ISA_MAGIC_MASK  0x000003f000000001ULL
-#   define ISA_MAGIC_VALUE 0x000001a000000001ULL
-    struct {
-        uintptr_t nonpointer        : 1;
-        uintptr_t has_assoc         : 1;
-        uintptr_t has_cxx_dtor      : 1;
-        uintptr_t shiftcls          : 33; // MACH_VM_MAX_ADDRESS 0x1000000000
-        uintptr_t magic             : 6;
-        uintptr_t weakly_referenced : 1;
-        uintptr_t deallocating      : 1;
-        uintptr_t has_sidetable_rc  : 1;
-        uintptr_t extra_rc          : 19;
-#       define RC_ONE   (1ULL<<45)
-#       define RC_HALF  (1ULL<<18)
-    };
-    
-# elif __x86_64__
-#   define ISA_MASK        0x00007ffffffffff8ULL
-#   define ISA_MAGIC_MASK  0x001f800000000001ULL
-#   define ISA_MAGIC_VALUE 0x001d800000000001ULL
-    struct {
-        uintptr_t nonpointer        : 1;
-        uintptr_t has_assoc         : 1;
-        uintptr_t has_cxx_dtor      : 1;
-        uintptr_t shiftcls          : 44; // MACH_VM_MAX_ADDRESS 0x7fffffe00000
-        uintptr_t magic             : 6;
-        uintptr_t weakly_referenced : 1;
-        uintptr_t deallocating      : 1;
-        uintptr_t has_sidetable_rc  : 1;
-        uintptr_t extra_rc          : 8;
-#       define RC_ONE   (1ULL<<56)
-#       define RC_HALF  (1ULL<<7)
-    };
-    
-# else
-#   error unknown architecture for packed isa
-# endif
-    
-    // SUPPORT_PACKED_ISA
-#endif
-    
-    
-#if SUPPORT_INDEXED_ISA
-    
-# if  __ARM_ARCH_7K__ >= 2
-    
-#   define ISA_INDEX_IS_NPI      1
-#   define ISA_INDEX_MASK        0x0001FFFC
-#   define ISA_INDEX_SHIFT       2
-#   define ISA_INDEX_BITS        15
-#   define ISA_INDEX_COUNT       (1 << ISA_INDEX_BITS)
-#   define ISA_INDEX_MAGIC_MASK  0x001E0001
-#   define ISA_INDEX_MAGIC_VALUE 0x001C0001
-    struct {
-        uintptr_t nonpointer        : 1;
-        uintptr_t has_assoc         : 1;
-        uintptr_t indexcls          : 15;
-        uintptr_t magic             : 4;
-        uintptr_t has_cxx_dtor      : 1;
-        uintptr_t weakly_referenced : 1;
-        uintptr_t deallocating      : 1;
-        uintptr_t has_sidetable_rc  : 1;
-        uintptr_t extra_rc          : 7;
-#       define RC_ONE   (1ULL<<25)
-#       define RC_HALF  (1ULL<<6)
-    };
-    
-# else
-#   error unknown architecture for indexed isa
-# endif
-    
-    // SUPPORT_INDEXED_ISA
-#endif
-    
-};
-
 ///////////////////
 // objc-object.h //
 ///////////////////
@@ -241,27 +91,7 @@ static BOOL flex_isExtTaggedPointer(const void *ptr)
     return ((uintptr_t)ptr & _OBJC_TAG_EXT_MASK) == _OBJC_TAG_EXT_MASK;
 }
 
-struct flex_objc_object {
-    isa_t isa;
-};
-
-//////////////////////////////////////////////////////////
-// Returns nil on platforms without nonpointer isa.     //
-// Supporting those platforms would be too complicated  //
-// for such a niche feature anyway. - @NSExceptional    //
-//                                                      //
-// Code modified from objc_object::ISA() on 11/04/18    //
-//////////////////////////////////////////////////////////
-static id flex_getIsa(const flex_objc_object *object) {
-#if SUPPORT_NONPOINTER_ISA
-    if (object->isa.nonpointer) {
-        return object_getClass((__bridge id)object);
-    }
-    return (__bridge Class)(void *)object->isa.bits;
-#else
-    return nil;
 #endif
-}
 
 /////////////////////////////////////
 // FLEXObjectInternal              //
@@ -269,27 +99,70 @@ static id flex_getIsa(const flex_objc_object *object) {
 /////////////////////////////////////
 
 extern "C" {
-/// Assumes memory is valid and readable.
+
+static BOOL FLEXPointerIsReadable(const void *inPtr)
+{
+    kern_return_t error = KERN_SUCCESS;
+
+    vm_size_t vmsize;
+    vm_address_t address = (vm_address_t)inPtr;
+    vm_region_basic_info_data_t info;
+    mach_msg_type_number_t info_count = VM_REGION_BASIC_INFO_COUNT_64;
+    memory_object_name_t object;
+
+    error = vm_region_64(
+        mach_task_self(),
+        &address,
+        &vmsize,
+        VM_REGION_BASIC_INFO,
+        (vm_region_info_t)&info,
+        &info_count,
+        &object
+    );
+
+    if (error != KERN_SUCCESS) {
+        // vm_region/vm_region_64 returned an error
+        return NO;
+    } else if (!(BOOL)(info.protection & VM_PROT_READ)) {
+        return NO;
+    }
+
+    // Read the memory
+    vm_offset_t readMem = 0;
+    mach_msg_type_number_t size = 0;
+    address = (vm_address_t)inPtr;
+    error = vm_read(mach_task_self(), address, sizeof(uintptr_t), &readMem, &size);
+    if (error != KERN_SUCCESS) {
+        // vm_read returned an error
+        return NO;
+    }
+
+    return YES;
+}
+
+/// Accepts addresses that may or may not be readable.
 /// https://blog.timac.org/2016/1124-testing-if-an-arbitrary-pointer-is-a-valid-objective-c-object/
-BOOL FLEXPointerIsValidObjcObject(const void * ptr)
+BOOL FLEXPointerIsValidObjcObject(const void *ptr)
 {
     uintptr_t pointer = (uintptr_t)ptr;
-    
+
     if (!ptr) {
         return NO;
     }
-    
+
+#if OBJC_HAVE_TAGGED_POINTERS
     // Tagged pointers have 0x1 set, no other valid pointers do
     // objc-internal.h -> _objc_isTaggedPointer()
     if (flex_isTaggedPointer(ptr) || flex_isExtTaggedPointer(ptr)) {
         return YES;
     }
-    
+#endif
+
     // Check pointer alignment
     if ((pointer % sizeof(uintptr_t)) != 0) {
         return NO;
     }
-    
+
     // From LLDB:
     // Pointers in a class_t will only have bits 0 through 46 set,
     // so if any pointer has bits 47 through 63 high, we know that this is not a valid isa
@@ -297,13 +170,19 @@ BOOL FLEXPointerIsValidObjcObject(const void * ptr)
     if ((pointer & 0xFFFF800000000000) != 0) {
         return NO;
     }
-    
-    // http://www.sealiesoftware.com/blog/archive/2013/09/24/objc_explain_Non-pointer_isa.html :
-    if (flex_getIsa((const flex_objc_object *)ptr)) {
-        return YES;
+
+    // Make sure dereferencing this address won't crash
+    if (!FLEXPointerIsReadable(ptr)) {
+        return NO;
     }
-    
-    return NO;
+
+    // http://www.sealiesoftware.com/blog/archive/2013/09/24/objc_explain_Non-pointer_isa.html :
+    if (!object_getClass((__bridge id)ptr)) {
+        return NO;
+    }
+
+    return YES;
 }
+
     
 }

Classes/Utility/FLEXUtility.h

@@ -34,6 +34,7 @@
 + (NSString *)applicationImageName;
 + (NSString *)applicationName;
 + (NSString *)safeDescriptionForObject:(id)object;
++ (NSString *)addressOfObject:(id)object;
 + (UIFont *)defaultFontOfSize:(CGFloat)size;
 + (UIFont *)defaultTableViewCellLabelFont;
 + (NSString *)stringByEscapingHTMLEntitiesInString:(NSString *)originalString;
@@ -51,6 +52,8 @@
 
 + (NSArray<UIWindow *> *)allWindows;
 
++ (void)alert:(NSString *)title message:(NSString *)message from:(UIViewController *)viewController;
+
 // Swizzling utilities
 
 + (SEL)swizzledSelectorForSelector:(SEL)selector;

Classes/Utility/FLEXUtility.m

@@ -48,7 +48,7 @@
 + (UIViewController *)viewControllerForView:(UIView *)view
 {
     UIViewController *viewController = nil;
-    SEL viewDelSel = NSSelectorFromString([NSString stringWithFormat:@"%@ewDelegate", @"_vi"]);
+    SEL viewDelSel = NSSelectorFromString(@"_viewDelegate");
     if ([view respondsToSelector:viewDelSel]) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
@@ -58,7 +58,8 @@
     return viewController;
 }
 
-+ (UIViewController *)viewControllerForAncestralView:(UIView *)view{
++ (UIViewController *)viewControllerForAncestralView:(UIView *)view
+{
     UIViewController *viewController = nil;
     SEL viewDelSel = NSSelectorFromString([NSString stringWithFormat:@"%@ewControllerForAncestor", @"_vi"]);
     if ([view respondsToSelector:viewDelSel]) {
@@ -126,6 +127,11 @@
     return description;
 }
 
++ (NSString *)addressOfObject:(id)object
+{
+    return [NSString stringWithFormat:@"%p", object];
+}
+
 + (UIFont *)defaultFontOfSize:(CGFloat)size
 {
     return [UIFont fontWithName:@"HelveticaNeue" size:size];
@@ -249,7 +255,8 @@
     return httpResponseString;
 }
 
-+ (BOOL)isErrorStatusCodeFromURLResponse:(NSURLResponse *)response {
++ (BOOL)isErrorStatusCodeFromURLResponse:(NSURLResponse *)response
+{
     NSIndexSet *errorStatusCodes = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(400, 200)];
     
     if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
@@ -260,7 +267,6 @@
     return NO;
 }
 
-
 + (NSDictionary<NSString *, id> *)dictionaryFromQuery:(NSString *)query
 {
     NSMutableDictionary<NSString *, id> *queryDictionary = [NSMutableDictionary dictionary];
@@ -372,6 +378,15 @@
     return windows;
 }
 
++ (void)alert:(NSString *)title message:(NSString *)message from:(UIViewController *)viewController
+{
+    [[[UIAlertView alloc] initWithTitle:title
+                                message:message
+                               delegate:nil
+                      cancelButtonTitle:nil
+                      otherButtonTitles:@"Dismiss", nil] show];
+}
+
 + (SEL)swizzledSelectorForSelector:(SEL)selector
 {
     return NSSelectorFromString([NSString stringWithFormat:@"_flex_swizzle_%x_%@", arc4random(), NSStringFromSelector(selector)]);

Example/UICatalog.xcodeproj/project.pbxproj

@@ -45,9 +45,12 @@
 		535682BF18F3670300BAAD62 /* UIColor+AAPLApplicationSpecific.m in Sources */ = {isa = PBXBuildFile; fileRef = 535682A618F3670300BAAD62 /* UIColor+AAPLApplicationSpecific.m */; };
 		53874F9918F36B1800510922 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 53874F9718F36B1800510922 /* Localizable.strings */; };
 		779B1EF51C0C4F25001F5E49 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 779B1EF41C0C4F25001F5E49 /* libsqlite3.dylib */; };
-		9420A1AD1C1E84EE00B587DF /* FLEX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9420A1AC1C1E84EE00B587DF /* FLEX.framework */; };
 		943203FE1978F42F00E24DB3 /* AAPLCatalogTableTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 943203FD1978F42F00E24DB3 /* AAPLCatalogTableTableViewController.m */; };
 		94CB4D431A97183E0054A905 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 94CB4D421A97183E0054A905 /* libz.dylib */; };
+		C34C811A22678CF5006C4D4B /* Person.m in Sources */ = {isa = PBXBuildFile; fileRef = C34C811922678CF5006C4D4B /* Person.m */; };
+		C3EF50CD22610FE200B0BE49 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = C3EF50CC22610FE200B0BE49 /* LaunchScreen.xib */; };
+		C3FB77E52266367F00DF4E73 /* FLEX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3FB77E42266367F00DF4E73 /* FLEX.framework */; };
+		C3FB77E6226636AA00DF4E73 /* FLEX.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C3FB77E42266367F00DF4E73 /* FLEX.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -57,6 +60,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				C3FB77E6226636AA00DF4E73 /* FLEX.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -132,10 +136,13 @@
 		535682A618F3670300BAAD62 /* UIColor+AAPLApplicationSpecific.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+AAPLApplicationSpecific.m"; sourceTree = "<group>"; };
 		53874F9818F36B1800510922 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		779B1EF41C0C4F25001F5E49 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = ../../../../../../usr/lib/libsqlite3.dylib; sourceTree = "<group>"; };
-		9420A1AC1C1E84EE00B587DF /* FLEX.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FLEX.framework; path = "../../../Library/Developer/Xcode/DerivedData/FLEX-gixtctkeshzdbwbdapvulcvleeiu/Build/Products/Debug-iphoneos/FLEX.framework"; sourceTree = "<group>"; };
 		943203FC1978F42F00E24DB3 /* AAPLCatalogTableTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AAPLCatalogTableTableViewController.h; sourceTree = "<group>"; };
 		943203FD1978F42F00E24DB3 /* AAPLCatalogTableTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AAPLCatalogTableTableViewController.m; sourceTree = "<group>"; };
 		94CB4D421A97183E0054A905 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
+		C34C811822678CF5006C4D4B /* Person.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Person.h; sourceTree = "<group>"; };
+		C34C811922678CF5006C4D4B /* Person.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Person.m; sourceTree = "<group>"; };
+		C3EF50CC22610FE200B0BE49 /* LaunchScreen.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
+		C3FB77E42266367F00DF4E73 /* FLEX.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = FLEX.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -143,7 +150,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9420A1AD1C1E84EE00B587DF /* FLEX.framework in Frameworks */,
+				C3FB77E52266367F00DF4E73 /* FLEX.framework in Frameworks */,
 				779B1EF51C0C4F25001F5E49 /* libsqlite3.dylib in Frameworks */,
 				94CB4D431A97183E0054A905 /* libz.dylib in Frameworks */,
 				5356824018F3656900BAAD62 /* CoreGraphics.framework in Frameworks */,
@@ -188,7 +195,7 @@
 		5356823C18F3656900BAAD62 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				9420A1AC1C1E84EE00B587DF /* FLEX.framework */,
+				C3FB77E42266367F00DF4E73 /* FLEX.framework */,
 				779B1EF41C0C4F25001F5E49 /* libsqlite3.dylib */,
 				94CB4D421A97183E0054A905 /* libz.dylib */,
 				5356823D18F3656900BAAD62 /* Foundation.framework */,
@@ -216,6 +223,7 @@
 				5356824518F3656900BAAD62 /* UICatalog-Info.plist */,
 				5356824B18F3656900BAAD62 /* UICatalog-Prefix.pch */,
 				53874F9718F36B1800510922 /* Localizable.strings */,
+				C3EF50CC22610FE200B0BE49 /* LaunchScreen.xib */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -292,6 +300,8 @@
 				535682A618F3670300BAAD62 /* UIColor+AAPLApplicationSpecific.m */,
 				5356824F18F3656900BAAD62 /* Main_iPhone.storyboard */,
 				5356825218F3656900BAAD62 /* Main_iPad.storyboard */,
+				C34C811822678CF5006C4D4B /* Person.h */,
+				C34C811922678CF5006C4D4B /* Person.m */,
 			);
 			name = Application;
 			sourceTree = "<group>";
@@ -332,12 +342,17 @@
 		5356823218F3656900BAAD62 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = f;
+				TargetAttributes = {
+					5356823918F3656900BAAD62 = {
+						DevelopmentTeam = S6N2F22V2Z;
+					};
+				};
 			};
 			buildConfigurationList = 5356823518F3656900BAAD62 /* Build configuration list for PBXProject "UICatalog" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -361,6 +376,7 @@
 				22679D5D1C741A7A002248FC /* dogs.realm in Resources */,
 				5356825418F3656900BAAD62 /* Main_iPad.storyboard in Resources */,
 				53874F9918F36B1800510922 /* Localizable.strings in Resources */,
+				C3EF50CD22610FE200B0BE49 /* LaunchScreen.xib in Resources */,
 				5356825918F3656900BAAD62 /* Images.xcassets in Resources */,
 				3EC6487318FF8A5000024205 /* ReadMe.txt in Resources */,
 				5356825118F3656900BAAD62 /* Main_iPhone.storyboard in Resources */,
@@ -386,6 +402,7 @@
 				535682AF18F3670300BAAD62 /* AAPLDefaultSearchBarViewController.m in Sources */,
 				535682BC18F3670300BAAD62 /* AAPLTextViewController.m in Sources */,
 				535682B418F3670300BAAD62 /* AAPLPickerViewController.m in Sources */,
+				C34C811A22678CF5006C4D4B /* Person.m in Sources */,
 				535682BE18F3670300BAAD62 /* AAPLWebViewController.m in Sources */,
 				535682BB18F3670300BAAD62 /* AAPLTextFieldViewController.m in Sources */,
 				535682BF18F3670300BAAD62 /* UIColor+AAPLApplicationSpecific.m in Sources */,
@@ -440,6 +457,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -493,6 +511,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -539,7 +558,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				DEVELOPMENT_TEAM = S6N2F22V2Z;
 				EXCLUDED_SOURCE_FILE_NAMES = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -549,7 +568,7 @@
 				GCC_PREFIX_HEADER = "UICatalog/UICatalog-Prefix.pch";
 				INFOPLIST_FILE = "UICatalog/UICatalog-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.example.apple-samplecode.UICatalog";
+				PRODUCT_BUNDLE_IDENTIFIER = com.flipboard.FLEX.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -559,7 +578,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				DEVELOPMENT_TEAM = S6N2F22V2Z;
 				EXCLUDED_SOURCE_FILE_NAMES = "FLEX*";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -569,7 +588,7 @@
 				GCC_PREFIX_HEADER = "UICatalog/UICatalog-Prefix.pch";
 				INFOPLIST_FILE = "UICatalog/UICatalog-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.example.apple-samplecode.UICatalog";
+				PRODUCT_BUNDLE_IDENTIFIER = com.flipboard.FLEX.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};

Example/UICatalog.xcodeproj/xcshareddata/xcschemes/UICatalog.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/UICatalog/AAPLAppDelegate.m

@@ -49,6 +49,7 @@
 
 #if DEBUG
 #import <FLEX/FLEX.h>
+#import "Person.h"
 #if __has_include(<Realm/Realm.h>)
 #import "Dog.h"
 #import "Owner.h"
@@ -71,6 +72,10 @@
     [self sendExampleNetworkRequests];
     self.repeatingLogExampleTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(sendExampleLogMessage) userInfo:nil repeats:YES];
 
+    // For testing unarchiving of objects
+    NSString *documents = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES)[0];
+    NSString *whereToSaveBob = [documents stringByAppendingPathComponent:@"Bob.plist"];
+    [NSKeyedArchiver archiveRootObject:[Person bob] toFile:whereToSaveBob];
 #if __has_include(<Realm/Realm.h>)
     [self setUpRealm];
 #endif

Example/UICatalog/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,20 +1,55 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
       "scale" : "2x"
     },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "40x40",
       "scale" : "2x"
     },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "2x"
     },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "idiom" : "ipad",
       "size" : "29x29",
@@ -44,6 +79,16 @@
       "idiom" : "ipad",
       "size" : "76x76",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Example/UICatalog/Images.xcassets/LaunchImage.launchimage/Contents.json

@@ -1,74 +0,0 @@
-{
-  "images" : [
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "736h",
-      "filename" : "iPhone6PlusPortrait.png",
-      "minimum-system-version" : "8.0",
-      "orientation" : "portrait",
-      "scale" : "3x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "736h",
-      "filename" : "iPhone6PlusLandscape.png",
-      "minimum-system-version" : "8.0",
-      "orientation" : "landscape",
-      "scale" : "3x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "667h",
-      "filename" : "iPhone6Portrait.png",
-      "minimum-system-version" : "8.0",
-      "orientation" : "portrait",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "filename" : "Launch@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "retina4",
-      "filename" : "Launch@2x~568h.png",
-      "minimum-system-version" : "7.0",
-      "orientation" : "portrait",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "filename" : "Launch.png",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "filename" : "Launch@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "filename" : "Launch@2x~568h.png",
-      "subtype" : "retina4",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

Example/UICatalog/Images.xcassets/bookmark_icon.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "bookmark_icon_1x.png"
+      "filename" : "bookmark_icon_1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "bookmark_icon_2x.png"
+      "filename" : "bookmark_icon_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/bookmark_icon_highlighted.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "bookmark_icon_highlighted_1x.png"
+      "filename" : "bookmark_icon_highlighted_1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "bookmark_icon_highlighted_2x.png"
+      "filename" : "bookmark_icon_highlighted_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/checkmark_icon.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "checkmark_icon_1x.png"
+      "filename" : "checkmark_icon_1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "checkmark_icon_2x.png"
+      "filename" : "checkmark_icon_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/image_animal_1.imageset/Contents.json

@@ -2,12 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "image_animal_5.png"
+      "filename" : "image_animal_5.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/image_animal_2.imageset/Contents.json

@@ -2,12 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "image_animal_2.png"
+      "filename" : "image_animal_2.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/image_animal_3.imageset/Contents.json

@@ -2,12 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "image_animal_3.png"
+      "filename" : "image_animal_3.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/image_animal_4.imageset/Contents.json

@@ -2,12 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "image_animal_4.png"
+      "filename" : "image_animal_4.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/image_animal_5.imageset/Contents.json

@@ -2,12 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "image_animal_1.png"
+      "filename" : "image_animal_1.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/search_bar_background.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "search_bar_bg_1x.png"
+      "filename" : "search_bar_bg_1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "search_bar_bg_2x.png"
+      "filename" : "search_bar_bg_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/search_icon.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "search_icon_1x.png"
+      "filename" : "search_icon_1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "search_icon_2x.png"
+      "filename" : "search_icon_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/slider_blue_track.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "slider_blue_track_1x.png"
+      "filename" : "slider_blue_track_1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "slider_blue_track_2x.png"
+      "filename" : "slider_blue_track_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/slider_green_track.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "slider_green_track_1x.png"
+      "filename" : "slider_green_track_1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "slider_green_track_2x.png"
+      "filename" : "slider_green_track_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/slider_thumb.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "slider_thumb_1x.png"
+      "filename" : "slider_thumb_1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "slider_thumb_2x.png"
+      "filename" : "slider_thumb_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/stepper_and_segment_background.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "stepper_and_segment_background_1x.png"
+      "filename" : "stepper_and_segment_background_1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "stepper_and_segment_background_2x.png"
+      "filename" : "stepper_and_segment_background_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/stepper_and_segment_background_disabled.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "stepper_and_segment_background_disabled_1x.png"
+      "filename" : "stepper_and_segment_background_disabled_1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "stepper_and_segment_background_disabled_2x.png"
+      "filename" : "stepper_and_segment_background_disabled_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/stepper_and_segment_background_highlighted.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "stepper_and_segment_background_highlighted_1x.png"
+      "filename" : "stepper_and_segment_background_highlighted_1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "stepper_and_segment_background_highlighted_2x.png"
+      "filename" : "stepper_and_segment_background_highlighted_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/UICatalog/Images.xcassets/stepper_and_segment_segment_divider.imageset/Contents.json

@@ -2,13 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "stepper_and_segment_segment_divider_1x.png"
+      "filename" : "stepper_and_segment_segment_divider_1x.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "stepper_and_segment_segment_divider_2x.png"
+      "filename" : "stepper_and_segment_segment_divider_2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {