TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

join open group code executed in a coroutine so it's not blocking the UI

Browse Source
This commit is contained in:
Brice-W 2021-05-14 10:26:38 +10:00
parent b562aa5738
commit 8dd606cbb3
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt
View File

@ -8,6 +8,9 @@ import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import network.loki.messenger.R import network.loki.messenger.R
import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.GroupUtil
import org.session.libsession.utilities.OpenGroupUrlParser import org.session.libsession.utilities.OpenGroupUrlParser
@ -69,15 +72,27 @@ class OpenGroupInvitationView : FrameLayout {
builder.setMessage(message) builder.setMessage(message)
builder.setPositiveButton(R.string.yes) { dialog, which -> builder.setPositiveButton(R.string.yes) { dialog, which ->
try { GlobalScope.launch(Dispatchers.IO) {
val group = OpenGroupUtilities.addGroup(context, openGroup.server, openGroup.room, openGroup.serverPublicKey) try {
val threadID = GroupManager.getOpenGroupThreadID(group.id, context) dialog.dismiss()
val groupID = GroupUtil.getEncodedOpenGroupID(group.id.toByteArray()) val group = OpenGroupUtilities.addGroup(
context,
openGroup.server,
openGroup.room,
openGroup.serverPublicKey
)
val threadID = GroupManager.getOpenGroupThreadID(group.id, context)
val groupID = GroupUtil.getEncodedOpenGroupID(group.id.toByteArray())
MultiDeviceProtocol.forceSyncConfigurationNowIfNeeded(context) MultiDeviceProtocol.forceSyncConfigurationNowIfNeeded(context)
} catch (e: Exception) { } catch (e: Exception) {
Log.e("JoinPublicChatActivity", "Failed to join open group.", e) Log.e("JoinPublicChatActivity", "Failed to join open group.", e)
Toast.makeText(context, R.string.activity_join_public_chat_error, Toast.LENGTH_SHORT).show() Toast.makeText(
context,
R.string.activity_join_public_chat_error,
Toast.LENGTH_SHORT
).show()
}
} }
} }

6
app/src/main/res/layout/open_group_invitation_view.xml
View File

@ -28,11 +28,11 @@
<ImageView <ImageView
android:id="@+id/open_group_icon" android:id="@+id/open_group_icon"
android:layout_width="wrap_content" android:layout_width="48dp"
android:layout_height="wrap_content" android:layout_height="48dp"
android:clickable="false" android:clickable="false"
android:visibility="gone" android:visibility="gone"
android:layout_margin="8dp" android:layout_margin="4dp"
android:contentDescription="@string/open_group_invitation_view__join_accessibility_description" android:contentDescription="@string/open_group_invitation_view__join_accessibility_description"
android:src="@drawable/ic_globe" /> android:src="@drawable/ic_globe" />