Skip to content

Commit

Permalink
Cleanup unused code
Browse files Browse the repository at this point in the history
  • Loading branch information
topjohnwu committed Sep 13, 2021
1 parent acf25aa commit 8d59caf
Show file tree
Hide file tree
Showing 47 changed files with 1 addition and 249 deletions.
42 changes: 0 additions & 42 deletions app/src/main/java/com/topjohnwu/magisk/core/tasks/RepoUpdater.kt

This file was deleted.

90 changes: 0 additions & 90 deletions app/src/main/java/com/topjohnwu/magisk/data/database/RepoDao.kt

This file was deleted.

11 changes: 0 additions & 11 deletions app/src/main/java/com/topjohnwu/magisk/di/ServiceLocator.kt
Expand Up @@ -10,16 +10,13 @@ import com.topjohnwu.magisk.core.Const
import com.topjohnwu.magisk.core.magiskdb.PolicyDao
import com.topjohnwu.magisk.core.magiskdb.SettingsDao
import com.topjohnwu.magisk.core.magiskdb.StringDao
import com.topjohnwu.magisk.core.tasks.RepoUpdater
import com.topjohnwu.magisk.data.database.RepoDatabase
import com.topjohnwu.magisk.data.database.SuLogDatabase
import com.topjohnwu.magisk.data.repository.LogRepository
import com.topjohnwu.magisk.data.repository.NetworkService
import com.topjohnwu.magisk.ktx.deviceProtectedContext
import com.topjohnwu.magisk.ui.home.HomeViewModel
import com.topjohnwu.magisk.ui.install.InstallViewModel
import com.topjohnwu.magisk.ui.log.LogViewModel
import com.topjohnwu.magisk.ui.settings.SettingsViewModel
import com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
import com.topjohnwu.magisk.ui.surequest.SuRequestViewModel

