From b0e7dc7220dc18f894749a89e3aeb9796faede9b Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Thu, 23 Mar 2023 18:40:00 -0500
Subject: [PATCH] Respect tag visibility setting more often

---
 .../conversations/ui/ConferenceDetailsActivity.java |  9 +++++++--
 .../conversations/ui/ContactDetailsActivity.java    |  2 +-
 .../conversations/ui/StartConversationActivity.java | 13 ++++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index abec18616d1b828ec1b5245669ad14aa1dd43bf7..306d55fe6ba0cfb57c81258941ae106623576c58 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -4,8 +4,10 @@ import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.text.Editable;
 import android.text.SpannableStringBuilder;
 import android.text.TextWatcher;
@@ -76,6 +78,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
     private String uuid = null;
 
     private boolean mAdvancedMode = false;
+    private boolean showDynamicTags = true;
 
     private final UiCallback<Conversation> renameCallback = new UiCallback<Conversation>() {
         @Override
@@ -178,6 +181,8 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         this.binding = DataBindingUtil.setContentView(this, R.layout.activity_muc_details);
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        showDynamicTags = preferences.getBoolean(SettingsActivity.SHOW_DYNAMIC_TAGS, getResources().getBoolean(R.bool.show_dynamic_tags));
         this.binding.changeConferenceButton.setOnClickListener(this.mChangeConferenceSettings);
         setSupportActionBar(binding.toolbar);
         configureActionBar(getSupportActionBar());
@@ -315,7 +320,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
             }
 
             final Bookmark bookmark = mConversation.getBookmark();
-            if (bookmark != null && mConversation.getAccount().getXmppConnection().getFeatures().bookmarks2()) {
+            if (bookmark != null && mConversation.getAccount().getXmppConnection().getFeatures().bookmarks2() && showDynamicTags) {
                 for (final ListItem.Tag group : bookmark.getGroupTags()) {
                     binding.editTags.addObjectSync(group);
                 }
@@ -634,7 +639,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         }
 
         List<ListItem.Tag> tagList = bookmark.getTags(this);
-        if (tagList.size() == 0) {
+        if (tagList.size() == 0 || !showDynamicTags) {
             binding.tags.setVisibility(View.GONE);
         } else {
             final LayoutInflater inflater = getLayoutInflater();
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 8e05ae20a04a15d04de4337c5f738e8c8ff14b19..a10959d17168d151e63b3f5c3a2afe4c82b56e47 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -356,7 +356,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
                        .map(e -> e.getKey()).collect(Collectors.toList())
                     );
                     binding.editTags.setAdapter(adapter);
-                    binding.editTags.setVisibility(View.VISIBLE);
+                    if (showDynamicTags) binding.editTags.setVisibility(View.VISIBLE);
                     if (save != null) save.setVisible(true);
                 } else {
                     menuItem.collapseActionView();
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 4e619c9d3731467c7fcaec906667a087f0241c2b..6c6a9b0ea46e88147ef1853025ccb33903e2d214 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -12,6 +12,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.text.Editable;
 import android.text.Html;
 import android.text.TextWatcher;
@@ -716,9 +717,15 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
         mSearchEditText = mSearchView.findViewById(R.id.search_field);
         mSearchEditText.addTextChangedListener(mSearchTextWatcher);
         mSearchEditText.setOnEditorActionListener(mSearchDone);
-        RecyclerView tags = mSearchView.findViewById(R.id.tags);
-        tags.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
-        tags.setAdapter(mTagsAdapter);
+
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        boolean showDynamicTags = preferences.getBoolean(SettingsActivity.SHOW_DYNAMIC_TAGS, getResources().getBoolean(R.bool.show_dynamic_tags));
+        if (showDynamicTags) {
+            RecyclerView tags = mSearchView.findViewById(R.id.tags);
+            tags.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
+            tags.setAdapter(mTagsAdapter);
+        }
+
         String initialSearchValue = mInitialSearchValue.pop();
         if (initialSearchValue != null) {
             mMenuSearchView.expandActionView();