Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-23 19:26:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inline the chat filters feature flag.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-07-06 15:29:33 -04:00
committed by Clark Chen
parent 117dd17215
commit 9d6337d5a8
4 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt
View File

@@ -44,7 +44,6 @@ import org.thoughtcrime.securesms.megaphone.Megaphones
import org.thoughtcrime.securesms.payments.DataExportUtil
import org.thoughtcrime.securesms.storage.StorageSyncHelper
import org.thoughtcrime.securesms.util.ConversationUtil
import org.thoughtcrime.securesms.util.FeatureFlags
import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
import org.thoughtcrime.securesms.util.navigation.safeNavigate
import java.util.Optional
@@ -600,16 +599,14 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
}
)
if (FeatureFlags.chatFilters()) {
dividerPref()
sectionHeaderPref(DSLSettingsText.from("Chat Filters"))
clickPref(
title = DSLSettingsText.from("Reset pull to refresh tip count"),
onClick = {
SignalStore.uiHints().resetNeverDisplayPullToRefreshCount()
}
)
}
dividerPref()
sectionHeaderPref(DSLSettingsText.from("Chat Filters"))
clickPref(
title = DSLSettingsText.from("Reset pull to refresh tip count"),
onClick = {
SignalStore.uiHints().resetNeverDisplayPullToRefreshCount()
}
)
dividerPref()
clickPref(

3
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationFilterBehavior.kt
View File

@@ -7,14 +7,13 @@ import android.view.View
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.view.ViewCompat
import com.google.android.material.appbar.AppBarLayout
import org.thoughtcrime.securesms.util.FeatureFlags
class ConversationFilterBehavior(context: Context, attributeSet: AttributeSet) : AppBarLayout.Behavior(context, attributeSet) {
var callback: Callback? = null
override fun onStartNestedScroll(parent: CoordinatorLayout, child: AppBarLayout, directTargetChild: View, target: View, nestedScrollAxes: Int, type: Int): Boolean {
if (type == ViewCompat.TYPE_NON_TOUCH || !FeatureFlags.chatFilters() || callback?.canStartNestedScroll() == false) {
if (type == ViewCompat.TYPE_NON_TOUCH || callback?.canStartNestedScroll() == false) {
return false
} else {
return super.onStartNestedScroll(parent, child, directTargetChild, target, nestedScrollAxes, type)

4
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
View File

@@ -568,8 +568,8 @@ public class ConversationListFragment extends MainFragment implements ActionMode
ConversationFilterRequest request = viewModel.getConversationFilterRequest();
boolean isChatFilterEnabled = request != null && request.getFilter() == ConversationFilter.UNREAD;
menu.findItem(R.id.menu_filter_unread_chats).setVisible(FeatureFlags.chatFilters() && !isChatFilterEnabled);
menu.findItem(R.id.menu_clear_unread_filter).setVisible(FeatureFlags.chatFilters() && isChatFilterEnabled);
menu.findItem(R.id.menu_filter_unread_chats).setVisible(!isChatFilterEnabled);
menu.findItem(R.id.menu_clear_unread_filter).setVisible(isChatFilterEnabled);
}
@Override

9
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
View File

@@ -100,7 +100,6 @@ public final class FeatureFlags {
public static final String CREDIT_CARD_DISABLED_REGIONS = "global.donations.ccDisabledRegions";
public static final String PAYPAL_DISABLED_REGIONS = "global.donations.paypalDisabledRegions";
private static final String CDS_HARD_LIMIT = "android.cds.hardLimit";
private static final String CHAT_FILTERS = "android.chat.filters.3";
private static final String PAYPAL_ONE_TIME_DONATIONS = "android.oneTimePayPalDonations.2";
private static final String PAYPAL_RECURRING_DONATIONS = "android.recurringPayPalDonations.3";
private static final String ANY_ADDRESS_PORTS_KILL_SWITCH = "android.calling.fieldTrial.anyAddressPortsKillSwitch";
@@ -162,7 +161,6 @@ public final class FeatureFlags {
CREDIT_CARD_DISABLED_REGIONS,
PAYPAL_DISABLED_REGIONS,
CDS_HARD_LIMIT,
CHAT_FILTERS,
PAYPAL_ONE_TIME_DONATIONS,
PAYPAL_RECURRING_DONATIONS,
ANY_ADDRESS_PORTS_KILL_SWITCH,
@@ -558,13 +556,6 @@ public final class FeatureFlags {
return getInteger(CDS_HARD_LIMIT, 50_000);
}
/**
* Enables chat filters. Note that this UI is incomplete.
*/
public static boolean chatFilters() {
return getBoolean(CHAT_FILTERS, false);
}
/**
* Whether or not we should allow PayPal payments for one-time donations
*/