From 5267cad896a692996e867d9bdde3bbe3620b0921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E7=99=BD-=E7=99=BD?= <i@moedog.org>
Date: Sun, 15 Jan 2023 13:57:24 +0800
Subject: [PATCH] Fix wrong extension when downloading

---
 .../hippo/ehviewer/spider/SpiderQueen.java    |  5 --
 .../java/com/hippo/yorozuya/Utilities.java    | 56 -------------------
 2 files changed, 61 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java
index d9c72a3b6..8555e8342 100644
--- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java
+++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java
@@ -57,7 +57,6 @@ import com.hippo.yorozuya.IOUtils;
 import com.hippo.yorozuya.MathUtils;
 import com.hippo.yorozuya.OSUtils;
 import com.hippo.yorozuya.StringUtils;
-import com.hippo.yorozuya.Utilities;
 import com.hippo.yorozuya.collect.SparseJLArray;
 import com.hippo.yorozuya.thread.PriorityThread;
 import com.hippo.yorozuya.thread.PriorityThreadFactory;
@@ -1276,10 +1275,6 @@ public final class SpiderQueen implements Runnable {
                     if (mediaType != null) {
                         extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mediaType.toString());
                     }
-                    // Ensure extension
-                    if (!Utilities.contain(PageLoader2.SUPPORT_IMAGE_EXTENSIONS, extension)) {
-                        extension = PageLoader2.SUPPORT_IMAGE_EXTENSIONS[0];
-                    }
 
                     OutputStreamPipe osPipe = null;
                     try {
diff --git a/app/src/main/java/com/hippo/yorozuya/Utilities.java b/app/src/main/java/com/hippo/yorozuya/Utilities.java
index c0f2232d5..6f55a1d10 100644
--- a/app/src/main/java/com/hippo/yorozuya/Utilities.java
+++ b/app/src/main/java/com/hippo/yorozuya/Utilities.java
@@ -16,22 +16,10 @@
 
 package com.hippo.yorozuya;
 
-import android.text.TextUtils;
-import android.webkit.MimeTypeMap;
-
 import androidx.annotation.Nullable;
 
-import java.util.regex.Pattern;
-
 public final class Utilities {
 
-    private static final String[] MIME_TYPE_ARRAY = {
-            "image/jpg"
-    };
-    private static final String[] EXTENSION_ARRAY = {
-            "jpg"
-    };
-
     /**
      * Whether the array contain the element
      *
@@ -71,48 +59,4 @@ public final class Utilities {
         }
         return false;
     }
-
-    public static String getNameFromUrl(String url) {
-        if (!TextUtils.isEmpty(url)) {
-            int fragment = url.lastIndexOf('#');
-            if (fragment > 0) {
-                url = url.substring(0, fragment);
-            }
-
-            int query = url.lastIndexOf('?');
-            if (query > 0) {
-                url = url.substring(0, query);
-            }
-
-            int filenamePos = url.lastIndexOf('/');
-            String filename =
-                    0 <= filenamePos ? url.substring(filenamePos + 1) : url;
-
-            // if the filename contains special characters, we don't
-            // consider it valid for our matching purposes:
-            if (filename.length() != 0 &&
-                    Pattern.matches("[a-zA-Z_0-9\\.\\-\\(\\)%]+", filename)) {
-                int dotPos = filename.lastIndexOf('.');
-                if (0 < dotPos) {
-                    return filename.substring(0, dotPos);
-                }
-            }
-        }
-
-        return null;
-    }
-
-    public static String getExtensionFromMimeType(String mimeType) {
-        if (TextUtils.isEmpty(mimeType)) {
-            return null;
-        }
-
-        for (int i = 0, n = MIME_TYPE_ARRAY.length; i < n; i++) {
-            if (MIME_TYPE_ARRAY[i].equals(mimeType)) {
-                return EXTENSION_ARRAY[i];
-            }
-        }
-
-        return MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType);
-    }
 }