Commit 578161d6 authored by Thomas's avatar Thomas
Browse files

Some fixes

parent 6434b154

app/src/main/java/app/fedilab/android/mastodon/client/entities/app/BottomMenu.java

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public class BottomMenu implements Serializable { 
    }



    public static ItemMenuType getType(BottomMenu bottomMenu, int position) {

        if (bottomMenu == null || bottomMenu.bottom_menu == null || bottomMenu.bottom_menu.size() < position) {

        if (bottomMenu == null || bottomMenu.bottom_menu == null || bottomMenu.bottom_menu.size() <= position) {

            return null;

        }

        return bottomMenu.bottom_menu.get(position).item_menu_type;

app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java

+14 −10
Original line number Diff line number Diff line
@@ -2777,6 +2777,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                context.startActivity(intent, options.toBundle());

            });

            holder.bindingArt.artMedia.setOnClickListener(v -> {

                if (status.art_attachment != null) {

                    Intent mediaIntent = new Intent(context, MediaActivity.class);

                    Bundle b = new Bundle();

                    b.putInt(Helper.ARG_MEDIA_POSITION, 1);
@@ -2787,6 +2788,9 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                    ActivityOptionsCompat options = ActivityOptionsCompat

                            .makeSceneTransitionAnimation((Activity) context, holder.bindingArt.artMedia, status.art_attachment.url);

                    context.startActivity(mediaIntent, options.toBundle());

                } else {

                    Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();

                }

            });

            holder.bindingArt.bottomBanner.setOnClickListener(v -> {

                Intent intent = new Intent(context, ContextActivity.class);

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

+5 −3
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter. 
     * @param direction - DIRECTION null if first call, then is set to TOP or BOTTOM depending of scroll

     */

    private void routeCommon(DIRECTION direction, boolean fetchingMissing, Status status) {

        if (binding == null || getActivity() == null || !isAdded()) {

        if (binding == null || !isAdded() || getActivity() == null) {

            return;

        }

        //Initialize with default params
@@ -964,7 +964,7 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter. 
     * @param direction - DIRECTION null if first call, then is set to TOP or BOTTOM depending of scroll

     */

    private void route(DIRECTION direction, boolean fetchingMissing, Status statusToUpdate) {

        if (binding == null || getActivity() == null || !isAdded()) {

        if (binding == null || !isAdded() || getActivity() == null) {

            return;

        }

        // --- HOME TIMELINE ---
@@ -1083,9 +1083,11 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter. 
                                                    initializeStatusesCommonView(otherStatuses);

                                                }));

                            } else {

                                if (isAdded() && !requireActivity().isFinishing()) {

                                    Toasty.error(requireActivity(), getString(R.string.toast_fetch_error), Toasty.LENGTH_LONG).show();

                                }

                            }

                        }

                    });

                } else {

                    accountId = accountIDInRemoteInstance;