From d221e0db42462ad43a5e8526f8e45ba092fc6fba Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Fri, 14 Aug 2020 08:41:34 +0200
Subject: [PATCH] java/com/tailscale/ipn: run attachPeer on main thread

Signed-off-by: Elias Naur <mail@eliasnaur.com>
---
 android/src/main/java/com/tailscale/ipn/App.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/android/src/main/java/com/tailscale/ipn/App.java b/android/src/main/java/com/tailscale/ipn/App.java
index a3ea886..cbcb176 100644
--- a/android/src/main/java/com/tailscale/ipn/App.java
+++ b/android/src/main/java/com/tailscale/ipn/App.java
@@ -160,10 +160,14 @@ public class App extends Application {
 	// attachPeer adds a Peer fragment for tracking the Activity
 	// lifecycle.
 	void attachPeer(Activity act) {
-		FragmentTransaction ft = act.getFragmentManager().beginTransaction();
-		ft.add(new Peer(), PEER_TAG);
-		ft.commit();
-		act.getFragmentManager().executePendingTransactions();
+		act.runOnUiThread(new Runnable() {
+			@Override public void run() {
+				FragmentTransaction ft = act.getFragmentManager().beginTransaction();
+				ft.add(new Peer(), PEER_TAG);
+				ft.commit();
+				act.getFragmentManager().executePendingTransactions();
+			}
+		});
 	}
 
 	boolean isChromeOS() {