Commit 3ab25e33 authored by Thomas's avatar Thomas
Browse files

Fix some crashes

parent 80f6fb23

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

+4 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ public class HashTagActivity extends BaseActivity { 
                pinned = new Pinned();

                pinned.pinnedTimelines = new ArrayList<>();

            }

            this.pinned = pinned;

            pinnedTag = false;

            if (pinned.pinnedTimelines != null) {

                for (PinnedTimeline pinnedTimeline : pinned.pinnedTimelines) {
@@ -173,6 +174,9 @@ public class HashTagActivity extends BaseActivity { 
                unpinConfirm.setMessage(getString(R.string.unpin_timeline_description));

                unpinConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());

                unpinConfirm.setPositiveButton(R.string.yes, (dialog, which) -> {

                    if (pinned == null || pinned.pinnedTimelines == null) {

                        return;

                    }

                    pinned.pinnedTimelines.remove(pinnedTimeline);

                    try {

                        new Pinned(HashTagActivity.this).updatePinned(pinned);

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

+4 −0
Original line number Diff line number Diff line
@@ -113,6 +113,10 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload 
            attachments = (ArrayList<Attachment>) b.getSerializable(Helper.ARG_MEDIA_ARRAY);

            status = (Status) b.getSerializable(Helper.ARG_STATUS);

        }

        if (getSupportActionBar() != null) {

            getSupportActionBar().setDisplayHomeAsUpEnabled(true);

            getSupportActionBar().setDisplayShowHomeEnabled(true);

        }



        if (attachments == null || attachments.size() == 0)

            finish();

app/src/main/java/app/fedilab/android/ui/fragment/media/FragmentMediaProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public class FragmentMediaProfile extends Fragment { 


                @Override

                public void federatedAccount(Account account) {

                    if (account != null) {

                    if (account != null && !requireActivity().isFinishing() && isAdded()) {

                        accountId = account.id;

                        accountsVM.getAccountStatuses(tempInstance, null, accountId, null, null, null, null, null, true, false, MastodonHelper.statusesPerCall(requireActivity()))

                                .observe(getViewLifecycleOwner(), statuses -> initializeStatusesCommonView(statuses));

app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java

+1 −1
Original line number Diff line number Diff line
@@ -1067,7 +1067,7 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter. 


                        @Override

                        public void federatedAccount(Account account) {

                            if (account != null) {

                            if (account != null && !requireActivity().isFinishing() && isAdded()) {

                                accountIDInRemoteInstance = account.id;

                                accountsVM.getAccountStatuses(tempInstance, null, accountIDInRemoteInstance, null, null, null, null, null, false, true, MastodonHelper.statusesPerCall(requireActivity()))

                                        .observe(getViewLifecycleOwner(), pinnedStatuses -> accountsVM.getAccountStatuses(tempInstance, null, accountIDInRemoteInstance, null, null, null, exclude_replies, exclude_reblogs, media_only, false, MastodonHelper.statusesPerCall(requireActivity()))