Commit 29995fc2 authored by Thomas's avatar Thomas
Browse files

Fix some crashes

parent a3a3d935

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+4 −2
Original line number Diff line number Diff line
@@ -1537,7 +1537,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
        }

        popup.setOnDismissListener(menu1 -> {

            if (binding.viewPager.getAdapter() != null) {

                Fragment fragment = (Fragment) binding.viewPager.getAdapter().instantiateItem(binding.viewPager, binding.tabLayout.getSelectedTabPosition());

                int tabPosition = binding.tabLayout.getSelectedTabPosition();

                Fragment fragment = (Fragment) binding.viewPager.getAdapter().instantiateItem(binding.viewPager, Math.max(tabPosition, 0));

                if (fragment instanceof FragmentMastodonTimeline && fragment.isVisible()) {

                    FragmentMastodonTimeline fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);

                    fragmentMastodonTimeline.refreshAllAdapters();
@@ -1634,7 +1635,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 


    public void refreshFragment() {

        if (binding.viewPager.getAdapter() != null) {

            Fragment fragment = (Fragment) binding.viewPager.getAdapter().instantiateItem(binding.viewPager, binding.tabLayout.getSelectedTabPosition());

            int position = binding.tabLayout.getSelectedTabPosition();

            Fragment fragment = (Fragment) binding.viewPager.getAdapter().instantiateItem(binding.viewPager, Math.max(position, 0));

            if (fragment instanceof FragmentNotificationContainer) {

                FragmentTransaction fragTransaction = getSupportFragmentManager().beginTransaction();

                fragTransaction.detach(fragment).commit();

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMedia.java

+2 −6
Original line number Diff line number Diff line
@@ -105,13 +105,9 @@ public class FragmentMedia extends Fragment { 
                enableSliding(true);

            }

        });

        binding.mediaPicture.setOnClickListener(v -> {

            ((MediaActivity) requireActivity()).toogleFullScreen();

        });

        binding.mediaPicture.setOnClickListener(v -> ((MediaActivity) requireActivity()).toogleFullScreen());



        binding.mediaVideo.setOnClickListener(v -> {

            ((MediaActivity) requireActivity()).toogleFullScreen();

        });

        binding.mediaVideo.setOnClickListener(v -> ((MediaActivity) requireActivity()).toogleFullScreen());



        String type = attachment.type;

        String preview_url = attachment.preview_url;