null check in getOriginalPath

Daniel Gultsch created 10 years ago

Change summary

src/main/java/eu/siacs/conversations/persistance/FileBackend.java | 1 
src/main/java/eu/siacs/conversations/utils/FileUtils.java         | 3 +
2 files changed, 3 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/persistance/FileBackend.java

@@ -152,7 +152,6 @@ public class FileBackend {
 	}
 
 	public String getOriginalPath(Uri uri) {
-		Log.d(Config.LOGTAG,"get original path for uri: "+uri.toString());
 		return FileUtils.getPath(mXmppConnectionService,uri);
 	}
 

src/main/java/eu/siacs/conversations/utils/FileUtils.java

@@ -23,6 +23,9 @@ public class FileUtils {
 	 */
 	@SuppressLint("NewApi")
 	public static String getPath(final Context context, final Uri uri) {
+		if (uri == null) {
+			return null;
+		}
 
 		final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;