Merge pull request #1033 from Owain94/http-api-callback

http-api: run callback on clientthread

runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java

@@ -52,6 +52,7 @@ import net.runelite.api.vars.AccountType;
 import net.runelite.api.widgets.Widget;
 import static net.runelite.api.widgets.WidgetID.KILL_LOGS_GROUP_ID;
 import net.runelite.api.widgets.WidgetInfo;
+import net.runelite.client.callback.ClientThread;
 import net.runelite.client.chat.ChatColorType;
 import net.runelite.client.chat.ChatCommandManager;
 import net.runelite.client.chat.ChatMessageBuilder;
@@ -116,6 +117,9 @@ public class ChatCommandsPlugin extends Plugin
 	@Inject
 	private Client client;
 
+	@Inject
+	private ClientThread clientThread;
+
 	@Inject
 	private ChatCommandsConfig config;
 
@@ -826,6 +830,7 @@ public class ChatCommandsPlugin extends Plugin
 				.subscribeOn(Schedulers.single())
 				.subscribe(
 					(osbresult) ->
+						clientThread.invoke(() ->
 						{
 							int itemId = item.getId();
 							int itemPrice = itemManager.getItemPrice(itemId);
@@ -860,7 +865,7 @@ public class ChatCommandsPlugin extends Plugin
 							messageNode.setRuneLiteFormatMessage(response);
 							chatMessageManager.update(messageNode);
 							client.refreshChat();
-					}
+						})
 				);
 		}
 	}

runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java

@@ -46,6 +46,7 @@ import net.runelite.api.widgets.WidgetInfo;
 import static net.runelite.api.widgets.WidgetInfo.TO_CHILD;
 import static net.runelite.api.widgets.WidgetInfo.TO_GROUP;
 import net.runelite.api.widgets.WidgetItem;
+import net.runelite.client.callback.ClientThread;
 import net.runelite.client.chat.ChatColorType;
 import net.runelite.client.chat.ChatMessageBuilder;
 import net.runelite.client.chat.ChatMessageManager;
@@ -86,6 +87,9 @@ public class ExaminePlugin extends Plugin
 	@Inject
 	private Client client;
 
+	@Inject
+	private ClientThread clientThread;
+
 	@Inject
 	private ItemManager itemManager;
 
@@ -369,6 +373,7 @@ public class ExaminePlugin extends Plugin
 					.subscribeOn(Schedulers.single())
 					.subscribe(
 						(osbresult) ->
+							clientThread.invoke(() ->
 							{
 								message
 									.append(ChatColorType.NORMAL)
@@ -395,7 +400,7 @@ public class ExaminePlugin extends Plugin
 										.append(ChatColorType.NORMAL)
 										.append("ea)");
 								}
-						},
+							}),
 						(e) -> log.error(e.toString())
 					);
 			}

runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java

@@ -66,6 +66,7 @@ import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.Notifier;
 import net.runelite.client.account.AccountSession;
 import net.runelite.client.account.SessionManager;
+import net.runelite.client.callback.ClientThread;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.events.SessionClose;
@@ -131,6 +132,9 @@ public class GrandExchangePlugin extends Plugin
 	@Inject
 	private Client client;
 
+	@Inject
+	private ClientThread clientThread;
+
 	@Inject
 	private ClientToolbar clientToolbar;
 
@@ -550,10 +554,11 @@ public class GrandExchangePlugin extends Plugin
 				.subscribeOn(Schedulers.single())
 				.subscribe(
 					(osbresult) ->
+						clientThread.invoke(() ->
 						{
 							final String text = geText.getText() + OSB_GE_TEXT + StackFormatter.formatNumber(osbresult.getOverall_average());
 							geText.setText(text);
-					},
+						}),
 					(e) -> log.debug("Error getting price of item {}", itemId, e)
 				);
 		});