cleanup

Signed-off-by: Alex Knop <[email protected]>

Author: alexknop

app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -193,9 +193,6 @@ private static Bitmap addThumbnailToCache(String imageKey, Bitmap bitmap, String
 
         Bitmap thumbnail = ThumbnailUtils.extractThumbnail(bitmap, pxW, pxH);
 
-        // Rotate image, obeying exif tag
-        thumbnail = BitmapUtils.rotateImage(thumbnail,path);
-
         // Add thumbnail to cache
         // do not overwrite any pre-existing image
         if (!mThumbnailCache.containsKey(imageKey)) {

app/src/main/java/com/owncloud/android/utils/BitmapUtils.java

@@ -224,73 +224,6 @@ public static Bitmap scaleBitmap(Bitmap bitmap, float px, int width, int height,
         return Bitmap.createScaledBitmap(bitmap, w, h, true);
     }
 
-    /**
-     * Rotate bitmap according to EXIF orientation. Cf. http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/
-     *
-     * @param bitmap      Bitmap to be rotated
-     * @param storagePath Path to source file of bitmap. Needed for EXIF information.
-     * @return correctly EXIF-rotated bitmap
-     */
-    public static Bitmap rotateImage(Bitmap bitmap, String storagePath) {
-        Bitmap resultBitmap = bitmap;
-
-        try {
-            ExifInterface exifInterface = new ExifInterface(storagePath);
-            int orientation = exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, 1);
-
-            if (orientation != ExifInterface.ORIENTATION_NORMAL) {
-                Matrix matrix = new Matrix();
-                switch (orientation) {
-                    // 2
-                    case ExifInterface.ORIENTATION_FLIP_HORIZONTAL: {
-                        matrix.postScale(-1.0f, 1.0f);
-                        break;
-                    }
-                    // 3
-                    case ExifInterface.ORIENTATION_ROTATE_180: {
-                        matrix.postRotate(180);
-                        break;
-                    }
-                    // 4
-                    case ExifInterface.ORIENTATION_FLIP_VERTICAL: {
-                        matrix.postScale(1.0f, -1.0f);
-                        break;
-                    }
-                    // 5
-                    case ExifInterface.ORIENTATION_TRANSPOSE: {
-                        matrix.postRotate(-90);
-                        matrix.postScale(1.0f, -1.0f);
-                        break;
-                    }
-                    // 6
-                    case ExifInterface.ORIENTATION_ROTATE_90: {
-                        matrix.postRotate(90);
-                        break;
-                    }
-                    // 7
-                    case ExifInterface.ORIENTATION_TRANSVERSE: {
-                        matrix.postRotate(90);
-                        matrix.postScale(1.0f, -1.0f);
-                        break;
-                    }
-                    // 8
-                    case ExifInterface.ORIENTATION_ROTATE_270: {
-                        matrix.postRotate(270);
-                        break;
-                    }
-                }
-
-                // Rotate the bitmap
-                resultBitmap = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
-                if (!resultBitmap.equals(bitmap)) {
-                    bitmap.recycle();
-                }
-            }
-        } catch (Exception exception) {
-            Log_OC.e("BitmapUtil", "Could not rotate the image: " + storagePath);
-        }
-        return resultBitmap;
-    }
 
     /**
      * Detect if Image will be rotated according to EXIF orientation. Cf. http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/