From b41715686c335dda1b03838be4475fc7c601be6f Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Tue, 14 Apr 2020 19:50:56 +0800
Subject: [PATCH] cleanup code & rename util -> utils

---
 app/src/main/java/com/github/kr328/clash/BaseActivity.kt      | 2 +-
 .../main/java/com/github/kr328/clash/CreateProfileActivity.kt | 3 +--
 app/src/main/java/com/github/kr328/clash/LogViewerActivity.kt | 2 +-
 app/src/main/java/com/github/kr328/clash/LogcatService.kt     | 4 ++--
 app/src/main/java/com/github/kr328/clash/LogsActivity.kt      | 4 ++--
 app/src/main/java/com/github/kr328/clash/MainActivity.kt      | 2 +-
 app/src/main/java/com/github/kr328/clash/MainApplication.kt   | 2 +-
 app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt  | 2 +-
 app/src/main/java/com/github/kr328/clash/SettingsActivity.kt  | 2 +-
 app/src/main/java/com/github/kr328/clash/remote/Remote.kt     | 2 +-
 .../main/java/com/github/kr328/clash/remote/RemoteUtils.kt    | 2 +-
 .../java/com/github/kr328/clash/settings/BehaviorFragment.kt  | 2 +-
 .../java/com/github/kr328/clash/settings/NetworkFragment.kt   | 2 +-
 .../kr328/clash/common/{util => utils}/ComponentUtils.kt      | 2 +-
 .../kr328/clash/common/{util => utils}/LanguageUtils.kt       | 2 +-
 .../github/kr328/clash/common/{util => utils}/ServiceUtils.kt | 2 +-
 .../main/java/com/github/kr328/clash/service/BaseService.kt   | 2 +-
 .../github/kr328/clash/service/ProfileBackgroundService.kt    | 2 +-
 .../java/com/github/kr328/clash/service/ProfileProcessor.kt   | 2 --
 .../java/com/github/kr328/clash/service/ProfileReceiver.kt    | 4 ++--
 .../java/com/github/kr328/clash/service/RestartReceiver.kt    | 4 ++--
 .../com/github/kr328/clash/service/data/DatabaseMigrations.kt | 1 +
 .../java/com/github/kr328/clash/service/util/ServiceUtils.kt  | 4 ++--
 23 files changed, 27 insertions(+), 29 deletions(-)
 rename common/src/main/java/com/github/kr328/clash/common/{util => utils}/ComponentUtils.kt (88%)
 rename common/src/main/java/com/github/kr328/clash/common/{util => utils}/LanguageUtils.kt (91%)
 rename common/src/main/java/com/github/kr328/clash/common/{util => utils}/ServiceUtils.kt (86%)

