Commit c3a89f58 authored by topjohnwu's avatar topjohnwu

Download to proper filename

parent 971cd73f
...@@ -7,6 +7,7 @@ import android.os.Parcelable; ...@@ -7,6 +7,7 @@ import android.os.Parcelable;
import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Const;
import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.Utils;
import com.topjohnwu.magisk.utils.XStringKt;
import java.text.DateFormat; import java.text.DateFormat;
import java.util.Date; import java.util.Date;
...@@ -103,7 +104,7 @@ public class Repo extends BaseModule { ...@@ -103,7 +104,7 @@ public class Repo extends BaseModule {
} }
public String getDownloadFilename() { public String getDownloadFilename() {
return Utils.INSTANCE.getLegalFilename(getName() + "-" + getVersion() + ".zip"); return XStringKt.legalFilename(getName() + "-" + getVersion() + ".zip");
} }
public class IllegalRepoException extends Exception { public class IllegalRepoException extends Exception {
......
...@@ -27,7 +27,7 @@ sealed class DownloadSubject : Parcelable { ...@@ -27,7 +27,7 @@ sealed class DownloadSubject : Parcelable {
@IgnoredOnParcel @IgnoredOnParcel
override val file by lazy { override val file by lazy {
File(Config.downloadDirectory, "${module.name}-v${module.version}(${module.versionCode}).zip") File(Config.downloadDirectory, module.downloadFilename)
} }
} }
......
...@@ -70,12 +70,6 @@ object Utils { ...@@ -70,12 +70,6 @@ object Utils {
return info.loadLabel(pm).toString() return info.loadLabel(pm).toString()
} }
fun getLegalFilename(filename: CharSequence): String {
return filename.toString().replace(" ", "_").replace("'", "").replace("\"", "")
.replace("$", "").replace("`", "").replace("*", "").replace("/", "_")
.replace("#", "").replace("@", "").replace("\\", "_")
}
@WorkerThread @WorkerThread
fun loadModulesLeanback(): Map<String, OldModule> { fun loadModulesLeanback(): Map<String, OldModule> {
val moduleMap = ValueSortedMap<String, OldModule>() val moduleMap = ValueSortedMap<String, OldModule>()
......
...@@ -20,4 +20,8 @@ fun Int.res(vararg args: Any): String { ...@@ -20,4 +20,8 @@ fun Int.res(vararg args: Any): String {
return resources.getString(this, *args) return resources.getString(this, *args)
} }
fun String.trimEmptyToNull(): String? = if (isBlank()) null else this fun String.trimEmptyToNull(): String? = if (isBlank()) null else this
\ No newline at end of file
fun String.legalFilename() = replace(" ", "_").replace("'", "").replace("\"", "")
.replace("$", "").replace("`", "").replace("*", "").replace("/", "_")
.replace("#", "").replace("@", "").replace("\\", "_")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment