From 7da3e4f0221aa07fc418a6c8e1aebd59c55fc7a3 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Tue, 4 Jul 2023 11:39:49 +0930
Subject: [PATCH] Fix blocked contacts button (#1264)

---
 .../preferences/BlockedContactsLayout.kt      |  9 -------
 .../preferences/BlockedContactsPreference.kt  |  4 +--
 .../layout/blocked_contacts_preference.xml    | 27 +++++++++----------
 3 files changed, 13 insertions(+), 27 deletions(-)
 delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsLayout.kt

diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsLayout.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsLayout.kt
deleted file mode 100644
index ed2970fbc..000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsLayout.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.thoughtcrime.securesms.preferences
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.FrameLayout
-
-class BlockedContactsLayout @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : FrameLayout(context, attrs)
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt
index e985ba6d4..48c7cc6dc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt
@@ -3,7 +3,6 @@ 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
 
@@ -16,8 +15,7 @@ class BlockedContactsPreference @JvmOverloads constructor(
         super.onBindViewHolder(holder)
 
         holder.itemView.setOnClickListener {
-            val intent = Intent(context, BlockedContactsActivity::class.java)
-            context.startActivity(intent)
+            Intent(context, BlockedContactsActivity::class.java).let(context::startActivity)
         }
     }
 }
diff --git a/app/src/main/res/layout/blocked_contacts_preference.xml b/app/src/main/res/layout/blocked_contacts_preference.xml
index 83fe432cf..673d5316a 100644
--- a/app/src/main/res/layout/blocked_contacts_preference.xml
+++ b/app/src/main/res/layout/blocked_contacts_preference.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.preferences.BlockedContactsLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+<Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:contentDescription="@string/AccessibilityId_blocked_contacts"
+    style="@style/Widget.Session.Button.Common.Borderless"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingHorizontal="@dimen/medium_spacing"
     android:layout_marginHorizontal="@dimen/large_spacing"
     android:layout_marginVertical="@dimen/medium_spacing"
-    android:layout_height="wrap_content">
-    <Button
-        android:contentDescription="@string/AccessibilityId_blocked_contacts"
-        style="@style/Widget.Session.Button.Common.Borderless"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/medium_spacing"
-        android:text="@string/blocked_contacts_title"
-        android:textColor="@color/destructive"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        />
-</org.thoughtcrime.securesms.preferences.BlockedContactsLayout>
+    android:text="@string/blocked_contacts_title"
+    android:textColor="@color/destructive"
+    android:textSize="16sp"
+    android:textStyle="bold"
+/>