Mastodon/Yuito-app-android
1
0
Fork 0
mirror of https://github.com/accelforce/Yuito synced 2025-01-30 15:44:54 +01:00
Code Issues Releases Wiki Activity

Fixes an intermittent null pointer exception caused by getActivity() returning null in callbacks.

Browse Source
This commit is contained in:
Vavassor 2017-07-18 23:34:07 -04:00
parent 51e2b7c949
commit 30d7f269de
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/keylesspalace/tusky/ViewMediaActivity.java
View File

@ -147,6 +147,11 @@ public class ViewMediaActivity extends BaseActivity implements ViewMediaFragment
return true; return true;
} }
@Override
public void onBringUp() {
supportStartPostponedEnterTransition();
}
@Override @Override
public void onDismiss() { public void onDismiss() {
supportFinishAfterTransition(); supportFinishAfterTransition();

8
app/src/main/java/com/keylesspalace/tusky/fragment/ViewMediaFragment.java
View File

@ -35,8 +35,8 @@ import com.squareup.picasso.Picasso;
public class ViewMediaFragment extends BaseFragment { public class ViewMediaFragment extends BaseFragment {
public interface PhotoActionsListener { public interface PhotoActionsListener {
void onBringUp();
void onDismiss(); void onDismiss();
void onPhotoTap(); void onPhotoTap();
} }
@ -45,7 +45,6 @@ public class ViewMediaFragment extends BaseFragment {
View rootView; View rootView;
PhotoView photoView; PhotoView photoView;
private static final String ARG_URL = "url";
private static final String ARG_START_POSTPONED_TRANSITION = "startPostponedTransition"; private static final String ARG_START_POSTPONED_TRANSITION = "startPostponedTransition";
public static ViewMediaFragment newInstance(String url, boolean shouldStartPostponedTransition) { public static ViewMediaFragment newInstance(String url, boolean shouldStartPostponedTransition) {
@ -141,7 +140,8 @@ public class ViewMediaFragment extends BaseFragment {
public void onError() { public void onError() {
// if there's no image in cache, load from network and start trnasition // if there's no image in cache, load from network and start trnasition
// immediately. // immediately.
getActivity().supportStartPostponedEnterTransition(); photoActionsListener.onBringUp();
loadImageFromNetwork(url, photoView); loadImageFromNetwork(url, photoView);
} }
}); });
@ -173,6 +173,6 @@ public class ViewMediaFragment extends BaseFragment {
private void finishLoadingSuccessfully() { private void finishLoadingSuccessfully() {
rootView.findViewById(R.id.view_media_progress).setVisibility(View.GONE); rootView.findViewById(R.id.view_media_progress).setVisibility(View.GONE);
attacher.update(); attacher.update();
getActivity().supportStartPostponedEnterTransition(); photoActionsListener.onBringUp();
} }
} }