From 590b9a79a5e764383324411ba4d08339bf262db8 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Mon, 9 Feb 2015 17:57:48 +0100 Subject: [PATCH] remove extraneous static field --- WordPressUtils/build.gradle | 2 +- .../wordpress/android/util/ImageUtils.java | 20 +++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/WordPressUtils/build.gradle b/WordPressUtils/build.gradle index 86f124cff9b7..b77a086b6199 100644 --- a/WordPressUtils/build.gradle +++ b/WordPressUtils/build.gradle @@ -28,7 +28,7 @@ android { buildToolsVersion "21.1.1" defaultConfig { - versionName "1.3.0" + versionName "1.4.0" minSdkVersion 14 targetSdkVersion 19 } diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java index e12b0a48bb5f..5cce3048feab 100644 --- a/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java +++ b/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java @@ -562,17 +562,15 @@ public static Bitmap getRoundedEdgeBitmap(final Bitmap bitmap, int radius) { /** * Get the maximum size a thumbnail can be to fit in either portrait or landscape orientations. */ - private static int sMaximumThumbnailWidthForEditor; public static int getMaximumThumbnailWidthForEditor(Context context) { - if (sMaximumThumbnailWidthForEditor == 0) { - Point size = DisplayUtils.getDisplayPixelSize(context); - int screenWidth = size.x; - int screenHeight = size.y; - sMaximumThumbnailWidthForEditor = (screenWidth > screenHeight) ? screenHeight : screenWidth; - // 48dp of padding on each side so you can still place the cursor next to the image. - int padding = DisplayUtils.dpToPx(context, 48) * 2; - sMaximumThumbnailWidthForEditor -= padding; - } - return sMaximumThumbnailWidthForEditor; + int maximumThumbnailWidthForEditor; + Point size = DisplayUtils.getDisplayPixelSize(context); + int screenWidth = size.x; + int screenHeight = size.y; + maximumThumbnailWidthForEditor = (screenWidth > screenHeight) ? screenHeight : screenWidth; + // 48dp of padding on each side so you can still place the cursor next to the image. + int padding = DisplayUtils.dpToPx(context, 48) * 2; + maximumThumbnailWidthForEditor -= padding; + return maximumThumbnailWidthForEditor; } }