diff --git a/app/src/main/java/com/github/kr328/clash/BaseActivity.kt b/app/src/main/java/com/github/kr328/clash/BaseActivity.kt
index b1e7c22..edd6f5b 100644
--- a/app/src/main/java/com/github/kr328/clash/BaseActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/BaseActivity.kt
@@ -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
diff --git a/app/src/main/java/com/github/kr328/clash/CreateProfileActivity.kt b/app/src/main/java/com/github/kr328/clash/CreateProfileActivity.kt
index 40a0bdf..ef9737a 100644
--- a/app/src/main/java/com/github/kr328/clash/CreateProfileActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/CreateProfileActivity.kt
@@ -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
diff --git a/app/src/main/java/com/github/kr328/clash/LogViewerActivity.kt b/app/src/main/java/com/github/kr328/clash/LogViewerActivity.kt
index cdb9561..530e3d9 100644
--- a/app/src/main/java/com/github/kr328/clash/LogViewerActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/LogViewerActivity.kt
@@ -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.*
diff --git a/app/src/main/java/com/github/kr328/clash/LogcatService.kt b/app/src/main/java/com/github/kr328/clash/LogcatService.kt
index c0abbc7..035887c 100644
--- a/app/src/main/java/com/github/kr328/clash/LogcatService.kt
+++ b/app/src/main/java/com/github/kr328/clash/LogcatService.kt
@@ -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
diff --git a/app/src/main/java/com/github/kr328/clash/LogsActivity.kt b/app/src/main/java/com/github/kr328/clash/LogsActivity.kt
index 589484f..ccb8763 100644
--- a/app/src/main/java/com/github/kr328/clash/LogsActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/LogsActivity.kt
@@ -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
diff --git a/app/src/main/java/com/github/kr328/clash/MainActivity.kt b/app/src/main/java/com/github/kr328/clash/MainActivity.kt
index d20b401..cbdac98 100644
--- a/app/src/main/java/com/github/kr328/clash/MainActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/MainActivity.kt
@@ -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
diff --git a/app/src/main/java/com/github/kr328/clash/MainApplication.kt b/app/src/main/java/com/github/kr328/clash/MainApplication.kt
index 3adaff1..90e67e1 100644
--- a/app/src/main/java/com/github/kr328/clash/MainApplication.kt
+++ b/app/src/main/java/com/github/kr328/clash/MainApplication.kt
@@ -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
diff --git a/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt b/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt
index d55e027..9f2ead5 100644
--- a/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt
@@ -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
diff --git a/app/src/main/java/com/github/kr328/clash/SettingsActivity.kt b/app/src/main/java/com/github/kr328/clash/SettingsActivity.kt
index 3c284d9..bae7ed5 100644
--- a/app/src/main/java/com/github/kr328/clash/SettingsActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/SettingsActivity.kt
@@ -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() {
diff --git a/app/src/main/java/com/github/kr328/clash/remote/Remote.kt b/app/src/main/java/com/github/kr328/clash/remote/Remote.kt
index e2ab26d..d6bbf1c 100644
--- a/app/src/main/java/com/github/kr328/clash/remote/Remote.kt
+++ b/app/src/main/java/com/github/kr328/clash/remote/Remote.kt
@@ -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
diff --git a/app/src/main/java/com/github/kr328/clash/remote/RemoteUtils.kt b/app/src/main/java/com/github/kr328/clash/remote/RemoteUtils.kt
index 087c792..624c7ce 100644
--- a/app/src/main/java/com/github/kr328/clash/remote/RemoteUtils.kt
+++ b/app/src/main/java/com/github/kr328/clash/remote/RemoteUtils.kt
@@ -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
 
diff --git a/app/src/main/java/com/github/kr328/clash/settings/BehaviorFragment.kt b/app/src/main/java/com/github/kr328/clash/settings/BehaviorFragment.kt
index 5bba98e..1d49f87 100644
--- a/app/src/main/java/com/github/kr328/clash/settings/BehaviorFragment.kt
+++ b/app/src/main/java/com/github/kr328/clash/settings/BehaviorFragment.kt
@@ -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
diff --git a/app/src/main/java/com/github/kr328/clash/settings/NetworkFragment.kt b/app/src/main/java/com/github/kr328/clash/settings/NetworkFragment.kt
index 238279d..e5f95df 100644
--- a/app/src/main/java/com/github/kr328/clash/settings/NetworkFragment.kt
+++ b/app/src/main/java/com/github/kr328/clash/settings/NetworkFragment.kt
@@ -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
 
diff --git a/common/src/main/java/com/github/kr328/clash/common/util/ComponentUtils.kt b/common/src/main/java/com/github/kr328/clash/common/utils/ComponentUtils.kt
similarity index 88%
rename from common/src/main/java/com/github/kr328/clash/common/util/ComponentUtils.kt
rename to common/src/main/java/com/github/kr328/clash/common/utils/ComponentUtils.kt
index 4d9c396..c96462f 100644
--- a/common/src/main/java/com/github/kr328/clash/common/util/ComponentUtils.kt
+++ b/common/src/main/java/com/github/kr328/clash/common/utils/ComponentUtils.kt
@@ -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
diff --git a/common/src/main/java/com/github/kr328/clash/common/util/LanguageUtils.kt b/common/src/main/java/com/github/kr328/clash/common/utils/LanguageUtils.kt
similarity index 91%
rename from common/src/main/java/com/github/kr328/clash/common/util/LanguageUtils.kt
rename to common/src/main/java/com/github/kr328/clash/common/utils/LanguageUtils.kt
index f362c9e..aabadc7 100644
--- a/common/src/main/java/com/github/kr328/clash/common/util/LanguageUtils.kt
+++ b/common/src/main/java/com/github/kr328/clash/common/utils/LanguageUtils.kt
@@ -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
diff --git a/common/src/main/java/com/github/kr328/clash/common/util/ServiceUtils.kt b/common/src/main/java/com/github/kr328/clash/common/utils/ServiceUtils.kt
similarity index 86%
rename from common/src/main/java/com/github/kr328/clash/common/util/ServiceUtils.kt
rename to common/src/main/java/com/github/kr328/clash/common/utils/ServiceUtils.kt
index 9236edb..ae12025 100644
--- a/common/src/main/java/com/github/kr328/clash/common/util/ServiceUtils.kt
+++ b/common/src/main/java/com/github/kr328/clash/common/utils/ServiceUtils.kt
@@ -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
diff --git a/service/src/main/java/com/github/kr328/clash/service/BaseService.kt b/service/src/main/java/com/github/kr328/clash/service/BaseService.kt
index f2b53ab..8fe94c6 100644
--- a/service/src/main/java/com/github/kr328/clash/service/BaseService.kt
+++ b/service/src/main/java/com/github/kr328/clash/service/BaseService.kt
@@ -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
diff --git a/service/src/main/java/com/github/kr328/clash/service/ProfileBackgroundService.kt b/service/src/main/java/com/github/kr328/clash/service/ProfileBackgroundService.kt
index bc25224..7d0720b 100644
--- a/service/src/main/java/com/github/kr328/clash/service/ProfileBackgroundService.kt
+++ b/service/src/main/java/com/github/kr328/clash/service/ProfileBackgroundService.kt
@@ -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
diff --git a/service/src/main/java/com/github/kr328/clash/service/ProfileProcessor.kt b/service/src/main/java/com/github/kr328/clash/service/ProfileProcessor.kt
index 9372380..4673d4c 100644
--- a/service/src/main/java/com/github/kr328/clash/service/ProfileProcessor.kt
+++ b/service/src/main/java/com/github/kr328/clash/service/ProfileProcessor.kt
@@ -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(
diff --git a/service/src/main/java/com/github/kr328/clash/service/ProfileReceiver.kt b/service/src/main/java/com/github/kr328/clash/service/ProfileReceiver.kt
index ceb0713..7411da9 100644
--- a/service/src/main/java/com/github/kr328/clash/service/ProfileReceiver.kt
+++ b/service/src/main/java/com/github/kr328/clash/service/ProfileReceiver.kt
@@ -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
diff --git a/service/src/main/java/com/github/kr328/clash/service/RestartReceiver.kt b/service/src/main/java/com/github/kr328/clash/service/RestartReceiver.kt
index 6f43af7..b7ea5cc 100644
--- a/service/src/main/java/com/github/kr328/clash/service/RestartReceiver.kt
+++ b/service/src/main/java/com/github/kr328/clash/service/RestartReceiver.kt
@@ -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() {
diff --git a/service/src/main/java/com/github/kr328/clash/service/data/DatabaseMigrations.kt b/service/src/main/java/com/github/kr328/clash/service/data/DatabaseMigrations.kt
index b4d965a..fea54db 100644
--- a/service/src/main/java/com/github/kr328/clash/service/data/DatabaseMigrations.kt
+++ b/service/src/main/java/com/github/kr328/clash/service/data/DatabaseMigrations.kt
@@ -201,6 +201,7 @@ object DatabaseMigrations {
                     deleteNotificationChannel("profile_service_result")
                 }
 
+                Log.i("Database Migrated 2 -> 3")
             } catch (e: Exception) {
                 Log.e("Migration failure", e)
             }
diff --git a/service/src/main/java/com/github/kr328/clash/service/util/ServiceUtils.kt b/service/src/main/java/com/github/kr328/clash/service/util/ServiceUtils.kt
index 8ad547f..0bcc05b 100644
--- a/service/src/main/java/com/github/kr328/clash/service/util/ServiceUtils.kt
+++ b/service/src/main/java/com/github/kr328/clash/service/util/ServiceUtils.kt
@@ -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