Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed crashes

This commit is contained in:
Mariotaku Lee 2016-04-19 20:32:12 +08:00
parent 2d5bde0ee5
commit fec060bbdb
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
twidere/src/main/java/edu/tsinghua/hotmobi/model/MediaEvent.java
View File

@ -71,7 +71,7 @@ public class MediaEvent extends BaseEvent implements Parcelable {
@ParcelableThisPlease @ParcelableThisPlease
boolean previewEnabled; boolean previewEnabled;
public static MediaEvent create(Context context, ParcelableStatus status, ParcelableMedia media, public static MediaEvent create(Context context, ParcelableStatus status,@NonNull ParcelableMedia media,
@TimelineType String timelineType, boolean previewEnabled) { @TimelineType String timelineType, boolean previewEnabled) {
final MediaEvent event = new MediaEvent(); final MediaEvent event = new MediaEvent();
event.markStart(context); event.markStart(context);

2
twidere/src/main/java/org/mariotaku/twidere/fragment/AbsActivitiesFragment.java
View File

@ -358,7 +358,7 @@ public abstract class AbsActivitiesFragment extends AbsContentListRecyclerViewFr
public void onMediaClick(IStatusViewHolder holder, View view, ParcelableMedia media, int position) { public void onMediaClick(IStatusViewHolder holder, View view, ParcelableMedia media, int position) {
final ParcelableActivitiesAdapter adapter = getAdapter(); final ParcelableActivitiesAdapter adapter = getAdapter();
final ParcelableStatus status = ParcelableActivityUtils.getActivityStatus(adapter.getActivity(position)); final ParcelableStatus status = ParcelableActivityUtils.getActivityStatus(adapter.getActivity(position));
if (status == null) return; if (status == null || media == null) return;
IntentUtils.openMedia(getActivity(), status, media, null, IntentUtils.openMedia(getActivity(), status, media, null,
mPreferences.getBoolean(KEY_NEW_DOCUMENT_API)); mPreferences.getBoolean(KEY_NEW_DOCUMENT_API));
// BEGIN HotMobi // BEGIN HotMobi

2
twidere/src/main/java/org/mariotaku/twidere/fragment/AbsStatusesFragment.java
View File

@ -346,7 +346,7 @@ public abstract class AbsStatusesFragment extends AbsContentListRecyclerViewFrag
public void onMediaClick(IStatusViewHolder holder, View view, ParcelableMedia media, int statusPosition) { public void onMediaClick(IStatusViewHolder holder, View view, ParcelableMedia media, int statusPosition) {
final ParcelableStatusesAdapter adapter = getAdapter(); final ParcelableStatusesAdapter adapter = getAdapter();
final ParcelableStatus status = adapter.getStatus(statusPosition); final ParcelableStatus status = adapter.getStatus(statusPosition);
if (status == null) return; if (status == null || media == null) return;
IntentUtils.openMedia(getActivity(), status, media, null, IntentUtils.openMedia(getActivity(), status, media, null,
mPreferences.getBoolean(KEY_NEW_DOCUMENT_API)); mPreferences.getBoolean(KEY_NEW_DOCUMENT_API));
// BEGIN HotMobi // BEGIN HotMobi

4
twidere/src/main/java/org/mariotaku/twidere/fragment/StatusFragment.java
View File

@ -416,7 +416,7 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
@Override @Override
public void onMediaClick(IStatusViewHolder holder, View view, ParcelableMedia media, int statusPosition) { public void onMediaClick(IStatusViewHolder holder, View view, ParcelableMedia media, int statusPosition) {
final ParcelableStatus status = mStatusAdapter.getStatus(statusPosition); final ParcelableStatus status = mStatusAdapter.getStatus(statusPosition);
if (status == null) return; if (status == null || media == null) return;
IntentUtils.openMedia(getActivity(), status, media, null, IntentUtils.openMedia(getActivity(), status, media, null,
mPreferences.getBoolean(KEY_NEW_DOCUMENT_API)); mPreferences.getBoolean(KEY_NEW_DOCUMENT_API));
@ -462,7 +462,7 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
@Override @Override
public void onMediaClick(View view, ParcelableMedia media, UserKey accountKey, long extraId) { public void onMediaClick(View view, ParcelableMedia media, UserKey accountKey, long extraId) {
final ParcelableStatus status = mStatusAdapter.getStatus(); final ParcelableStatus status = mStatusAdapter.getStatus();
if (status == null) return; if (status == null || media == null) return;
IntentUtils.openMediaDirectly(getActivity(), accountKey, status, media, null, IntentUtils.openMediaDirectly(getActivity(), accountKey, status, media, null,
mPreferences.getBoolean(KEY_NEW_DOCUMENT_API)); mPreferences.getBoolean(KEY_NEW_DOCUMENT_API));
// BEGIN HotMobi // BEGIN HotMobi