Fix strict mode warning on ParcelFileDescriptor leak

coomar2841 · Aug 17, 2016 · c27e305 · c27e305
1 parent ed95703
commit c27e305
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/image-chooser-library/src/main/java/com/kbeanie/imagechooser/helpers/StreamHelper.java b/image-chooser-library/src/main/java/com/kbeanie/imagechooser/helpers/StreamHelper.java
@@ -50,6 +50,16 @@ public static void flush(OutputStream stream) throws ChooserException {
         }
     }
 
+    public static void close(ParcelFileDescriptor parcelFileDescriptor) throws ChooserException  {
+        if (parcelFileDescriptor != null) {
+            try {
+                parcelFileDescriptor.close();
+            } catch (IOException e) {
+                throw new ChooserException(e);
+            }
+        }
+    }
+
     public static void verifyCursor(Uri uri, Cursor cursor) throws ChooserException {
         if(cursor == null) {
             throw new ChooserException("Didnt not get cursor in return for = " + uri);

diff --git a/...-chooser-library/src/main/java/com/kbeanie/imagechooser/threads/MediaProcessorThread.java b/...-chooser-library/src/main/java/com/kbeanie/imagechooser/threads/MediaProcessorThread.java
@@ -552,12 +552,13 @@ protected void processGooglePhotosMedia(String path, String extension)
 
         BufferedInputStream inputStream = null;
         BufferedOutputStream outStream = null;
+        ParcelFileDescriptor parcelFileDescriptor = null;
 
         try {
 
             filePath = FileUtils.getDirectory(foldername) + File.separator
                     + Calendar.getInstance().getTimeInMillis() + extension;
-            ParcelFileDescriptor parcelFileDescriptor = context
+            parcelFileDescriptor = context
                     .getContentResolver().openFileDescriptor(Uri.parse(path),
                             "r");
 
@@ -585,6 +586,7 @@ protected void processGooglePhotosMedia(String path, String extension)
             flush(outStream);
             close(outStream);
             close(inputStream);
+            close(parcelFileDescriptor);
         }
 
 
@@ -609,12 +611,13 @@ protected ChosenVideo processGooglePhotosMediaNewVideo(String path, String exten
 
         BufferedInputStream inputStream = null;
         BufferedOutputStream outStream = null;
+        ParcelFileDescriptor parcelFileDescriptor = null;
         String localPath;
         try {
 
             localPath = FileUtils.getDirectory(foldername) + File.separator
                     + Calendar.getInstance().getTimeInMillis() + extension;
-            ParcelFileDescriptor parcelFileDescriptor = context
+            parcelFileDescriptor = context
                     .getContentResolver().openFileDescriptor(Uri.parse(path),
                             "r");
 
@@ -642,6 +645,7 @@ protected ChosenVideo processGooglePhotosMediaNewVideo(String path, String exten
             flush(outStream);
             close(outStream);
             close(inputStream);
+            close(parcelFileDescriptor);
         }
 
 
@@ -668,12 +672,13 @@ protected ChosenImage processGooglePhotosMediaNew(String path, String extension)
 
         BufferedInputStream inputStream = null;
         BufferedOutputStream outStream = null;
+        ParcelFileDescriptor parcelFileDescriptor = null;
 
         try {
 
             outFile = FileUtils.getDirectory(foldername) + File.separator
                     + Calendar.getInstance().getTimeInMillis() + extension;
-            ParcelFileDescriptor parcelFileDescriptor = context
+            parcelFileDescriptor = context
                     .getContentResolver().openFileDescriptor(Uri.parse(path),
                             "r");
 
@@ -701,6 +706,7 @@ protected ChosenImage processGooglePhotosMediaNew(String path, String extension)
             flush(outStream);
             close(outStream);
             close(inputStream);
+            close(parcelFileDescriptor);
         }