From 4371708fc4f7ee8084238480fb3d692c9761f539 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Mon, 2 Nov 2015 12:22:46 -0800 Subject: [PATCH] Fix onNewIntent transport selection assertion Fixes #4301 // FREEBIE --- src/org/thoughtcrime/securesms/TransportOptions.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/org/thoughtcrime/securesms/TransportOptions.java b/src/org/thoughtcrime/securesms/TransportOptions.java index 8a00280a43..c78d3986e7 100644 --- a/src/org/thoughtcrime/securesms/TransportOptions.java +++ b/src/org/thoughtcrime/securesms/TransportOptions.java @@ -67,8 +67,13 @@ public class TransportOptions { public void disableTransport(Type type) { Optional option = find(type); + if (option.isPresent()) { enabledTransports.remove(option.get()); + + if (manuallySelected && type == selectedType) { + manuallySelected = false; + } } }