Kr328/ClashForAndroid
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup code & rename util -> utils

Browse Source
This commit is contained in:
Kr328 committed 2020-04-14 19:50:56 +08:00
1 parent bca2a7a520
commit b41715686c
23 files changed
+27 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/github/kr328/clash/BaseActivity.kt
+1 -1
View File
@@ -13,7 +13,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.app.AppCompatDelegate
import androidx.appcompat.widget.Toolbar
import androidx.coordinatorlayout.widget.CoordinatorLayout
import com.github.kr328.clash.common.util.createLanguageConfigurationContext
import com.github.kr328.clash.common.utils.createLanguageConfigurationContext
import com.github.kr328.clash.preference.UiSettings
import com.github.kr328.clash.remote.Broadcasts
import com.google.android.material.snackbar.Snackbar
app/src/main/java/com/github/kr328/clash/CreateProfileActivity.kt
+1 -2
View File
@@ -13,9 +13,8 @@ import android.view.View
import android.view.ViewGroup
import android.widget.BaseAdapter
import android.widget.TextView
import com.github.kr328.clash.common.util.intent
import com.github.kr328.clash.common.utils.intent
import com.github.kr328.clash.remote.withProfile
import com.github.kr328.clash.service.model.Profile
import com.github.kr328.clash.service.model.Profile.Type
import kotlinx.android.synthetic.main.activity_create_profile.*
import kotlinx.coroutines.Dispatchers
app/src/main/java/com/github/kr328/clash/LogViewerActivity.kt
+1 -1
View File
@@ -10,7 +10,7 @@ import androidx.core.net.toFile
import androidx.recyclerview.widget.LinearLayoutManager
import com.github.kr328.clash.adapter.LiveLogAdapter
import com.github.kr328.clash.adapter.LogAdapter
import com.github.kr328.clash.common.util.intent
import com.github.kr328.clash.common.utils.intent
import com.github.kr328.clash.core.event.LogEvent
import kotlinx.android.synthetic.main.activity_log_viewer.*
import kotlinx.coroutines.*
app/src/main/java/com/github/kr328/clash/LogcatService.kt
+2 -2
View File
@@ -15,8 +15,8 @@ import android.os.IInterface
import androidx.collection.CircularArray
import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat
import com.github.kr328.clash.common.util.createLanguageConfigurationContext
import com.github.kr328.clash.common.util.intent
import com.github.kr328.clash.common.utils.createLanguageConfigurationContext
import com.github.kr328.clash.common.utils.intent
import com.github.kr328.clash.common.utils.Log
import com.github.kr328.clash.core.event.LogEvent
import com.github.kr328.clash.model.LogFile
app/src/main/java/com/github/kr328/clash/LogsActivity.kt
+2 -2
View File
@@ -11,8 +11,8 @@ import androidx.appcompat.app.AlertDialog
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.LinearLayoutManager
import com.github.kr328.clash.adapter.LogFileAdapter
import com.github.kr328.clash.common.util.intent
import com.github.kr328.clash.common.util.startForegroundServiceCompat
import com.github.kr328.clash.common.utils.intent
import com.github.kr328.clash.common.utils.startForegroundServiceCompat
import com.github.kr328.clash.design.common.Category
import com.github.kr328.clash.design.view.CommonUiLayout
import com.github.kr328.clash.model.LogFile
app/src/main/java/com/github/kr328/clash/MainActivity.kt
+1 -1
View File
@@ -8,7 +8,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.appcompat.app.AlertDialog
import com.github.kr328.clash.common.util.intent
import com.github.kr328.clash.common.utils.intent
import com.github.kr328.clash.common.utils.asBytesString
import com.github.kr328.clash.core.model.General
import com.github.kr328.clash.remote.withClash
app/src/main/java/com/github/kr328/clash/MainApplication.kt
+1 -1
View File
@@ -5,7 +5,7 @@ import android.content.Context
import android.content.Intent
import android.net.Uri
import com.github.kr328.clash.common.Global
import com.github.kr328.clash.common.util.componentName
import com.github.kr328.clash.common.utils.componentName
import com.github.kr328.clash.dump.LogcatDumper
import com.github.kr328.clash.remote.Broadcasts
import com.github.kr328.clash.remote.Remote
app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt
+1 -1
View File
@@ -5,7 +5,7 @@ import android.net.Uri
import android.os.Bundle
import androidx.recyclerview.widget.LinearLayoutManager
import com.github.kr328.clash.adapter.ProfileAdapter
import com.github.kr328.clash.common.util.intent
import com.github.kr328.clash.common.utils.intent
import com.github.kr328.clash.remote.withProfile
import com.github.kr328.clash.service.ProfileReceiver
import com.github.kr328.clash.service.model.Profile
app/src/main/java/com/github/kr328/clash/SettingsActivity.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package com.github.kr328.clash
import android.os.Bundle
import com.github.kr328.clash.common.util.intent
import com.github.kr328.clash.common.utils.intent
import kotlinx.android.synthetic.main.activity_settings.*
class SettingsActivity : BaseActivity() {
app/src/main/java/com/github/kr328/clash/remote/Remote.kt
+1 -1
View File
@@ -12,7 +12,7 @@ import androidx.core.content.edit
import com.github.kr328.clash.ApkBrokenActivity
import com.github.kr328.clash.Constants
import com.github.kr328.clash.common.Global
import com.github.kr328.clash.common.util.intent
import com.github.kr328.clash.common.utils.intent
import com.github.kr328.clash.common.utils.Log
import com.github.kr328.clash.service.ClashManagerService
import com.github.kr328.clash.service.IClashManager
app/src/main/java/com/github/kr328/clash/remote/RemoteUtils.kt
+1 -1
View File
@@ -4,7 +4,7 @@ import android.content.Context
import android.content.Intent
import android.net.Uri
import com.github.kr328.clash.ApkBrokenActivity
import com.github.kr328.clash.common.util.intent
import com.github.kr328.clash.common.utils.intent
import com.github.kr328.clash.service.Constants
import com.github.kr328.clash.service.ServiceStatusProvider
app/src/main/java/com/github/kr328/clash/settings/BehaviorFragment.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package com.github.kr328.clash.settings
import android.content.pm.PackageManager
import android.os.Bundle
import com.github.kr328.clash.R
import com.github.kr328.clash.common.util.componentName
import com.github.kr328.clash.common.utils.componentName
import com.github.kr328.clash.remote.Broadcasts
import com.github.kr328.clash.service.RestartReceiver
import com.github.kr328.clash.service.settings.ServiceSettings
app/src/main/java/com/github/kr328/clash/settings/NetworkFragment.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package com.github.kr328.clash.settings
import android.os.Bundle
import com.github.kr328.clash.PackagesActivity
import com.github.kr328.clash.R
import com.github.kr328.clash.common.util.intent
import com.github.kr328.clash.common.utils.intent
import com.github.kr328.clash.remote.Broadcasts
import com.github.kr328.clash.service.settings.ServiceSettings
common/src/main/java/com/github/kr328/clash/common/util/ComponentUtils.kt → common/src/main/java/com/github/kr328/clash/common/utils/ComponentUtils.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.github.kr328.clash.common.util
package com.github.kr328.clash.common.utils
import android.content.ComponentName
import android.content.Intent
common/src/main/java/com/github/kr328/clash/common/util/LanguageUtils.kt → common/src/main/java/com/github/kr328/clash/common/utils/LanguageUtils.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.github.kr328.clash.common.util
package com.github.kr328.clash.common.utils
import android.content.Context
import android.content.res.Configuration
common/src/main/java/com/github/kr328/clash/common/util/ServiceUtils.kt → common/src/main/java/com/github/kr328/clash/common/utils/ServiceUtils.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.github.kr328.clash.common.util
package com.github.kr328.clash.common.utils
import android.content.Context
import android.content.Intent
service/src/main/java/com/github/kr328/clash/service/BaseService.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.github.kr328.clash.service
import android.app.Service
import android.content.Context
import com.github.kr328.clash.common.util.createLanguageConfigurationContext
import com.github.kr328.clash.common.utils.createLanguageConfigurationContext
import com.github.kr328.clash.service.settings.ServiceSettings
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.MainScope
service/src/main/java/com/github/kr328/clash/service/ProfileBackgroundService.kt
+1 -1
View File
@@ -18,7 +18,7 @@ import com.github.kr328.clash.common.ids.Intents
import com.github.kr328.clash.common.ids.NotificationChannels
import com.github.kr328.clash.common.ids.NotificationIds
import com.github.kr328.clash.common.ids.PendingIds
import com.github.kr328.clash.common.util.intent
import com.github.kr328.clash.common.utils.intent
import com.github.kr328.clash.service.data.ProfileDao
import com.github.kr328.clash.service.transact.IStreamCallback
import com.github.kr328.clash.service.transact.ParcelableContainer
service/src/main/java/com/github/kr328/clash/service/ProfileProcessor.kt
-2
View File
@@ -33,8 +33,6 @@ object ProfileProcessor {
context.resolveBaseDir(metadata.id)
)
Log.d("${metadata.uri}")
val entity = if (metadata.type == Type.FILE)
metadata.copy(
uri = ProfileProvider.resolveUri(
service/src/main/java/com/github/kr328/clash/service/ProfileReceiver.kt
+2 -2
View File
@@ -9,8 +9,8 @@ import android.net.Uri
import androidx.core.content.getSystemService
import com.github.kr328.clash.common.ids.Intents
import com.github.kr328.clash.common.ids.PendingIds
import com.github.kr328.clash.common.util.componentName
import com.github.kr328.clash.common.util.startForegroundServiceCompat
import com.github.kr328.clash.common.utils.componentName
import com.github.kr328.clash.common.utils.startForegroundServiceCompat
import com.github.kr328.clash.service.data.ProfileDao
import com.github.kr328.clash.service.model.asProfile
import kotlinx.coroutines.sync.Mutex
service/src/main/java/com/github/kr328/clash/service/RestartReceiver.kt
+2 -2
View File
@@ -3,8 +3,8 @@ package com.github.kr328.clash.service
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import com.github.kr328.clash.common.util.intent
import com.github.kr328.clash.common.util.startForegroundServiceCompat
import com.github.kr328.clash.common.utils.intent
import com.github.kr328.clash.common.utils.startForegroundServiceCompat
import com.github.kr328.clash.service.util.startClashService
class RestartReceiver : BroadcastReceiver() {
service/src/main/java/com/github/kr328/clash/service/data/DatabaseMigrations.kt
+1
View File
@@ -201,6 +201,7 @@ object DatabaseMigrations {
deleteNotificationChannel("profile_service_result")
}
Log.i("Database Migrated 2 -> 3")
} catch (e: Exception) {
Log.e("Migration failure", e)
}
service/src/main/java/com/github/kr328/clash/service/util/ServiceUtils.kt
+2 -2
View File
@@ -4,8 +4,8 @@ import android.content.Context
import android.content.Intent
import android.net.VpnService
import com.github.kr328.clash.common.ids.Intents
import com.github.kr328.clash.common.util.intent
import com.github.kr328.clash.common.util.startForegroundServiceCompat
import com.github.kr328.clash.common.utils.intent
import com.github.kr328.clash.common.utils.startForegroundServiceCompat
import com.github.kr328.clash.service.ClashService
import com.github.kr328.clash.service.TunService
import com.github.kr328.clash.service.settings.ServiceSettings