TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-01 13:52:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: blocked contacts click handler being overridden by something

Browse Source
This commit is contained in:
0x330a
2023-07-04 11:23:55 +10:00
parent 7ff45cde86
commit 608572fc42
3 changed files with 5 additions and 4 deletions
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.Context
import android.content.Intent import android.content.Intent
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View
import androidx.preference.PreferenceCategory import androidx.preference.PreferenceCategory
import androidx.preference.PreferenceViewHolder import androidx.preference.PreferenceViewHolder
import network.loki.messenger.databinding.BlockedContactsPreferenceBinding
class BlockedContactsPreference @JvmOverloads constructor( class BlockedContactsPreference @JvmOverloads constructor(
context: Context, context: Context,
@@ -14,8 +14,8 @@ class BlockedContactsPreference @JvmOverloads constructor(
override fun onBindViewHolder(holder: PreferenceViewHolder) { override fun onBindViewHolder(holder: PreferenceViewHolder) {
super.onBindViewHolder(holder) super.onBindViewHolder(holder)
val binding = BlockedContactsPreferenceBinding.bind(holder.itemView)
holder.itemView.setOnClickListener { binding.blockedContactButton.setOnClickListener {
val intent = Intent(context, BlockedContactsActivity::class.java) val intent = Intent(context, BlockedContactsActivity::class.java)
context.startActivity(intent) context.startActivity(intent)
} }

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

@@ -5,6 +5,7 @@
android:layout_marginVertical="@dimen/medium_spacing" android:layout_marginVertical="@dimen/medium_spacing"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button <Button
android:id="@+id/blockedContactButton"
android:contentDescription="@string/AccessibilityId_blocked_contacts" android:contentDescription="@string/AccessibilityId_blocked_contacts"
style="@style/Widget.Session.Button.Common.Borderless" style="@style/Widget.Session.Button.Common.Borderless"
android:layout_width="wrap_content" 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 groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey)
val threadID = storage.getThreadId(groupID) val threadID = storage.getThreadId(groupID)
if (threadID == null) { if (threadID == null) {
Log.d("Loki", "Stopping group poller due to missing thread for closed group: $groupPublicKey.") Log.d("Loki", "Stopping group poller due to missing thread for closed group: ${groupPublicKey.take(4)}...${groupPublicKey.takeLast(4)}.")
stopPolling(groupPublicKey) stopPolling(groupPublicKey)
return return
} }