Expand All @@ -36,9 +33,7 @@ object ServiceLocator {
val policyDB = PolicyDao()
val settingsDB = SettingsDao()
val stringDB = StringDao()
val repoDB by lazy { createRepoDatabase(context).repoDao() }
val sulogDB by lazy { createSuLogDatabase(deContext).suLogDao() }
val repoUpdater by lazy { RepoUpdater(networkService, repoDB) }
val logRepo by lazy { LogRepository(sulogDB) }

// Networking
Expand All @@ -60,7 +55,6 @@ object ServiceLocator {
return when (clz) {
HomeViewModel::class.java -> HomeViewModel(networkService)
LogViewModel::class.java -> LogViewModel(logRepo)
SettingsViewModel::class.java -> SettingsViewModel(repoDB)
SuperuserViewModel::class.java -> SuperuserViewModel(policyDB)
InstallViewModel::class.java -> InstallViewModel(networkService)
SuRequestViewModel::class.java -> SuRequestViewModel(policyDB, timeoutPrefs)
Expand All @@ -75,11 +69,6 @@ inline fun <reified VM : ViewModel> ViewModelStoreOwner.viewModel() =
ViewModelProvider(this, ServiceLocator.VMFactory).get(VM::class.java)
}

private fun createRepoDatabase(context: Context) =
Room.databaseBuilder(context, RepoDatabase::class.java, "repo.db")
.fallbackToDestructiveMigration()
.build()

private fun createSuLogDatabase(context: Context) =
Room.databaseBuilder(context, SuLogDatabase::class.java, "sulogs.db")
.fallbackToDestructiveMigration()
Expand Down
Expand Up @@ -77,15 +77,6 @@ object AppSettings : BaseSettingsItem.Section() {
override val title = R.string.home_app_title.asText()
}

object ClearRepoCache : BaseSettingsItem.Blank() {
override val title = R.string.settings_clear_cache_title.asText()
override val description = R.string.settings_clear_cache_summary.asText()

override fun refresh() {
isEnabled = Info.env.isActive
}
}

object Hide : BaseSettingsItem.Input() {
override val title = R.string.settings_hide_app_title.asText()
override val description = R.string.settings_hide_app_summary.asText()
Expand Down
Expand Up @@ -13,7 +13,6 @@ import com.topjohnwu.magisk.core.Const
import com.topjohnwu.magisk.core.Info
import com.topjohnwu.magisk.core.isRunningAsStub
import com.topjohnwu.magisk.core.tasks.HideAPK
import com.topjohnwu.magisk.data.database.RepoDao
import com.topjohnwu.magisk.databinding.adapterOf
import com.topjohnwu.magisk.databinding.itemBindingOf
import com.topjohnwu.magisk.di.AppContext
Expand All @@ -25,9 +24,7 @@ import com.topjohnwu.magisk.utils.Utils
import com.topjohnwu.superuser.Shell
import kotlinx.coroutines.launch

class SettingsViewModel(
private val repositoryDao: RepoDao
) : BaseViewModel(), BaseSettingsItem.Callback {
class SettingsViewModel : BaseViewModel(), BaseSettingsItem.Callback {

val adapter = adapterOf<BaseSettingsItem>()
val itemBinding = itemBindingOf<BaseSettingsItem> { it.bindExtra(BR.callback, this) }
Expand Down Expand Up @@ -57,7 +54,6 @@ class SettingsViewModel(
UpdateChannel, UpdateChannelUrl, UpdateChecker, DownloadPath
))
if (Info.env.isActive) {
list.add(ClearRepoCache)
if (Const.USER_ID == 0) {
if (hidden)
list.add(Restore)
Expand Down Expand Up @@ -106,7 +102,6 @@ class SettingsViewModel(
is Biometrics -> authenticate(callback)
is Theme -> SettingsFragmentDirections.actionSettingsFragmentToThemeFragment().navigate()
is DenyListConfig -> SettingsFragmentDirections.actionSettingsFragmentToDenyFragment().navigate()
is ClearRepoCache -> clearRepoCache()
is SystemlessHosts -> createHosts()
is Restore -> HideAPK.restore(view.activity)
is AddShortcut -> AddHomeIconEvent().publish()
Expand Down Expand Up @@ -136,13 +131,6 @@ class SettingsViewModel(
}.publish()
}

private fun clearRepoCache() {
viewModelScope.launch {
repositoryDao.clear()
Utils.toast(R.string.repo_cache_cleared, Toast.LENGTH_SHORT)
}
}

private fun createHosts() {
Shell.su("add_hosts_module").submit {
Utils.toast(R.string.settings_hosts_toast, Toast.LENGTH_SHORT)
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-ar/strings.xml
Expand Up @@ -125,8 +125,6 @@
<string name="settings_dark_mode_dark">وضـع الظلام</string>
<string name="settings_download_path_title">مسار التحميل</string>
<string name="settings_download_path_message">ستحمل الملفات إلى %1$s</string>
<string name="settings_clear_cache_title">حذف الذاكرة المؤقتة للإضافات</string>
<string name="settings_clear_cache_summary">حذف المعلومات المخزنة محليا، هذا سيجبر التطبيق على التحديث الإضافات عبر الانترنت</string>
<string name="language">اللغة</string>
<string name="system_default">(الأفتراضي)</string>
<string name="settings_check_update_title">تحقق من التحديثات</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-az/strings.xml
Expand Up @@ -71,8 +71,6 @@
<string name="setup_msg">Quraşdırma yerinə yetirilir…</string>

<!--Settings Activity -->
<string name="settings_clear_cache_title">Repo Keşini Təmizlə</string>
<string name="settings_clear_cache_summary">Onlayn repolar üçün keşlənmiş məlumatı silin. Bu tətbiqi onlayn şəkildə yenilənməyə məcbur edir.</string>
<string name="language">Dil</string>
<string name="system_default">(Sistem Dili)</string>
<string name="settings_check_update_title">Yeniləmələri Yoxla</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-be/strings.xml
Expand Up @@ -121,8 +121,6 @@
<string name="settings_dark_mode_dark">Заўсёды цёмны</string>
<string name="settings_download_path_title">Каталог спамповак</string>
<string name="settings_download_path_message">Файлы будуць спампоўвацца ў %1$s</string>
<string name="settings_clear_cache_title">Ачыстка кэшу рэпазіторыя</string>
<string name="settings_clear_cache_summary">Ачысціць кэш сеціўных рэпазіторыяў. Гэта прымусіць абнавіць кэш</string>
<string name="settings_hide_app_title">Схаваць праграму Magisk</string>
<string name="settings_hide_app_summary">Усталяваць проксі-праграму з выпадковым ідэнтыфікатарам пакунка і адвольным значком</string>
<string name="settings_restore_app_title">Аднавіць праграму Magisk</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-bg/strings.xml
Expand Up @@ -67,8 +67,6 @@
<string name="download_file_error">Грешка при изтеглянето на файла.</string>

<!--Settings Activity -->
<string name="settings_clear_cache_title">Изчистване кеша на хранилището</string>
<string name="settings_clear_cache_summary">Изчистване на кешираната информация на онлайн хранилището за принудителното му обновяване.</string>
<string name="language">Език</string>
<string name="system_default">(Системен)</string>
<string name="settings_check_update_title">Проверка за актуализации</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-ca/strings.xml
Expand Up @@ -131,8 +131,6 @@
<string name="settings_dark_mode_dark">Sempre fosc</string>
<string name="settings_download_path_title">Directori de baixades</string>
<string name="settings_download_path_message">Els arxius es desaran a %1$s</string>
<string name="settings_clear_cache_title">Netejar memòria cau del repositori</string>
<string name="settings_clear_cache_summary">Neteja la informació en memòria cau per als repositoris en línia. Força a l\'aplicació a actualitzar-se en línia</string>
<string name="settings_hide_app_title">Amagar Magisk Manager</string>
<string name="settings_hide_app_summary">Torna a empaquetar Magisk Manager amb un nom de paquet a l\'atzar</string>
<string name="settings_restore_app_title">Restaurar Magisk Manager</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-cs/strings.xml
Expand Up @@ -130,8 +130,6 @@
<string name="settings_dark_mode_dark">Tmavý</string>
<string name="settings_download_path_title">Složka pro stahování</string>
<string name="settings_download_path_message">Soubory budou uloženy do %1$s.</string>
<string name="settings_clear_cache_title">Smazat mezipaměť</string>
<string name="settings_clear_cache_summary">Smažete online informace o použití z mezipaměti, a tím na aplikaci vynutíte obnovení online informací.</string>
<string name="settings_hide_app_title">Skrýt aplikaci Magisk</string>
<string name="settings_hide_app_summary">Skryjete aplikaci náhodným ID balíčku a vlastním názvem aplikace.</string>
<string name="settings_restore_app_title">Obnovit aplikaci Magisk</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-de/strings.xml
Expand Up @@ -131,8 +131,6 @@
<string name="settings_dark_mode_dark">Immer dunkel</string>
<string name="settings_download_path_title">Download-Verzeichnis</string>
<string name="settings_download_path_message">Dateien werden in %1$s gespeichert</string>
<string name="settings_clear_cache_title">Repo-Cache leeren</string>
<string name="settings_clear_cache_summary">Löscht die zwischengespeicherten Informationen des Online-Repos. Erzwingt eine Aktualisierung</string>
<string name="settings_hide_app_title">Verstecke die Magisk App</string>
<string name="settings_hide_app_summary">Installiere eine Proxy-App mit zufälliger Paket-ID und benutzerdefiniertem App-Label</string>
<string name="settings_restore_app_title">Stelle die Magisk App wiederher</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-el/strings.xml
Expand Up @@ -130,8 +130,6 @@
<string name="settings_dark_mode_dark">Πάντα Dark</string>
<string name="settings_download_path_title">Διαδρομή λήψης</string>
<string name="settings_download_path_message">Τα αρχεία θα αποθηκευτούν στο %1$s</string>
<string name="settings_clear_cache_title">Εκκαθάριση προσωρινής μνήμης αποθετηρίων</string>
<string name="settings_clear_cache_summary">Καθαρίζει τις κρυφές πληροφορίες για απευθείας συνδεδεμένα αποθετήρια, αναγκάζει την εφαρμογή να κάνει ανανέωση σε απευθείας σύνδεση</string>
<string name="settings_hide_app_title">Απόκρυψη της εφαρμογής Magisk</string>
<string name="settings_hide_app_summary">Εγκαταστήστε μια εφαρμογή με τυχαίο αναγνωριστικό πακέτου και προσαρμοσμένη ετικέτα εφαρμογής</string>
<string name="settings_restore_app_title">Επαναφέρετε την εφαρμογή Magisk</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-es/strings.xml
Expand Up @@ -131,8 +131,6 @@
<string name="settings_dark_mode_dark">Oscuro</string>
<string name="settings_download_path_title">Ruta de Descarga</string>
<string name="settings_download_path_message">Los archivos se guardarán en %1$s</string>
<string name="settings_clear_cache_title">Limpiar caché del repositorio</string>
<string name="settings_clear_cache_summary">Limpiar la información en caché para los repositorios en línea, fuerza a la aplicación a actualizar en línea</string>
<string name="settings_hide_app_title">Esconder la app de Magisk</string>
<string name="settings_hide_app_summary">Instalar una nueva app proxy con una ID de paquete aleatoria y una etiqueta personalizada</string>
<string name="settings_restore_app_title">Restaurar la app de Magisk</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-et/strings.xml
Expand Up @@ -126,8 +126,6 @@
<string name="settings_dark_mode_dark">Alati tume</string>
<string name="settings_download_path_title">Allalaadimise failitee</string>
<string name="settings_download_path_message">Failid salvestatakse kausta %1$s</string>
<string name="settings_clear_cache_title">Tühjenda hoidla vahemälu</string>
<string name="settings_clear_cache_summary">Tühjenda vahemälus olev teave võrgus olevate hoidlate kohta. See sunnib rakendust võrgust värskendama</string>
<string name="language">Keel</string>
<string name="system_default">(Süsteemi vaikesäte)</string>
<string name="settings_check_update_title">Kontrolli uuendusi</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-fa/strings.xml
Expand Up @@ -123,8 +123,6 @@
<string name="settings_dark_mode_dark">همیشه تاریک</string>
<string name="settings_download_path_title">مسیر دانلود</string>
<string name="settings_download_path_message">فایل ها در %1$s ذخیره خواهند شد.</string>
<string name="settings_clear_cache_title">پاک کردن حافظه پنهان</string>
<string name="settings_clear_cache_summary">پاک کردن اطلاعات ذخیره شده برای ریپوسیتوری های آنلاین. این کار برنامه را مجبور به دریافت دوباره اطللاعات هنگام آنلاین شدن میکند</string>
<string name="language">زبان</string>
<string name="system_default">(پیش فرض سیستم)</string>
<string name="settings_check_update_title">چک کردن بروز رسانی ها</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-fr/strings.xml
Expand Up @@ -131,8 +131,6 @@
<string name="settings_dark_mode_dark">Toujours sombre</string>
<string name="settings_download_path_title">Répertoire de téléchargement</string>
<string name="settings_download_path_message">Les fichiers seront enregistrés sous %1$s</string>
<string name="settings_clear_cache_title">Vider le cache des dépôts</string>
<string name="settings_clear_cache_summary">Effacer les informations en cache concerant les dépôts en ligne. Ceci force l’application à télécharger des informations à jour.</string>
<string name="settings_hide_app_title">Masquer l’application Magisk</string>
<string name="settings_hide_app_summary">Installer une application intermédiaire avec un identifiant de paquet aléatoire et un nom personnalisé</string>
<string name="settings_restore_app_title">Restaurer l’application Magisk</string>
Expand Down

0 comments on commit 8d59caf

Please sign in to comment.