Merge pull request #694 from Yalantis/develop

Develop to master
Yalantis · Aug 20, 2020 · 4966845 · 4966845
2 parents 1127920 + f418322
commit 4966845
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
     <application
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
+        android:requestLegacyExternalStorage="true"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <provider

diff --git a/ucrop/src/main/java/com/yalantis/ucrop/task/BitmapLoadTask.java b/ucrop/src/main/java/com/yalantis/ucrop/task/BitmapLoadTask.java
@@ -37,6 +37,8 @@ public class BitmapLoadTask extends AsyncTask<Void, Void, BitmapLoadTask.BitmapW
 
     private static final String TAG = "BitmapWorkerTask";
 
+    private static final int MAX_BITMAP_SIZE = 100 * 1024 * 1024;   // 100 MB
+
     private final Context mContext;
     private Uri mInputUri;
     private Uri mOutputUri;
@@ -106,6 +108,7 @@ protected BitmapWorkerResult doInBackground(Void... params) {
                 } finally {
                     BitmapLoadUtils.close(stream);
                 }
+                if (checkSize(decodeSampledBitmap, options)) continue;
                 decodeAttemptSuccess = true;
             } catch (OutOfMemoryError error) {
                 Log.e(TAG, "doInBackground: BitmapFactory.decodeFileDescriptor: ", error);
@@ -243,4 +246,12 @@ protected void onPostExecute(@NonNull BitmapWorkerResult result) {
         }
     }
 
-}
+    private boolean checkSize(Bitmap bitmap, BitmapFactory.Options options) {
+        int bitmapSize = bitmap != null ? bitmap.getByteCount() : 0;
+        if (bitmapSize > MAX_BITMAP_SIZE) {
+            options.inSampleSize *= 2;
+            return true;
+        }
+        return false;
+    }
+}