Maybe fix java.lang.RuntimeException: Canvas: trying to draw too large bitmap. Fix many bugs.

11 files changed, 72 insertions, 52 deletions

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageActivity.java
index 76acf253..62fa12a5 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImageActivity.java
@@ -89,7 +89,6 @@ public class ViewImageActivity extends AppCompatActivity implements SetAsWallpap
     private String mImageUrl;
     private String mImageFileName;
     private RequestManager glide;
-    private String postTitle;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -131,7 +130,7 @@ public class ViewImageActivity extends AppCompatActivity implements SetAsWallpap
         Intent intent = getIntent();
         mImageUrl = intent.getStringExtra(IMAGE_URL_KEY);
         mImageFileName = intent.getStringExtra(FILE_NAME_KEY);
-        postTitle = intent.getStringExtra(POST_TITLE_KEY);
+        String postTitle = intent.getStringExtra(POST_TITLE_KEY);
 
         if (postTitle != null) {
             setTitle(Html.fromHtml(String.format("<small>%s</small>", postTitle)));
@@ -185,7 +184,7 @@ public class ViewImageActivity extends AppCompatActivity implements SetAsWallpap
                 mProgressBar.setVisibility(View.GONE);
                 return false;
             }
-        }).into(mImageView);
+        }).override(Target.SIZE_ORIGINAL).into(mImageView);
     }
 
     @Override
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImgurMediaActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImgurMediaActivity.java
index c4b0e38d..f35d220f 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImgurMediaActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewImgurMediaActivity.java
@@ -287,10 +287,12 @@ public class ViewImgurMediaActivity extends AppCompatActivity implements SetAsWa
     }
 
     private void setToolbarTitle(int position) {
-        if (images.get(position).getType() == ImgurMedia.TYPE_VIDEO) {
-            setTitle(getString(R.string.view_imgur_media_activity_video_label, position + 1, images.size()));
-        } else {
-            setTitle(getString(R.string.view_imgur_media_activity_image_label, position + 1, images.size()));
+        if (images != null && position >= 0 && position < images.size()) {
+            if (images.get(position).getType() == ImgurMedia.TYPE_VIDEO) {
+                setTitle(getString(R.string.view_imgur_media_activity_video_label, position + 1, images.size()));
+            } else {
+                setTitle(getString(R.string.view_imgur_media_activity_image_label, position + 1, images.size()));
+            }
         }
     }
 
@@ -382,17 +384,23 @@ public class ViewImgurMediaActivity extends AppCompatActivity implements SetAsWa
 
     @Override
     public void setToHomeScreen(int viewPagerPosition) {
-        setAsWallpaper(images.get(viewPagerPosition).getLink(), 0);
+        if (images != null && viewPagerPosition >= 0 && viewPagerPosition < images.size()) {
+            setAsWallpaper(images.get(viewPagerPosition).getLink(), 0);
+        }
     }
 
     @Override
     public void setToLockScreen(int viewPagerPosition) {
-        setAsWallpaper(images.get(viewPagerPosition).getLink(), 1);
+        if (images != null && viewPagerPosition >= 0 && viewPagerPosition < images.size()) {
+            setAsWallpaper(images.get(viewPagerPosition).getLink(), 1);
+        }
     }
 
     @Override
     public void setToBoth(int viewPagerPosition) {
-        setAsWallpaper(images.get(viewPagerPosition).getLink(), 2);
+        if (images != null && viewPagerPosition >= 0 && viewPagerPosition < images.size()) {
+            setAsWallpaper(images.get(viewPagerPosition).getLink(), 2);
+        }
     }
 
     public int getCurrentPagePosition() {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSubredditDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSubredditDetailActivity.java
index 0ec10e46..17c80234 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSubredditDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSubredditDetailActivity.java
@@ -701,23 +701,25 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
                 fetchSubredditData();
                 return true;
             case R.id.action_lazy_mode_view_subreddit_detail_activity:
-                MenuItem lazyModeItem = mMenu.findItem(R.id.action_lazy_mode_view_subreddit_detail_activity);
-                if (isInLazyMode) {
-                    isInLazyMode = false;
-                    sectionsPagerAdapter.stopLazyMode();
-                    lazyModeItem.setTitle(R.string.action_start_lazy_mode);
-                    params.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS |
-                            AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS_COLLAPSED);
-                    collapsingToolbarLayout.setLayoutParams(params);
-                } else {
-                    isInLazyMode = true;
-                    if (sectionsPagerAdapter.startLazyMode()) {
-                        lazyModeItem.setTitle(R.string.action_stop_lazy_mode);
-                        appBarLayout.setExpanded(false);
-                        params.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL | AppBarLayout.LayoutParams.SCROLL_FLAG_EXIT_UNTIL_COLLAPSED);
+                if (sectionsPagerAdapter != null) {
+                    MenuItem lazyModeItem = mMenu.findItem(R.id.action_lazy_mode_view_subreddit_detail_activity);
+                    if (isInLazyMode) {
+                        isInLazyMode = false;
+                        sectionsPagerAdapter.stopLazyMode();
+                        lazyModeItem.setTitle(R.string.action_start_lazy_mode);
+                        params.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS |
+                                AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS_COLLAPSED);
                         collapsingToolbarLayout.setLayoutParams(params);
                     } else {
-                        isInLazyMode = false;
+                        isInLazyMode = true;
+                        if (sectionsPagerAdapter.startLazyMode()) {
+                            lazyModeItem.setTitle(R.string.action_stop_lazy_mode);
+                            appBarLayout.setExpanded(false);
+                            params.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL | AppBarLayout.LayoutParams.SCROLL_FLAG_EXIT_UNTIL_COLLAPSED);
+                            collapsingToolbarLayout.setLayoutParams(params);
+                        } else {
+                            isInLazyMode = false;
+                        }
                     }
                 }
                 return true;
