From 3caed68c281bc75ef286bf1843c1b1ddd0059824 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Tue, 12 Jan 2016 15:49:10 +1300
Subject: [PATCH] Revert "Revert "Revert "Added try catch for getRealPath"""

This reverts commit f09cab8356cdb3ea317287c16c5313d5ae07ce51.
---
 .../nrw/commons/upload/ShareActivity.java     | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
index d6e821c6b..88c119939 100644
--- a/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
+++ b/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
@@ -167,21 +167,14 @@ public  class       ShareActivity
     }
 
     private String getRealPathFromURI(Uri contentUri) {
-        Cursor cursor = null;
-        try {
-            String[] proj = {MediaStore.Images.Media.DATA};
-            cursor = getContentResolver().query(contentUri, proj, null, null, null);
-            int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
-            cursor.moveToFirst();
-            return cursor.getString(column_index);
-        } catch (Exception e) {
-            Log.w(TAG, e);
-            return "";
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-        }
+        String[] proj = { MediaStore.Images.Media.DATA };
+        Cursor cursor = getContentResolver().query(contentUri, proj, null, null, null);
+        int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+        cursor.moveToFirst();
+
+        String cursorString = cursor.getString(column_index);
+        cursor.close();
+        return cursorString;
     }
 
     @Override
@@ -215,12 +208,14 @@ public  class       ShareActivity
         String filePath = getRealPathFromURI(mediaUri);
         Log.d(TAG, "Filepath: " + filePath);
 
-        if (filePath != null && !filePath.equals("")) {
+
+        if (filePath != null) {
             //extract the coordinates of image in decimal degrees
             Log.d(TAG, "Calling GPSExtractor");
             GPSExtractor imageObj = new GPSExtractor(filePath);
             String decimalCoords = imageObj.getCoords();
 
+
             if (decimalCoords != null) {
                 double decLongitude = imageObj.getDecLongitude();
                 double decLatitude = imageObj.getDecLatitude();
@@ -244,12 +239,16 @@ public  class       ShareActivity
                     Log.d(TAG, "Cache found, setting categoryList in MwVolleyApi to " + displayCatList.toString());
                     MwVolleyApi.setGpsCat(displayCatList);
                 }
+
             }
         }
 
+
+
         if(savedInstanceState != null)  {
             contribution = savedInstanceState.getParcelable("contribution");
         }
+
         requestAuthToken();
     }