Skip to content

Commit

Permalink
revert changes for conflict resolve dialog
Browse files Browse the repository at this point in the history
Signed-off-by: alperozturk <[email protected]>
  • Loading branch information
alperozturk96 committed Feb 7, 2025
1 parent a1c55cf commit 2756f39
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions app/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.datamodel.ThumbnailsCacheManager;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.lib.resources.files.model.ServerFileInterface;
import com.owncloud.android.utils.theme.ViewThemeUtils;

Expand Down Expand Up @@ -74,7 +73,6 @@ public final class MimeTypeUtil {
*/
private static final Map<String, List<String>> FILE_EXTENSION_TO_MIMETYPE_MAPPING = new HashMap<>();
public static final String MIMETYPE_TEXT_MARKDOWN = "text/markdown";
private static final String TAG = "MimeTypeUtil";

static {
populateFileExtensionMimeTypeMapping();
Expand All @@ -86,16 +84,6 @@ private MimeTypeUtil() {
// utility class -> private constructor
}

public static Drawable getFileTypeIcon(File file, Context context, ViewThemeUtils viewThemeUtils) {
if (file == null || !file.exists()) {
Log_OC.d(TAG, "Cannot getFileTypeIcon. File is null or not exists");
return null;
}

final var mimeType = MimeTypeUtil.getMimeTypeFromPath(file.getPath());
return MimeTypeUtil.getFileTypeIcon(mimeType, file.getName(), context, viewThemeUtils);
}

/**
* Returns the Drawable of an image to use as icon associated to a known MIME type.
*
Expand Down

0 comments on commit 2756f39

Please sign in to comment.