Commit de9c4f90 authored by Thomas's avatar Thomas
Browse files

Fix admin reports not accessible

parent 170a5dfd

app/src/main/java/app/fedilab/android/mastodon/activities/ActionActivity.java

+29 −28
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ public class ActionActivity extends BaseBarActivity { 
    private void displayTimeline(Timeline.TimeLineEnum type) {

        canGoBack = true;

        if (type == Timeline.TimeLineEnum.MUTED_TIMELINE || type == Timeline.TimeLineEnum.BLOCKED_TIMELINE || type == Timeline.TimeLineEnum.MUTED_TIMELINE_HOME) {



            ThemeHelper.slideViewsToLeft(binding.buttonContainer, binding.fragmentContainer, () -> {

            fragmentMastodonAccount = new FragmentMastodonAccount();

            Bundle bundle = new Bundle();

            bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, type);
@@ -72,20 +70,21 @@ public class ActionActivity extends BaseBarActivity { 
                    fragmentManager.beginTransaction();

            fragmentTransaction.replace(R.id.fragment_container, fragmentMastodonAccount);

            fragmentTransaction.commit();

            ThemeHelper.slideViewsToLeft(binding.buttonContainer, binding.fragmentContainer, () -> {



            });



        } else if (type == Timeline.TimeLineEnum.BLOCKED_DOMAIN_TIMELINE) {

            ThemeHelper.slideViewsToLeft(binding.buttonContainer, binding.fragmentContainer, () -> {

            fragmentMastodonDomainBlock = new FragmentMastodonDomainBlock();

            FragmentManager fragmentManager = getSupportFragmentManager();

            FragmentTransaction fragmentTransaction =

                    fragmentManager.beginTransaction();

            fragmentTransaction.replace(R.id.fragment_container, fragmentMastodonDomainBlock);

            fragmentTransaction.commit();

            ThemeHelper.slideViewsToLeft(binding.buttonContainer, binding.fragmentContainer, () -> {



            });

        } else {



            ThemeHelper.slideViewsToLeft(binding.buttonContainer, binding.fragmentContainer, () -> {

            fragmentMastodonTimeline = new FragmentMastodonTimeline();

            Bundle bundle = new Bundle();

            bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, type);
@@ -96,6 +95,8 @@ public class ActionActivity extends BaseBarActivity { 
                    fragmentManager.beginTransaction();

            fragmentTransaction.replace(R.id.fragment_container, fragmentMastodonTimeline);

            fragmentTransaction.commit();

            ThemeHelper.slideViewsToLeft(binding.buttonContainer, binding.fragmentContainer, () -> {



            });



        }

app/src/main/java/app/fedilab/android/mastodon/activities/FollowedTagActivity.java

+13 −12
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ public class FollowedTagActivity extends BaseBarActivity implements FollowedTagA 
    public void click(Tag tag) {

        this.tag = tag;

        canGoBack = true;

        ThemeHelper.slideViewsToLeft(binding.recyclerView, binding.fragmentContainer, () -> {

        fragmentMastodonTimeline = new FragmentMastodonTimeline();

        Bundle bundle = new Bundle();

        bundle.putSerializable(Helper.ARG_SEARCH_KEYWORD, tag.name);
@@ -220,6 +219,8 @@ public class FollowedTagActivity extends BaseBarActivity implements FollowedTagA 
        fragmentTransaction.replace(R.id.fragment_container, fragmentMastodonTimeline);

        fragmentTransaction.commit();

        invalidateOptionsMenu();

        ThemeHelper.slideViewsToLeft(binding.recyclerView, binding.fragmentContainer, () -> {



        });

    }

}

app/src/main/java/app/fedilab/android/mastodon/activities/MastodonListActivity.java

+13 −12
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ public class MastodonListActivity extends BaseBarActivity implements MastodonLis 


        this.mastodonList = mastodonList;

        canGoBack = true;

        ThemeHelper.slideViewsToLeft(binding.recyclerView, binding.fragmentContainer, () -> {

        fragmentMastodonTimeline = new FragmentMastodonTimeline();

        Bundle bundle = new Bundle();

        bundle.putSerializable(Helper.ARG_LIST_ID, mastodonList.id);
@@ -472,6 +471,8 @@ public class MastodonListActivity extends BaseBarActivity implements MastodonLis 
        fragmentTransaction.replace(R.id.fragment_container, fragmentMastodonTimeline);

        fragmentTransaction.commit();

        invalidateOptionsMenu();

        ThemeHelper.slideViewsToLeft(binding.recyclerView, binding.fragmentContainer, () -> {



        });

    }

app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminActionActivity.java

+33 −30
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ public class AdminActionActivity extends BaseBarActivity { 
    private void displayTimeline(AdminEnum type) {

        canGoBack = true;

        if (type == REPORT) {

            ThemeHelper.slideViewsToLeft(binding.buttonContainer, binding.fragmentContainer, () -> {

            fragmentAdminReport = new FragmentAdminReport();

            Bundle bundle = new Bundle();

            bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, type);
@@ -143,9 +142,10 @@ public class AdminActionActivity extends BaseBarActivity { 
                    fragmentManager.beginTransaction();

            fragmentTransaction.replace(R.id.fragment_container, fragmentAdminReport);

            fragmentTransaction.commit();

            ThemeHelper.slideViewsToLeft(binding.buttonContainer, binding.fragmentContainer, () -> {



            });

        } else if (type == ACCOUNT) {

            ThemeHelper.slideViewsToLeft(binding.buttonContainer, binding.fragmentContainer, () -> {

            fragmentAdminAccount = new FragmentAdminAccount();

            Bundle bundle = new Bundle();

            bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, type);
@@ -156,9 +156,10 @@ public class AdminActionActivity extends BaseBarActivity { 
                    fragmentManager.beginTransaction();

            fragmentTransaction.replace(R.id.fragment_container, fragmentAdminAccount);

            fragmentTransaction.commit();

            ThemeHelper.slideViewsToLeft(binding.buttonContainer, binding.fragmentContainer, () -> {



            });

        } else if (type == DOMAIN) {

            ThemeHelper.slideViewsToLeft(binding.buttonContainer, binding.fragmentContainer, () -> {

            fragmentAdminDomain = new FragmentAdminDomain();

            Bundle bundle = new Bundle();

            bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, type);
@@ -169,6 +170,8 @@ public class AdminActionActivity extends BaseBarActivity { 
                    fragmentManager.beginTransaction();

            fragmentTransaction.replace(R.id.fragment_container, fragmentAdminDomain);

            fragmentTransaction.commit();

            ThemeHelper.slideViewsToLeft(binding.buttonContainer, binding.fragmentContainer, () -> {



            });

        }

        switch (type) {

app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminReportActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -157,10 +157,10 @@ public class AdminReportActivity extends BaseBarActivity { 
                lastActive.append(Helper.shortDateToString(ip.used_at)).append(" - ").append(ip.ip).append("\r\n");

            }

        }

        if (lastActive.toString().trim().length() == 0) {

        if (lastActive.toString().trim().isEmpty()) {

            binding.lastActiveContainer.setVisibility(View.GONE);

        }

        if (adminAccount.email == null || adminAccount.email.trim().length() == 0) {

        if (adminAccount.email == null || adminAccount.email.trim().isEmpty()) {

            binding.emailContainer.setVisibility(View.GONE);

        }

        binding.lastActive.setText(lastActive.toString());
@@ -260,7 +260,7 @@ public class AdminReportActivity extends BaseBarActivity { 




        //Animate emojis

        if (account.emojis != null && account.emojis.size() > 0) {

        if (account.emojis != null && !account.emojis.isEmpty()) {

            boolean disableAnimatedEmoji = sharedpreferences.getBoolean(getString(R.string.SET_DISABLE_ANIMATED_EMOJI), false);

            if (!disableAnimatedEmoji) {

                scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();