diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/util/ExtraFeaturesServiceExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/util/ExtraFeaturesServiceExtensions.kt index 55b3035ca..33f4af1d9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/util/ExtraFeaturesServiceExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/util/ExtraFeaturesServiceExtensions.kt @@ -26,4 +26,4 @@ import org.mariotaku.twidere.util.premium.ExtraFeaturesService.Companion.FEATURE * Created by mariotaku on 2017/9/14. */ val ExtraFeaturesService.isAdvancedFiltersEnabled: Boolean - get() = isEnabled(FEATURE_ADVANCED_FILTERS) || isEnabled("filters_subscriptions") \ No newline at end of file + get() = true//isEnabled(FEATURE_ADVANCED_FILTERS) || isEnabled("filters_subscriptions") \ No newline at end of file diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FilteredUsersFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FilteredUsersFragment.kt index c8fc179c2..b336649d2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FilteredUsersFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FilteredUsersFragment.kt @@ -115,7 +115,7 @@ class FilteredUsersFragment : BaseFiltersFragment() { override fun onPrepareOptionsMenu(menu: Menu) { super.onPrepareOptionsMenu(menu) val isFeaturesSupported = extraFeaturesService.isSupported() - menu.setGroupAvailability(R.id.import_export, isFeaturesSupported) + menu.setGroupAvailability(R.id.import_export, true) } override fun onOptionsItemSelected(item: MenuItem): Boolean { @@ -147,7 +147,7 @@ class FilteredUsersFragment : BaseFiltersFragment() { override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean { val result = super.onPrepareActionMode(mode, menu) val isFeaturesSupported = extraFeaturesService.isSupported() - menu.setGroupAvailability(R.id.import_export, isFeaturesSupported) + menu.setGroupAvailability(R.id.import_export, true) return result && menu.hasVisibleItems() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt index b267a3f94..3e08ed63a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt @@ -71,8 +71,8 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac if (!extraFeaturesService.isSupported()) { - activity?.finish() - return +// activity?.finish() +// return } if (savedInstanceState == null) { diff --git a/twidere/src/main/res/xml/preferences_filters.xml b/twidere/src/main/res/xml/preferences_filters.xml index 14dbf25b5..cc159eff0 100644 --- a/twidere/src/main/res/xml/preferences_filters.xml +++ b/twidere/src/main/res/xml/preferences_filters.xml @@ -10,14 +10,15 @@ android:defaultValue="false" android:key="filter_possibility_sensitive_statuses" android:title="@string/preference_filter_possibility_sensitive_statuses"/> - - + - - + + \ No newline at end of file