Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Some fixes

This commit is contained in:
Thomas 2023-02-08 17:57:50 +01:00
parent 6434b154b4
commit 578161d604
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,7 @@ public class BottomMenu implements Serializable {
} }
public static ItemMenuType getType(BottomMenu bottomMenu, int position) { 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 null;
} }
return bottomMenu.bottom_menu.get(position).item_menu_type; return bottomMenu.bottom_menu.get(position).item_menu_type;

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

@ -2777,6 +2777,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
context.startActivity(intent, options.toBundle()); context.startActivity(intent, options.toBundle());
}); });
holder.bindingArt.artMedia.setOnClickListener(v -> { holder.bindingArt.artMedia.setOnClickListener(v -> {
if (status.art_attachment != null) {
Intent mediaIntent = new Intent(context, MediaActivity.class); Intent mediaIntent = new Intent(context, MediaActivity.class);
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putInt(Helper.ARG_MEDIA_POSITION, 1); b.putInt(Helper.ARG_MEDIA_POSITION, 1);
@ -2787,6 +2788,9 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
ActivityOptionsCompat options = ActivityOptionsCompat ActivityOptionsCompat options = ActivityOptionsCompat
.makeSceneTransitionAnimation((Activity) context, holder.bindingArt.artMedia, status.art_attachment.url); .makeSceneTransitionAnimation((Activity) context, holder.bindingArt.artMedia, status.art_attachment.url);
context.startActivity(mediaIntent, options.toBundle()); context.startActivity(mediaIntent, options.toBundle());
} else {
Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
}
}); });
holder.bindingArt.bottomBanner.setOnClickListener(v -> { holder.bindingArt.bottomBanner.setOnClickListener(v -> {
Intent intent = new Intent(context, ContextActivity.class); Intent intent = new Intent(context, ContextActivity.class);

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

@ -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 * @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) { private void routeCommon(DIRECTION direction, boolean fetchingMissing, Status status) {
if (binding == null || getActivity() == null || !isAdded()) { if (binding == null || !isAdded() || getActivity() == null) {
return; return;
} }
//Initialize with default params //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 * @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) { private void route(DIRECTION direction, boolean fetchingMissing, Status statusToUpdate) {
if (binding == null || getActivity() == null || !isAdded()) { if (binding == null || !isAdded() || getActivity() == null) {
return; return;
} }
// --- HOME TIMELINE --- // --- HOME TIMELINE ---
@ -1083,9 +1083,11 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
initializeStatusesCommonView(otherStatuses); initializeStatusesCommonView(otherStatuses);
})); }));
} else { } else {
if (isAdded() && !requireActivity().isFinishing()) {
Toasty.error(requireActivity(), getString(R.string.toast_fetch_error), Toasty.LENGTH_LONG).show(); Toasty.error(requireActivity(), getString(R.string.toast_fetch_error), Toasty.LENGTH_LONG).show();
} }
} }
}
}); });
} else { } else {
accountId = accountIDInRemoteInstance; accountId = accountIDInRemoteInstance;