Access webview only from main thread

wenchen · Jul 7, 2017 · 90f35cb · 90f35cb
1 parent 73c134a
commit 90f35cb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/Blink/TermView.m b/Blink/TermView.m
@@ -343,8 +343,10 @@ - (void)write:(NSString *)data
   NSData *jsonData = [NSJSONSerialization dataWithJSONObject:@[ data ] options:0 error:nil];
   NSString *jsString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
   NSString *jsScript = [NSString stringWithFormat:@"write_to_term(%@[0])", jsString];
-
-  [_webView evaluateJavaScript:jsScript completionHandler:nil];
+
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [_webView evaluateJavaScript:jsScript completionHandler:nil];
+  });
 }
 
 - (NSString *)title

diff --git a/Sessions/MCPSession.m b/Sessions/MCPSession.m
@@ -128,8 +128,10 @@ - (int)main:(int)argc argv:(char **)argv
 
 - (void)showConfig
 {
-  [[UIApplication sharedApplication]
-    sendAction:NSSelectorFromString(@"showConfig:") to:nil from:nil forEvent:nil];
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [[UIApplication sharedApplication]
+     sendAction:NSSelectorFromString(@"showConfig:") to:nil from:nil forEvent:nil];
+  });
 }
 
 - (void)runSSHCopyIDWithArgs:(NSString *)args

diff --git a/Sessions/MoshSession.m b/Sessions/MoshSession.m
@@ -203,11 +203,18 @@ - (int)main:(int)argc argv:(char **)argv
   setenv("PATH_LOCALE", [locales_path cStringUsingEncoding:1], 1);
 
   // Mosh does not support scroll. Disable it to avoid problems.
-  [_stream.control.terminal setScrollEnabled:NO];
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [_stream.control.terminal setScrollEnabled:NO];
+  });
+
   BOOL mode = [_stream.control rawMode];
   [_stream.control.terminal setRawMode:YES];
   mosh_main(_stream.in, _stream.out, _stream.sz, [_moshParams.ip UTF8String], [_moshParams.port UTF8String], [_moshParams.key UTF8String], [_moshParams.predictionMode UTF8String]);
-  [_stream.control.terminal setScrollEnabled:YES];
+
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [_stream.control.terminal setScrollEnabled:YES];
+  });
+
   [_stream.control setRawMode:mode];
 
   fprintf(_stream.out, "\r\nMosh session finished!\r\n");