From 6226f2cd2634fb4b48e10d835df0fd411ad16173 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Tue, 12 Jan 2016 20:11:24 +1300
Subject: [PATCH] Versioning, changelog

---
 CHANGELOG.md                                  |  3 +++
 commons/AndroidManifest.xml                   |  4 ++--
 .../fr/free/nrw/commons/upload/FileUtils.java | 20 +++++++++----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 526c48bab..7ebe616ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Wikimedia Commons for Android
 
+## v1.6
+- Bugfix for invalid images
+
 ## v1.5
 - Caches area and associated categories
 - Increased search radius for nearby categories
diff --git a/commons/AndroidManifest.xml b/commons/AndroidManifest.xml
index 494b6f511..9ee639ad6 100644
--- a/commons/AndroidManifest.xml
+++ b/commons/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="fr.free.nrw.commons"
-    android:versionCode="21"
-    android:versionName="1.5" >
+    android:versionCode="22"
+    android:versionName="1.6" >
 
     <uses-sdk
         android:minSdkVersion="9"
diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/FileUtils.java b/commons/src/main/java/fr/free/nrw/commons/upload/FileUtils.java
index 28f1b6052..c57b2bd53 100644
--- a/commons/src/main/java/fr/free/nrw/commons/upload/FileUtils.java
+++ b/commons/src/main/java/fr/free/nrw/commons/upload/FileUtils.java
@@ -9,16 +9,17 @@ import android.os.Environment;
 import android.provider.MediaStore;
 import android.provider.DocumentsContract;
 
-
-/**
- * Get a file path from a Uri. This will get the the path for Storage Access
- * Framework Documents, as well as the _data field for the MediaStore and
- * other file-based ContentProviders.
- *
- * @author paulburke
- */
-
 public class FileUtils {
+
+    /**
+     * Get a file path from a Uri. This will get the the path for Storage Access
+     * Framework Documents, as well as the _data field for the MediaStore and
+     * other file-based ContentProviders.
+     *
+     * @param context The context.
+     * @param uri The Uri to query.
+     * @author paulburke
+     */
     public static String getPath(final Context context, final Uri uri) {
 
         final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
@@ -111,7 +112,6 @@ public class FileUtils {
         return null;
     }
 
-
     /**
      * @param uri The Uri to check.
      * @return Whether the Uri authority is ExternalStorageProvider.