oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Revert "fix: blocked contacts click handler being overridden by something" 

This reverts commit 608572fc42.
This commit is contained in:
0x330a 2023-07-04 12:40:30 +10:00
parent 608572fc42
commit dd629e7803
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt
View File

@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.preferences
import android.content.Context
import android.content.Intent
import android.util.AttributeSet
import android.view.View
import androidx.preference.PreferenceCategory
import androidx.preference.PreferenceViewHolder
import network.loki.messenger.databinding.BlockedContactsPreferenceBinding
class BlockedContactsPreference @JvmOverloads constructor(
context: Context,
@ -14,8 +14,8 @@ class BlockedContactsPreference @JvmOverloads constructor(
override fun onBindViewHolder(holder: PreferenceViewHolder) {
super.onBindViewHolder(holder)
val binding = BlockedContactsPreferenceBinding.bind(holder.itemView)
binding.blockedContactButton.setOnClickListener {
holder.itemView.setOnClickListener {
val intent = Intent(context, BlockedContactsActivity::class.java)
context.startActivity(intent)
}

1
app/src/main/res/layout/blocked_contacts_preference.xml
View File

@ -5,7 +5,6 @@
android:layout_marginVertical="@dimen/medium_spacing"
android:layout_height="wrap_content">
<Button
android:id="@+id/blockedContactButton"
android:contentDescription="@string/AccessibilityId_blocked_contacts"
style="@style/Widget.Session.Button.Common.Borderless"
android:layout_width="wrap_content"

2
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPollerV2.kt
View File

@ -81,7 +81,7 @@ class ClosedGroupPollerV2 {
val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey)
val threadID = storage.getThreadId(groupID)
if (threadID == null) {
Log.d("Loki", "Stopping group poller due to missing thread for closed group: ${groupPublicKey.take(4)}...${groupPublicKey.takeLast(4)}.")
Log.d("Loki", "Stopping group poller due to missing thread for closed group: $groupPublicKey.")
stopPolling(groupPublicKey)
return
}