diff options
| author | Alex Ning <chineseperson5@gmail.com> | 2018-09-22 02:45:38 +0000 |
|---|---|---|
| committer | Alex Ning <chineseperson5@gmail.com> | 2018-09-22 02:45:38 +0000 |
| commit | fc356c6505d5ee40e719e5b17e3a8a49ac8128c6 (patch) | |
| tree | fa049a14d54251c44b16d9565340f55b8cd3ec3d /app/src/main/java/ml | |
| parent | 88e4cf810fa78592c97f6ba7c8c501e75205a76b (diff) | |
| download | infinity-for-reddit-fc356c6505d5ee40e719e5b17e3a8a49ac8128c6.tar infinity-for-reddit-fc356c6505d5ee40e719e5b17e3a8a49ac8128c6.tar.gz infinity-for-reddit-fc356c6505d5ee40e719e5b17e3a8a49ac8128c6.tar.bz2 infinity-for-reddit-fc356c6505d5ee40e719e5b17e3a8a49ac8128c6.tar.lz infinity-for-reddit-fc356c6505d5ee40e719e5b17e3a8a49ac8128c6.tar.xz infinity-for-reddit-fc356c6505d5ee40e719e5b17e3a8a49ac8128c6.tar.zst infinity-for-reddit-fc356c6505d5ee40e719e5b17e3a8a49ac8128c6.zip | |
Disable the animation for finishing activity in ViewImageActivity and ViewVideoActivity. Fixed a bug that occurred when parsing posts finishes but the PostFragment is not added in any Activity (e.g. Activity finishes).
Diffstat (limited to 'app/src/main/java/ml')
3 files changed, 38 insertions, 22 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java index 7d44eb31..3c67787b 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java @@ -194,17 +194,19 @@ public class PostFragment extends Fragment { getResources().getConfiguration().locale, new ParsePost.ParsePostListener() { @Override public void onParsePostSuccess(ArrayList<PostData> postData, String lastItem) { - mPostData = postData; - mLastItem = lastItem; - mAdapter = new PostRecyclerViewAdapter(getActivity(), postData, mPaginationSynchronizer); - - mPostRecyclerView.setAdapter(mAdapter); - mPostRecyclerView.addOnScrollListener(new PostPaginationScrollListener( - getActivity(), mLinearLayoutManager, mAdapter, lastItem, postData, - mPaginationSynchronizer, mSubredditName, mIsBestPost, - mPaginationSynchronizer.isLoading(), mPaginationSynchronizer.isLoadSuccess(), - getResources().getConfiguration().locale)); - mProgressBar.setVisibility(View.GONE); + if(isAdded() && getActivity() != null) { + mPostData = postData; + mLastItem = lastItem; + mAdapter = new PostRecyclerViewAdapter(getActivity(), postData, mPaginationSynchronizer); + + mPostRecyclerView.setAdapter(mAdapter); + mPostRecyclerView.addOnScrollListener(new PostPaginationScrollListener( + getActivity(), mLinearLayoutManager, mAdapter, lastItem, postData, + mPaginationSynchronizer, mSubredditName, mIsBestPost, + mPaginationSynchronizer.isLoading(), mPaginationSynchronizer.isLoadSuccess(), + getResources().getConfiguration().locale)); + mProgressBar.setVisibility(View.GONE); + } } @Override @@ -264,17 +266,19 @@ public class PostFragment extends Fragment { getResources().getConfiguration().locale, new ParsePost.ParsePostListener() { @Override public void onParsePostSuccess(ArrayList<PostData> postData, String lastItem) { - mPostData = postData; - mLastItem = lastItem; - mAdapter = new PostRecyclerViewAdapter(getActivity(), postData, mPaginationSynchronizer); - - mPostRecyclerView.setAdapter(mAdapter); - mPostRecyclerView.addOnScrollListener(new PostPaginationScrollListener( - getActivity(), mLinearLayoutManager, mAdapter, lastItem, postData, - mPaginationSynchronizer, mSubredditName, mIsBestPost, - mPaginationSynchronizer.isLoading(), mPaginationSynchronizer.isLoadSuccess(), - getResources().getConfiguration().locale)); - mProgressBar.setVisibility(View.GONE); + if(isAdded() && getActivity() != null) { + mPostData = postData; + mLastItem = lastItem; + mAdapter = new PostRecyclerViewAdapter(getActivity(), postData, mPaginationSynchronizer); + + mPostRecyclerView.setAdapter(mAdapter); + mPostRecyclerView.addOnScrollListener(new PostPaginationScrollListener( + getActivity(), mLinearLayoutManager, mAdapter, lastItem, postData, + mPaginationSynchronizer, mSubredditName, mIsBestPost, + mPaginationSynchronizer.isLoading(), mPaginationSynchronizer.isLoadSuccess(), + getResources().getConfiguration().locale)); + mProgressBar.setVisibility(View.GONE); + } } @Override diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewImageActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewImageActivity.java index 031fc88a..af75b8b2 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewImageActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewImageActivity.java @@ -434,4 +434,10 @@ public class ViewImageActivity extends AppCompatActivity { } }); } + + @Override + protected void onPause() { + super.onPause(); + overridePendingTransition(0, 0); + } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewVideoActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewVideoActivity.java index 407f8eff..46423d50 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewVideoActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewVideoActivity.java @@ -403,4 +403,10 @@ public class ViewVideoActivity extends AppCompatActivity { DownloadManager manager = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE); manager.enqueue(request); } + + @Override + protected void onPause() { + super.onPause(); + overridePendingTransition(0, 0); + } } |