@@ -777,7 +779,9 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
 
     @Override
     public void sortTypeSelected(SortType sortType) {
-        sectionsPagerAdapter.changeSortType(sortType);
+        if (sectionsPagerAdapter != null) {
+            sectionsPagerAdapter.changeSortType(sortType);
+        }
     }
 
     @Override
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java
index c4d65766..c7984bfb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java
@@ -1117,7 +1117,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
     private void loadImage(PostDetailBaseViewHolder holder) {
         if (holder instanceof PostDetailImageAndGifAutoplayViewHolder) {
             String url = mAutoplay && mPost.getPostType() == Post.GIF_TYPE ? mPost.getUrl() : mPost.getPreviewUrl();
-            RequestBuilder imageRequestBuilder = mGlide.load(url)
+            RequestBuilder<Drawable> imageRequestBuilder = mGlide.load(url)
                     .listener(new RequestListener<Drawable>() {
                         @Override
                         public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
@@ -1140,12 +1140,12 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
 
             if ((mPost.isNSFW() && mNeedBlurNsfw) || (mPost.isSpoiler() && mNeedBlurSpoiler)) {
                 imageRequestBuilder.apply(RequestOptions.bitmapTransform(new BlurTransformation(50, 10)))
-                        .into(((PostDetailImageAndGifAutoplayViewHolder) holder).mImageView);
+                        .override(Target.SIZE_ORIGINAL).into(((PostDetailImageAndGifAutoplayViewHolder) holder).mImageView);
             } else {
-                imageRequestBuilder.into(((PostDetailImageAndGifAutoplayViewHolder) holder).mImageView);
+                imageRequestBuilder.override(Target.SIZE_ORIGINAL).into(((PostDetailImageAndGifAutoplayViewHolder) holder).mImageView);
             }
         } else if (holder instanceof PostDetailVideoAndGifPreviewHolder) {
-            RequestBuilder imageRequestBuilder = mGlide.load(mPost.getPreviewUrl())
+            RequestBuilder<Drawable> imageRequestBuilder = mGlide.load(mPost.getPreviewUrl())
                     .listener(new RequestListener<Drawable>() {
                         @Override
                         public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
@@ -1168,12 +1168,12 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
 
             if ((mPost.isNSFW() && mNeedBlurNsfw) || (mPost.isSpoiler() && mNeedBlurSpoiler)) {
                 imageRequestBuilder.apply(RequestOptions.bitmapTransform(new BlurTransformation(50, 10)))
-                        .into(((PostDetailVideoAndGifPreviewHolder) holder).mImageView);
+                        .override(Target.SIZE_ORIGINAL).into(((PostDetailVideoAndGifPreviewHolder) holder).mImageView);
             } else {
-                imageRequestBuilder.into(((PostDetailVideoAndGifPreviewHolder) holder).mImageView);
+                imageRequestBuilder.override(Target.SIZE_ORIGINAL).into(((PostDetailVideoAndGifPreviewHolder) holder).mImageView);
             }
         } else if(holder instanceof PostDetailLinkViewHolder) {
-            RequestBuilder imageRequestBuilder = mGlide.load(mPost.getPreviewUrl())
+            RequestBuilder<Drawable> imageRequestBuilder = mGlide.load(mPost.getPreviewUrl())
                     .listener(new RequestListener<Drawable>() {
                         @Override
                         public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
@@ -1196,9 +1196,9 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
 
             if ((mPost.isNSFW() && mNeedBlurNsfw) || (mPost.isSpoiler() && mNeedBlurSpoiler)) {
                 imageRequestBuilder.apply(RequestOptions.bitmapTransform(new BlurTransformation(50, 10)))
-                        .into(((PostDetailLinkViewHolder) holder).mImageView);
+                        .override(Target.SIZE_ORIGINAL).into(((PostDetailLinkViewHolder) holder).mImageView);
             } else {
-                imageRequestBuilder.into(((PostDetailLinkViewHolder) holder).mImageView);
+                imageRequestBuilder.override(Target.SIZE_ORIGINAL).into(((PostDetailLinkViewHolder) holder).mImageView);
             }
         }
     }
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java
index 2b65b05a..e54a0eea 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java
@@ -1145,9 +1145,9 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
 
             if ((post.isNSFW() && mNeedBlurNSFW) || post.isSpoiler() && mNeedBlurSpoiler) {
                 imageRequestBuilder.apply(RequestOptions.bitmapTransform(new BlurTransformation(50, 10)))
-                        .into(((PostImageAndGifAutoplayViewHolder) holder).imageView);
+                        .override(Target.SIZE_ORIGINAL).into(((PostImageAndGifAutoplayViewHolder) holder).imageView);
             } else {
-                imageRequestBuilder.into(((PostImageAndGifAutoplayViewHolder) holder).imageView);
+                imageRequestBuilder.override(Target.SIZE_ORIGINAL).into(((PostImageAndGifAutoplayViewHolder) holder).imageView);
             }
         } else if (holder instanceof PostVideoAndGifPreviewViewHolder) {
             RequestBuilder<Drawable> imageRequestBuilder = mGlide.load(post.getPreviewUrl()).listener(new RequestListener<Drawable>() {
@@ -1173,9 +1173,9 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
 
             if ((post.isNSFW() && mNeedBlurNSFW) || post.isSpoiler() && mNeedBlurSpoiler) {
                 imageRequestBuilder.apply(RequestOptions.bitmapTransform(new BlurTransformation(50, 10)))
-                        .into(((PostVideoAndGifPreviewViewHolder) holder).imageView);
+                        .override(Target.SIZE_ORIGINAL).into(((PostVideoAndGifPreviewViewHolder) holder).imageView);
             } else {
-                imageRequestBuilder.into(((PostVideoAndGifPreviewViewHolder) holder).imageView);
+                imageRequestBuilder.override(Target.SIZE_ORIGINAL).into(((PostVideoAndGifPreviewViewHolder) holder).imageView);
             }
         } else if (holder instanceof PostLinkTypeViewHolder) {
             RequestBuilder<Drawable> imageRequestBuilder = mGlide.load(post.getPreviewUrl()).listener(new RequestListener<Drawable>() {
@@ -1201,9 +1201,9 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
 
             if ((post.isNSFW() && mNeedBlurNSFW) || post.isSpoiler() && mNeedBlurSpoiler) {
                 imageRequestBuilder.apply(RequestOptions.bitmapTransform(new BlurTransformation(50, 10)))
-                        .into(((PostLinkTypeViewHolder) holder).imageView);
+                        .override(Target.SIZE_ORIGINAL).into(((PostLinkTypeViewHolder) holder).imageView);
             } else {
-                imageRequestBuilder.into(((PostLinkTypeViewHolder) holder).imageView);
+                imageRequestBuilder.override(Target.SIZE_ORIGINAL).into(((PostLinkTypeViewHolder) holder).imageView);
             }
         } else if (holder instanceof PostCompactViewHolder) {
             String previewUrl = post.getThumbnailPreviewUrl().equals("") ? post.getPreviewUrl() : post.getThumbnailPreviewUrl();
@@ -1224,9 +1224,9 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
             if ((post.isNSFW() && mNeedBlurNSFW) || post.isSpoiler() && mNeedBlurSpoiler) {
                 imageRequestBuilder
                         .transform(new BlurTransformation(50, 2))
-                        .into(((PostCompactViewHolder) holder).imageView);
+                        .override(Target.SIZE_ORIGINAL).into(((PostCompactViewHolder) holder).imageView);
             } else {
-                imageRequestBuilder.into(((PostCompactViewHolder) holder).imageView);
+                imageRequestBuilder.override(Target.SIZE_ORIGINAL).into(((PostCompactViewHolder) holder).imageView);
             }
         }
     }
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentData.java
index 5c01f3fe..e38ecd11 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentData.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentData.java
@@ -279,7 +279,7 @@ public class CommentData implements Parcelable {
         if (children == null || children.size() == 0) {
             setChildren(moreChildren);
         } else {
-            if (children.get(children.size() - 1).isPlaceHolder) {
+            if (children.size() > 1 && children.get(children.size() - 1).isPlaceHolder) {
                 children.addAll(children.size() - 2, moreChildren);
             } else {
                 children.addAll(moreChildren);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ViewImgurImageFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ViewImgurImageFragment.java
index 0319c904..99ebd248 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ViewImgurImageFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ViewImgurImageFragment.java
@@ -100,7 +100,7 @@ public class ViewImgurImageFragment extends Fragment {
                 progressBar.setVisibility(View.GONE);
                 return false;
             }
-        }).into(imageView);
+        }).override(Target.SIZE_ORIGINAL).into(imageView);
     }
 
     @Override
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Service/DownloadRedditVideoService.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Service/DownloadRedditVideoService.java
index 3da24433..b958eba2 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Service/DownloadRedditVideoService.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Service/DownloadRedditVideoService.java
@@ -397,7 +397,7 @@ public class DownloadRedditVideoService extends Service {
                 int audioTrack = muxer.addTrack(audioFormat);
                 boolean sawEOS = false;
                 int offset = 100;
-                int sampleSize = 256 * 1024;
+                int sampleSize = 2048 * 1024;
                 ByteBuffer videoBuf = ByteBuffer.allocate(sampleSize);
                 ByteBuffer audioBuf = ByteBuffer.allocate(sampleSize);
                 MediaCodec.BufferInfo videoBufferInfo = new MediaCodec.BufferInfo();
@@ -412,7 +412,6 @@ public class DownloadRedditVideoService extends Service {
                     videoBufferInfo.offset = offset;
                     videoBufferInfo.size = videoExtractor.readSampleData(videoBuf, offset);
 
-
                     if (videoBufferInfo.size < 0 || audioBufferInfo.size < 0) {
                         sawEOS = true;
                         videoBufferInfo.size = 0;
@@ -441,8 +440,10 @@ public class DownloadRedditVideoService extends Service {
                     }
                 }
 
-                muxer.stop();
-                muxer.release();
+                try {
+                    muxer.stop();
+                    muxer.release();
+                } catch (IllegalStateException ignore) {}
             } catch (IOException e) {
                 e.printStackTrace();
                 return false;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/GlideImageGetter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/GlideImageGetter.java
index 04c16284..fc8cfcf9 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/GlideImageGetter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/GlideImageGetter.java
@@ -56,7 +56,7 @@ public class GlideImageGetter implements Html.ImageGetter {
         BitmapDrawablePlaceholder drawable = new BitmapDrawablePlaceholder(textSize);
 
         Context context = container.get().getContext();
-        if (!(context instanceof Activity && ((Activity) context).isFinishing())) {
+        if (!(context instanceof Activity && ((Activity) context).isDestroyed())) {
             container.get().post(() -> Glide.with(context)
                     .asBitmap()
                     .load(source)
@@ -118,7 +118,9 @@ public class GlideImageGetter implements Html.ImageGetter {
 
         @Override
         public void onResourceReady(@NonNull Bitmap bitmap, @Nullable Transition<? super Bitmap> transition) {
-            setDrawable(new BitmapDrawable(container.get().getResources(), bitmap));
+            if (container != null) {
+                setDrawable(new BitmapDrawable(container.get().getResources(), bitmap));
+            }
         }
 
         @Override
diff --git a/app/src/main/res/layout/activity_view_image.xml b/app/src/main/res/layout/activity_view_image.xml
index c094cb47..9a80a732 100644
--- a/app/src/main/res/layout/activity_view_image.xml
+++ b/app/src/main/res/layout/activity_view_image.xml
@@ -28,6 +28,8 @@
                 android:id="@+id/image_view_view_image_activity"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:adjustViewBounds="true"
+                android:scaleType="fitCenter"
                 app:gest_fillViewport="true" />
 
             <LinearLayout
diff --git a/app/src/main/res/layout/fragment_view_imgur_images.xml b/app/src/main/res/layout/fragment_view_imgur_images.xml
index a28346dc..63620c08 100644
--- a/app/src/main/res/layout/fragment_view_imgur_images.xml
+++ b/app/src/main/res/layout/fragment_view_imgur_images.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/constraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -15,7 +16,10 @@
     <com.alexvasilkov.gestures.views.GestureImageView
         android:id="@+id/image_view_view_imgur_image_fragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:adjustViewBounds="true"
+        android:scaleType="fitCenter"
+        app:gest_fillViewport="true" />
 
     <LinearLayout
         android:id="@+id/load_image_error_linear_layout_view_imgur_image_fragment"