Kaynağa Gözat

Fix system log in simulator

Tanner Bennett 6 yıl önce
ebeveyn
işleme
6c8fbbeaa8

+ 7 - 7
Classes/GlobalStateExplorers/SystemLog/FLEXSystemLogViewController.m

@@ -31,8 +31,8 @@ static BOOL FLEXDidHookNSLog = NO;
 static BOOL FLEXNSLogHookWorks = NO;
 static BOOL FLEXNSLogHookWorks = NO;
 
 
 BOOL (*os_log_shim_enabled)(void *addr) = nil;
 BOOL (*os_log_shim_enabled)(void *addr) = nil;
-BOOL (*orig_os_log_shim_enabled)() = nil;
-BOOL my_os_log_shim_enabled() {
+BOOL (*orig_os_log_shim_enabled)(void *addr) = nil;
+BOOL my_os_log_shim_enabled(void *addr) {
     return NO;
     return NO;
 }
 }
 
 
@@ -58,7 +58,7 @@ BOOL my_os_log_shim_enabled() {
     
     
     if (FLEXDidHookNSLog && orig_os_log_shim_enabled != nil) {
     if (FLEXDidHookNSLog && orig_os_log_shim_enabled != nil) {
         // Check if our rebinding worked
         // Check if our rebinding worked
-        FLEXNSLogHookWorks = os_log_shim_enabled(addr) == NO;
+        FLEXNSLogHookWorks = my_os_log_shim_enabled(addr) == NO;
     }
     }
     
     
     // So, just because we rebind the lazily loaded symbol for
     // So, just because we rebind the lazily loaded symbol for
@@ -92,6 +92,7 @@ BOOL my_os_log_shim_enabled() {
     [super viewDidLoad];
     [super viewDidLoad];
     
     
     self.showsSearchBar = YES;
     self.showsSearchBar = YES;
+    self.showSearchBarInitially = NO;
 
 
     __weak __typeof(self) weakSelf = self;
     __weak __typeof(self) weakSelf = self;
     id logHandler = ^(NSArray<FLEXSystemLogMessage *> *newMessages) {
     id logHandler = ^(NSArray<FLEXSystemLogMessage *> *newMessages) {
@@ -105,7 +106,6 @@ BOOL my_os_log_shim_enabled() {
         _logController = [FLEXASLLogController withUpdateHandler:logHandler];
         _logController = [FLEXASLLogController withUpdateHandler:logHandler];
     }
     }
 
 
-    [self.tableView registerClass:[FLEXSystemLogCell class] forCellReuseIdentifier:kFLEXSystemLogCellIdentifier];
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.title = @"Loading...";
     self.title = @"Loading...";
     
     
@@ -165,8 +165,9 @@ BOOL my_os_log_shim_enabled() {
 
 
 
 
 #pragma mark - Private
 #pragma mark - Private
+
 - (void)handleUpdateWithNewMessages:(NSArray<FLEXSystemLogMessage *> *)newMessages {
 - (void)handleUpdateWithNewMessages:(NSArray<FLEXSystemLogMessage *> *)newMessages {
-    self.title = @"System Log";
+    self.title = [self.class globalsEntryTitle:FLEXGlobalsRowSystemLog];
 
 
     [self.logMessages mutate:^(NSMutableArray *list) {
     [self.logMessages mutate:^(NSMutableArray *list) {
         [list addObjectsFromArray:newMessages];
         [list addObjectsFromArray:newMessages];
@@ -174,13 +175,12 @@ BOOL my_os_log_shim_enabled() {
 
 
     // "Follow" the log as new messages stream in if we were previously near the bottom.
     // "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;
     BOOL wasNearBottom = self.tableView.contentOffset.y >= self.tableView.contentSize.height - self.tableView.frame.size.height - 100.0;
-    [self.tableView reloadData];
+    [self reloadData];
     if (wasNearBottom) {
     if (wasNearBottom) {
         [self scrollToLastRow];
         [self scrollToLastRow];
     }
     }
 }
 }
 
 
-
 - (void)scrollToLastRow {
 - (void)scrollToLastRow {
     NSInteger numberOfRows = [self.tableView numberOfRowsInSection:0];
     NSInteger numberOfRows = [self.tableView numberOfRowsInSection:0];
     if (numberOfRows > 0) {
     if (numberOfRows > 0) {