1 files changed, 42 insertions, 7 deletions

diff --git a/src/main/java/eu/siacs/conversations/utils/FileUtils.java b/src/main/java/eu/siacs/conversations/utils/FileUtils.java
index 6e75d41c..7783bcc9 100644
--- a/src/main/java/eu/siacs/conversations/utils/FileUtils.java
+++ b/src/main/java/eu/siacs/conversations/utils/FileUtils.java
@@ -1,6 +1,7 @@
 package eu.siacs.conversations.utils;
 
 import android.annotation.SuppressLint;
+import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.Context;
 import android.database.Cursor;
@@ -12,25 +13,26 @@ import android.provider.MediaStore;
 
 import java.io.File;
 
-public class FileUtils {
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+
+public final 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
 	 */
 	@SuppressLint("NewApi")
-	public static String getPath(final Context context, final Uri uri) {
+	public static String getPath(final Uri uri) {
 		if (uri == null) {
 			return null;
 		}
 
 		final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
-
+        final Context context = ConversationsPlusApplication.getAppContext();
 		// DocumentProvider
 		if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
 			// ExternalStorageProvider
@@ -78,7 +80,7 @@ public class FileUtils {
 			}
 		}
 		// MediaStore (and general)
-		else if ("content".equalsIgnoreCase(uri.getScheme())) {
+		else if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {
 			String path = getDataColumn(context, uri, null, null);
 			if (path != null) {
 				File file = new File(path);
@@ -89,7 +91,7 @@ public class FileUtils {
 			return path;
 		}
 		// File
-		else if ("file".equalsIgnoreCase(uri.getScheme())) {
+		else if (ContentResolver.SCHEME_FILE.equals(uri.getScheme())) {
 			return uri.getPath();
 		}
 
@@ -106,7 +108,7 @@ public class FileUtils {
 	 * @param selectionArgs (Optional) Selection arguments used in the query.
 	 * @return The value of the _data column, which is typically a file path.
 	 */
-	public static String getDataColumn(Context context, Uri uri, String selection,
+	private static String getDataColumn(Context context, Uri uri, String selection,
 									   String[] selectionArgs) {
 
 		Cursor cursor = null;
@@ -155,4 +157,37 @@ public class FileUtils {
 	public static boolean isMediaDocument(Uri uri) {
 		return "com.android.providers.media.documents".equals(uri.getAuthority());
 	}
+
+	/**
+	 * @param filename The filename to extract extension from
+	 * @return last extension or empty string
+	 */
+	public static String getLastExtension(final String filename) {
+		if (filename == null || filename.isEmpty()) {
+			return "";
+		}
+		final int lastDotPosition = filename.lastIndexOf('.');
+		final String lastPart = lastDotPosition != -1 ?
+				filename.substring(lastDotPosition + 1) : "";
+		return lastPart;
+	}
+
+	/**
+	 * @param filename The filename to extract extension from
+	 * @return second to last extension or empty string
+	 */
+	public static String getSecondToLastExtension(final String filename) {
+		if (filename == null || filename.isEmpty()) {
+			return "";
+		}
+		final int lastDotPosition = filename.lastIndexOf('.');
+		final int secondToLastDotPosition = filename.lastIndexOf('.', lastDotPosition - 1);
+		final String secondToLastPart = secondToLastDotPosition != -1 ?
+				filename.substring(secondToLastDotPosition + 1, lastDotPosition) : "";
+		return secondToLastPart;
+	}
+
+	private FileUtils() {
+		// Utility class - do not instantiate
+	}
 }