Skip to content

Commit 2756f39

Browse files
committed
revert changes for conflict resolve dialog
Signed-off-by: alperozturk <[email protected]>
1 parent a1c55cf commit 2756f39

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

app/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.owncloud.android.R;
2323
import com.owncloud.android.datamodel.OCFile;
2424
import com.owncloud.android.datamodel.ThumbnailsCacheManager;
25-
import com.owncloud.android.lib.common.utils.Log_OC;
2625
import com.owncloud.android.lib.resources.files.model.ServerFileInterface;
2726
import com.owncloud.android.utils.theme.ViewThemeUtils;
2827

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

7977
static {
8078
populateFileExtensionMimeTypeMapping();
@@ -86,16 +84,6 @@ private MimeTypeUtil() {
8684
// utility class -> private constructor
8785
}
8886

89-
public static Drawable getFileTypeIcon(File file, Context context, ViewThemeUtils viewThemeUtils) {
90-
if (file == null || !file.exists()) {
91-
Log_OC.d(TAG, "Cannot getFileTypeIcon. File is null or not exists");
92-
return null;
93-
}
94-
95-
final var mimeType = MimeTypeUtil.getMimeTypeFromPath(file.getPath());
96-
return MimeTypeUtil.getFileTypeIcon(mimeType, file.getName(), context, viewThemeUtils);
97-
}
98-
9987
/**
10088
* Returns the Drawable of an image to use as icon associated to a known MIME type.
10189
*

0 commit comments

Comments
 (0)