TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-26 09:47:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #350 from metaphore/open-group-chat-fix

Browse Source 
Fixed open group chat updates UI on the background thread.
This commit is contained in:
Niels Andriesse 2020-09-21 13:58:14 +10:00 committed by GitHub
commit 7a15e5a52e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -458,7 +458,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
PublicChat publicChat = DatabaseFactory.getLokiThreadDatabase(this).getPublicChat(threadId); PublicChat publicChat = DatabaseFactory.getLokiThreadDatabase(this).getPublicChat(threadId);
if (publicChat != null) { if (publicChat != null) {
ApplicationContext.getInstance(this).getPublicChatAPI().getChannelInfo(publicChat.getChannel(), publicChat.getServer()).success(displayName -> { ApplicationContext.getInstance(this).getPublicChatAPI().getChannelInfo(publicChat.getChannel(), publicChat.getServer()).success(displayName -> {
updateSubtitleTextView(); runOnUiThread(ConversationActivity.this::updateSubtitleTextView);
return Unit.INSTANCE; return Unit.INSTANCE;
}); });
} }
@ -492,6 +492,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
@Override @Override
protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
Log.i(TAG, "onNewIntent()"); Log.i(TAG, "onNewIntent()");
if (isFinishing()) { if (isFinishing()) {

1
src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
View File

@ -33,6 +33,7 @@ import org.whispersystems.signalservice.loki.utilities.hexEncodedPublicKey
import org.whispersystems.signalservice.loki.utilities.toHexString import org.whispersystems.signalservice.loki.utilities.toHexString
import java.io.IOException import java.io.IOException
import java.util.* import java.util.*
import kotlin.jvm.Throws
object ClosedGroupsProtocol { object ClosedGroupsProtocol {
val isSharedSenderKeysEnabled = false val isSharedSenderKeysEnabled = false