From 0fb67583ff18657e2da689be4fc0e6f5a96bbfcd Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 14 Apr 2021 18:10:39 +0100
Subject: [PATCH] Close the speed dial to prevent a crash.

---
 .../briar/android/contact/ContactListFragment.java           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
index 380deb968..2fc2dcbc8 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
@@ -49,6 +49,7 @@ public class ContactListFragment extends BaseFragment
 	private ContactListViewModel viewModel;
 	private final ContactListAdapter adapter = new ContactListAdapter(this);
 	private BriarRecyclerView list;
+	private FabSpeedDial speedDial;
 
 	/**
 	 * The Snackbar is non-null when shown and null otherwise.
@@ -86,7 +87,7 @@ public class ContactListFragment extends BaseFragment
 		View contentView = inflater.inflate(R.layout.fragment_contact_list,
 				container, false);
 
-		FabSpeedDial speedDial = contentView.findViewById(R.id.speedDial);
+		speedDial = contentView.findViewById(R.id.speedDial);
 		speedDial.addOnMenuItemClickListener(this);
 
 		list = contentView.findViewById(R.id.list);
@@ -150,6 +151,8 @@ public class ContactListFragment extends BaseFragment
 		super.onStop();
 		list.stopPeriodicUpdate();
 		dismissSnackBar();
+		// Close the speed dial to prevent a crash (#1672)
+		speedDial.closeMenu();
 	}
 
 	@UiThread