From 0bcb4e0fca1bddd66047bcf1ec266beaf9444d1a Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Tue, 22 Nov 2022 11:03:43 +0100
Subject: [PATCH] Fix #515 - set resolve to false when searching accounts

---
 .../android/client/entities/app/StatusCache.java |  2 +-
 app/src/main/res/layout/activity_actions.xml     | 16 ++++++++++++++++
 app/src/main/res/values/strings.xml              |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/app/fedilab/android/client/entities/app/StatusCache.java b/app/src/main/java/app/fedilab/android/client/entities/app/StatusCache.java
index e4020657..61868bd3 100644
--- a/app/src/main/java/app/fedilab/android/client/entities/app/StatusCache.java
+++ b/app/src/main/java/app/fedilab/android/client/entities/app/StatusCache.java
@@ -293,7 +293,7 @@ public class StatusCache {
         values.put(Sqlite.COL_INSTANCE, statusCache.instance);
         values.put(Sqlite.COL_SLUG, slug);
         values.put(Sqlite.COL_STATUS_ID, statusCache.status_id);
-        if (type != null) {
+        if (statusCache.type != null) {
             values.put(Sqlite.COL_TYPE, statusCache.type.getValue());
         }
         if (statusCache.status != null) {
diff --git a/app/src/main/res/layout/activity_actions.xml b/app/src/main/res/layout/activity_actions.xml
index 88ce2245..052ae1c6 100644
--- a/app/src/main/res/layout/activity_actions.xml
+++ b/app/src/main/res/layout/activity_actions.xml
@@ -71,6 +71,22 @@
             app:iconTint="@color/cyanea_accent_dark_reference"
             app:strokeColor="@color/cyanea_accent_dark_reference" />
 
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/domain_block"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:paddingVertical="12dp"
+            android:text="@string/blocked_domains"
+            android:textAlignment="textStart"
+            android:textColor="@color/cyanea_accent_dark_reference"
+            app:icon="@drawable/ic_baseline_navigate_next_24"
+            app:iconGravity="end"
+            app:iconTint="@color/cyanea_accent_dark_reference"
+            app:strokeColor="@color/cyanea_accent_dark_reference" />
+
     </androidx.appcompat.widget.LinearLayoutCompat>
 
     <androidx.fragment.app.FragmentContainerView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f0f25a22..c332f3bf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1906,4 +1906,5 @@
     <string name="notif_signed_up">Signed up</string>
     <string name="Suggestions">Suggestions</string>
     <string name="not_interested">Not interested</string>
+    <string name="blocked_domains">Blocked domains</string>
 </resources>
\ No newline at end of file