From 00d2fa7e6f54759d3f101d857b6832eda0003d01 Mon Sep 17 00:00:00 2001 From: Anton Chekulaev Date: Mon, 21 Sep 2020 11:53:16 +1000 Subject: [PATCH] Fixed open group chat updates UI on the background thread. Fixes #189 #294 --- .../securesms/conversation/ConversationActivity.java | 3 ++- .../securesms/loki/protocol/ClosedGroupsProtocol.kt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 8a98e52361..be593f7ea5 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -458,7 +458,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity PublicChat publicChat = DatabaseFactory.getLokiThreadDatabase(this).getPublicChat(threadId); if (publicChat != null) { ApplicationContext.getInstance(this).getPublicChatAPI().getChannelInfo(publicChat.getChannel(), publicChat.getServer()).success(displayName -> { - updateSubtitleTextView(); + runOnUiThread(ConversationActivity.this::updateSubtitleTextView); return Unit.INSTANCE; }); } @@ -492,6 +492,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity @Override protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); Log.i(TAG, "onNewIntent()"); if (isFinishing()) { diff --git a/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt b/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt index e81163e70c..f6738b650c 100644 --- a/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt +++ b/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt @@ -33,6 +33,7 @@ import org.whispersystems.signalservice.loki.utilities.hexEncodedPublicKey import org.whispersystems.signalservice.loki.utilities.toHexString import java.io.IOException import java.util.* +import kotlin.jvm.Throws object ClosedGroupsProtocol { val isSharedSenderKeysEnabled = false