From 0befdc0d34f91f6af1121b8235cc3394cdf99086 Mon Sep 17 00:00:00 2001 From: Kr328 <39107975+Kr328@users.noreply.github.com> Date: Thu, 9 Apr 2020 23:19:59 +0800 Subject: [PATCH] clean up code --- .../kr328/clash/service/files/ProfileDirectoryResolver.kt | 3 +-- .../com/github/kr328/clash/service/files/ProfilesResolver.kt | 1 - .../com/github/kr328/clash/service/files/ProviderResolver.kt | 4 +--- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/service/src/main/java/com/github/kr328/clash/service/files/ProfileDirectoryResolver.kt b/service/src/main/java/com/github/kr328/clash/service/files/ProfileDirectoryResolver.kt index ce1c8d0..67f8159 100644 --- a/service/src/main/java/com/github/kr328/clash/service/files/ProfileDirectoryResolver.kt +++ b/service/src/main/java/com/github/kr328/clash/service/files/ProfileDirectoryResolver.kt @@ -7,7 +7,6 @@ import com.github.kr328.clash.service.R import com.github.kr328.clash.service.util.resolveBase import com.github.kr328.clash.service.util.resolveProfile import java.io.FileNotFoundException -import java.lang.UnsupportedOperationException class ProfileDirectoryResolver(private val context: Context) { companion object { @@ -15,7 +14,7 @@ class ProfileDirectoryResolver(private val context: Context) { const val FILE_NAME_PROVIDER = "providers" } - private val nextResolver = ProviderResolver(context) + private val nextResolver = ProviderResolver() fun resolve(id: Long, paths: List): VirtualFile { if (paths.size == 1) { diff --git a/service/src/main/java/com/github/kr328/clash/service/files/ProfilesResolver.kt b/service/src/main/java/com/github/kr328/clash/service/files/ProfilesResolver.kt index fef6955..b2fc7f8 100644 --- a/service/src/main/java/com/github/kr328/clash/service/files/ProfilesResolver.kt +++ b/service/src/main/java/com/github/kr328/clash/service/files/ProfilesResolver.kt @@ -7,7 +7,6 @@ import com.github.kr328.clash.service.R import com.github.kr328.clash.service.data.ClashDatabase import com.github.kr328.clash.service.data.ClashProfileEntity import java.io.FileNotFoundException -import java.lang.UnsupportedOperationException class ProfilesResolver(private val context: Context, private val database: ClashDatabase) { private val nextResolver = ProfileDirectoryResolver(context) diff --git a/service/src/main/java/com/github/kr328/clash/service/files/ProviderResolver.kt b/service/src/main/java/com/github/kr328/clash/service/files/ProviderResolver.kt index 122d729..b29f639 100644 --- a/service/src/main/java/com/github/kr328/clash/service/files/ProviderResolver.kt +++ b/service/src/main/java/com/github/kr328/clash/service/files/ProviderResolver.kt @@ -1,13 +1,11 @@ package com.github.kr328.clash.service.files -import android.content.Context import android.os.ParcelFileDescriptor import com.github.kr328.clash.service.util.resolveBase import java.io.FileNotFoundException -import java.lang.UnsupportedOperationException import java.net.URLDecoder -class ProviderResolver(private val context: Context) { +class ProviderResolver { fun resolve(id: Long, fileName: String): VirtualFile { val file = resolveBase(id).resolve(fileName) if (!file.exists())