Commit c1472403 authored by Thomas's avatar Thomas
Browse files

Fix issue #544 - Jump in profiles

parent 487057bb

app/src/main/java/app/fedilab/android/activities/HashTagActivity.java

+45 −15
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public class HashTagActivity extends BaseActivity { 
            finish();

        pinnedTag = false;

        followedTag = false;

        mutedTag = true;

        mutedTag = false;

        setSupportActionBar(binding.toolbar);

        ActionBar actionBar = getSupportActionBar();

        //Remove title
@@ -221,6 +221,40 @@ public class HashTagActivity extends BaseActivity { 
                }

            });

        } else if (item.getItemId() == R.id.action_mute) {



            if (MainActivity.mainFilters == null || fedilabFilter == null) {

                MainActivity.mainFilters = new ArrayList<>();

                Filter.FilterParams filterParams = new Filter.FilterParams();

                filterParams.title = Helper.FEDILAB_MUTED_HASHTAGS;

                filterParams.filter_action = "hide";

                filterParams.context = new ArrayList<>();

                filterParams.context.add("home");

                filterParams.context.add("public");

                filterParams.context.add("thread");

                filterParams.context.add("account");

                String finalTag = tag;

                FiltersVM filtersVM = new ViewModelProvider(HashTagActivity.this).get(FiltersVM.class);

                filtersVM.addFilter(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, filterParams)

                        .observe(HashTagActivity.this, filter -> {

                            if (filter != null) {

                                MainActivity.mainFilters.add(filter);

                                mutedTag = false;

                                fedilabFilter = filter;

                                muteTags();

                                invalidateOptionsMenu();

                            }

                        });

            } else {

                muteTags();

            }



        }



        return super.onOptionsItemSelected(item);

    }





    private void muteTags() {

        Filter.FilterParams filterParams = new Filter.FilterParams();

        filterParams.id = fedilabFilter.id;

        filterParams.keywords = new ArrayList<>();
@@ -237,10 +271,6 @@ public class HashTagActivity extends BaseActivity { 
                });

    }



        return super.onOptionsItemSelected(item);

    }





    @Override

    public boolean onCreateOptionsMenu(@NonNull Menu menu) {

        getMenuInflater().inflate(R.menu.menu_hashtag, menu);