1 files changed, 11 insertions, 4 deletions
diff --git a/main/src/cgeo/geocaching/utils/ImageUtils.java b/main/src/cgeo/geocaching/utils/ImageUtils.java
index 478be1f..ea4498b 100644
--- a/main/src/cgeo/geocaching/utils/ImageUtils.java
+++ b/main/src/cgeo/geocaching/utils/ImageUtils.java
@@ -1,8 +1,11 @@
 package cgeo.geocaching.utils;
 
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.compatibility.Compatibility;
 
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Point;
@@ -13,6 +16,7 @@ import android.net.Uri;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -45,7 +49,7 @@ public final class ImageUtils {
      * @return BitmapDrawable The scaled image
      */
     public static BitmapDrawable scaleBitmapTo(final Bitmap image, final int maxWidth, final int maxHeight) {
-        final cgeoapplication app = cgeoapplication.getInstance();
+        final CgeoApplication app = CgeoApplication.getInstance();
         Bitmap result = image;
         int width = image.getWidth();
         int height = image.getHeight();
@@ -81,7 +85,7 @@ public final class ImageUtils {
             bitmap.compress(format, quality, bos);
             bos.flush();
             bos.close();
-        } catch (Exception e) {
+        } catch (IOException e) {
             Log.e("ImageHelper.storeBitmap", e);
         }
     }
@@ -95,7 +99,8 @@ public final class ImageUtils {
      *            boundings
      * @return filename and path, <tt>null</tt> if something fails
      */
-    public static String readScaleAndWriteImage(final String filePath, final int maxXY) {
+    @Nullable
+    public static String readScaleAndWriteImage(@NonNull final String filePath, final int maxXY) {
         if (maxXY <= 0) {
             return filePath;
         }
@@ -131,6 +136,7 @@ public final class ImageUtils {
      * @return the temporary image file to use, or <tt>null</tt> if the media directory could
      * not be created.
      * */
+    @Nullable
     public static File getOutputImageFile() {
         // To be safe, you should check that the SDCard is mounted
         // using Environment.getExternalStorageState() before doing this.
@@ -152,6 +158,7 @@ public final class ImageUtils {
         return new File(mediaStorageDir.getPath() + File.separator + "IMG_" + timeStamp + ".jpg");
     }
 
+    @Nullable
     public static Uri getOutputImageFileUri() {
         final File file = getOutputImageFile();
         if (file == null) {