manager: no need to check overlayfs

This commit is contained in:
5ec1cff
2024-11-23 19:13:36 +08:00
parent 2026654077
commit bb8c9ffac5
41 changed files with 1 additions and 65 deletions

View File

@@ -457,20 +457,6 @@ private fun ModuleList(
},
) {
when {
!viewModel.isOverlayAvailable -> {
item {
Box(
modifier = Modifier.fillParentMaxSize(),
contentAlignment = Alignment.Center
) {
Text(
stringResource(R.string.module_overlay_fs_not_available),
textAlign = TextAlign.Center
)
}
}
}
viewModel.moduleList.isEmpty() -> {
item {
Box(

View File

@@ -350,12 +350,6 @@ suspend fun getSupportedKmis(): List<String> = withContext(Dispatchers.IO) {
out.filter { it.isNotBlank() }.map { it.trim() }
}
fun overlayFsAvailable(): Boolean {
val shell = getRootShell()
// check /proc/filesystems
return ShellUtils.fastCmdResult(shell, "cat /proc/filesystems | grep overlay")
}
fun hasMagisk(): Boolean {
val shell = getRootShell(true)
val result = shell.newJob().add("which magisk").exec()

View File

@@ -13,7 +13,6 @@ import kotlinx.coroutines.launch
import me.weishu.kernelsu.ksuApp
import me.weishu.kernelsu.ui.util.HanziToPinyin
import me.weishu.kernelsu.ui.util.listModules
import me.weishu.kernelsu.ui.util.overlayFsAvailable
import org.json.JSONArray
import org.json.JSONObject
import java.text.Collator
@@ -52,9 +51,6 @@ class ModuleViewModel : ViewModel() {
private set
var search by mutableStateOf("")
var isOverlayAvailable by mutableStateOf(overlayFsAvailable())
private set
var sortEnabledFirst by mutableStateOf(false)
var sortActionFirst by mutableStateOf(false)
val moduleList by derivedStateOf {
@@ -87,8 +83,6 @@ class ModuleViewModel : ViewModel() {
val start = SystemClock.elapsedRealtime()
kotlin.runCatching {
isOverlayAvailable = overlayFsAvailable()
val result = listModules()
Log.i(TAG, "result: $result")

View File

@@ -38,7 +38,6 @@
<string name="module_uninstall_failed">فشل إلغاء تثبيت %s</string>
<string name="module_version">الإصدار</string>
<string name="module_author">المطور</string>
<string name="module_overlay_fs_not_available">الوحدات غير متوفرة حيث يتم تعطيل نظام الملفات المتراكب بواسطة النواة!</string>
<string name="refresh">إنعاش</string>
<string name="show_system_apps">إظهار تطبيقات النظام</string>
<string name="hide_system_apps">إخفاء تطبيقات النظام</string>

View File

@@ -40,7 +40,6 @@
<string name="module_uninstall_failed">Silmək mümkün olmadı: %s</string>
<string name="module_uninstall_success">%s silindi</string>
<string name="hide_system_apps">Sistem proqramlarını gizlət</string>
<string name="module_overlay_fs_not_available">overlayfs mövcud deyil,modul işləyə bilməyəcək!</string>
<string name="send_log">Log-u göndər</string>
<string name="refresh">Yenilə</string>
<string name="safe_mode">Təhlükəsiz rejimi</string>

View File

@@ -38,7 +38,6 @@
<string name="module_uninstall_failed">আনইন্সটল ব্যর্থ: %s</string>
<string name="module_version">ভার্সন</string>
<string name="module_author">লেখক</string>
<string name="module_overlay_fs_not_available">ওভারলেএফএস উপলব্ধ নয়, মডিউল কাজ করতে পারে না!</string>
<string name="refresh">রিফ্রেশ</string>
<string name="show_system_apps">শো সিস্টেম অ্যাপস</string>
<string name="hide_system_apps">হাইড সিস্টেম অ্যাপস</string>

View File

@@ -73,7 +73,6 @@
<string name="selinux_status_disabled">Isključeno</string>
<string name="about">O</string>
<string name="module_uninstall_confirm">Jeste li sigurni da želite deinstalirati modulu %s\?</string>
<string name="module_overlay_fs_not_available">overlayfs nije dostupan, modula ne može raditi!</string>
<string name="home_support_content">KernelSU je, i uvijek če biti, besplatan, i otvorenog izvora. Možete nam međutim pokazati da vas je briga s time da napravite donaciju.</string>
<string name="profile_default">Zadano</string>
<string name="profile_template">Šablon</string>

View File

@@ -25,7 +25,6 @@
<string name="module_uninstall_confirm">Er du sikker på, at du vil afinstallere modulet %s\?</string>
<string name="module_uninstall_success">%s afinstalleret</string>
<string name="module_uninstall_failed">Afinstallation af: %s fejlede</string>
<string name="module_overlay_fs_not_available">overlayfs er ikke tilgængeligt, modulet kan ikke fungere!</string>
<string name="refresh">Opdater</string>
<string name="send_log">Send Log</string>
<string name="safe_mode">Sikker tilstand</string>

View File

@@ -14,7 +14,6 @@
<string name="reboot_download">In den Download-Modus neustarten</string>
<string name="reboot_edl">In den EDL-Modus neustarten</string>
<string name="module_author">Autor</string>
<string name="module_overlay_fs_not_available">Module sind nicht verfügbar, da OverlayFS vom Kernel deaktiviert ist.</string>
<string name="about">Über KernelSU</string>
<string name="module_magisk_conflict">Module sind aufgrund eines Konfliktes mit Magisk nicht verfügbar!</string>
<string name="home_learn_kernelsu_url">https://kernelsu.org/guide/what-is-kernelsu.html</string>

View File

@@ -39,7 +39,6 @@
<string name="module_uninstall_failed">Fallo al desinstalar: %s</string>
<string name="module_version">Versión</string>
<string name="module_author">Autor</string>
<string name="module_overlay_fs_not_available">Los módulos no están disponibles ya que OverlayFS está desactivado por el kernel.</string>
<string name="refresh">Refrescar</string>
<string name="show_system_apps">Mostrar aplicaciones del sistema</string>
<string name="hide_system_apps">Ocultar aplicaciones del sistema</string>

View File

@@ -59,7 +59,6 @@
<string name="module_author">Autor</string>
<string name="module_uninstall_failed">Eemaldamine ebaõnnestus: %s</string>
<string name="module_version">Versioon</string>
<string name="module_overlay_fs_not_available">Moodulid pole saadaval, kuna OverlayFS on kernelis keelatud.</string>
<string name="show_system_apps">Kuva süsteemirakendused</string>
<string name="hide_system_apps">Peida süsteemirakendused</string>
<string name="module_magisk_conflict">Moodulid pole saadaval Magiski konflikti tõttu!</string>

View File

@@ -38,7 +38,6 @@
<string name="module_uninstall_failed">پاک کردن ناموفق بود: %s</string>
<string name="module_version">نسخه</string>
<string name="module_author">سازنده</string>
<string name="module_overlay_fs_not_available">overlayfs موجود نیست. مازول کار نمیکند!!</string>
<string name="refresh">تازه‌سازی</string>
<string name="show_system_apps">نمایش برنامه های سیستمی</string>
<string name="hide_system_apps">مخفی کردن برنامه های سیستمی</string>

View File

@@ -28,7 +28,6 @@
<string name="module_uninstall_success">Na-uninstall ang %s</string>
<string name="module_uninstall_failed">Nabigong i-uninstall: %s</string>
<string name="module_author">May-akda</string>
<string name="module_overlay_fs_not_available">Ang overlayfs ay hindi magagamit, ang modyul ay hindi gagana!</string>
<string name="refresh">I-refresh</string>
<string name="show_system_apps">Ipakita ang mga application ng system</string>
<string name="send_log">Magpadala ng Log</string>

View File

@@ -39,7 +39,6 @@
<string name="module_author">Auteur</string>
<string name="module_uninstall_confirm">Êtes-vous sûr(e) de vouloir désinstaller le module %s\?</string>
<string name="home_learn_kernelsu">Découvrir KernelSU</string>
<string name="module_overlay_fs_not_available">Les modules sont indisponibles car OverlayFS est désactivé par le noyau!</string>
<string name="refresh">Rafraîchir</string>
<string name="show_system_apps">Afficher les applications système</string>
<string name="hide_system_apps">Masquer les applications système</string>

View File

@@ -44,7 +44,6 @@
<string name="home_click_to_install">इंस्टाल करने के लिए क्लिक करें</string>
<string name="profile_selinux_rules">नियम</string>
<string name="profile_groups">समूह</string>
<string name="module_overlay_fs_not_available">Overlayfs उपलब्ध नहीं है, मॉड्यूल काम नहीं कर सकता !</string>
<string name="module">मॉड्यूल</string>
<string name="module_author">निर्माता</string>
<string name="about">हमारे बारे में</string>

View File

@@ -45,7 +45,6 @@
<string name="module_version">Verzija</string>
<string name="module_author">Autor</string>
<string name="refresh">Osvježi</string>
<string name="module_overlay_fs_not_available">overlayfs nije dostupan, modula ne može raditi!</string>
<string name="module_magisk_conflict">Module su isključene jer je u sukobu sa Magisk-om!</string>
<string name="home_learn_kernelsu">Naučite KernelSU</string>
<string name="home_learn_kernelsu_url">https://kernelsu.org/guide/what-is-kernelsu.html</string>

View File

@@ -14,7 +14,6 @@
<string name="module_uninstall_confirm">Biztos benne hogy eltávolítja a következő modult: %s?</string>
<string name="module_uninstall_failed">Nem sikerült eltávolítani: %s</string>
<string name="module_author">Készítő</string>
<string name="module_overlay_fs_not_available">A modulok nem érhetők el, mivel az OverlayFS-t a kernel letiltotta.</string>
<string name="refresh">Frissítés</string>
<string name="show_system_apps">Rendszeralkalmazások megjelenítése</string>
<string name="hide_system_apps">Rendszeralkalmazások elrejtése</string>

View File

@@ -38,7 +38,6 @@
<string name="module_uninstall_failed">Gagal menghapus: %s</string>
<string name="module_version">Versi</string>
<string name="module_author">Oleh</string>
<string name="module_overlay_fs_not_available">Kernel tidak mendukung OverlayFS, modul tidak akan berfungsi.</string>
<string name="refresh">Muat ulang</string>
<string name="show_system_apps">Tampilkan aplikasi sistem</string>
<string name="hide_system_apps">Sembunyikan aplikasi sistem</string>

View File

@@ -38,7 +38,6 @@
<string name="module_uninstall_failed">Impossibile disinstallare: %s</string>
<string name="module_version">Versione</string>
<string name="module_author">Autore</string>
<string name="module_overlay_fs_not_available">overlayfs non è disponibile, i moduli non possono funzionare!</string>
<string name="refresh">Ricarica</string>
<string name="show_system_apps">Mostra app di sistema</string>
<string name="hide_system_apps">Nascondi app di sistema</string>

View File

@@ -44,7 +44,6 @@
<string name="home_click_to_install">לחץ להתקנה</string>
<string name="profile_selinux_rules">כללים</string>
<string name="profile_groups">קבוצה</string>
<string name="module_overlay_fs_not_available">שכבות-על לא זמינות, המודול לא יכול לעבוד!</string>
<string name="module">מודולים</string>
<string name="module_author">יוצר</string>
<string name="about">אודות</string>

View File

@@ -38,7 +38,6 @@
<string name="module_uninstall_failed">アンインストールに失敗しました: %s</string>
<string name="module_version">バージョン</string>
<string name="module_author">制作者</string>
<string name="module_overlay_fs_not_available">カーネルによって OverlayFS が無効になっているため、モジュールが利用できません!</string>
<string name="refresh">更新</string>
<string name="show_system_apps">システムアプリを表示</string>
<string name="hide_system_apps">システムアプリを非表示</string>

View File

@@ -36,7 +36,6 @@
<string name="profile_namespace">ಮೌಂಟ್ ನೇಮ್‌ಸ್ಪೇಸ್</string>
<string name="profile_selinux_rules">ನಿಯಮಗಳು</string>
<string name="profile_groups">ಗುಂಪುಗಳು</string>
<string name="module_overlay_fs_not_available">ಓವರ್‌ಲೇಫ್‌ಗಳು ಲಭ್ಯವಿಲ್ಲ, ಮಾಡ್ಯೂಲ್ ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ!</string>
<string name="module">ಮಾಡ್ಯೂಲ್</string>
<string name="module_author">ಲೇಖಕ</string>
<string name="about">ಬಗ್ಗೆ</string>

View File

@@ -38,7 +38,6 @@
<string name="module_uninstall_failed">모듈 삭제 실패: %s</string>
<string name="module_version">버전</string>
<string name="module_author">제작자</string>
<string name="module_overlay_fs_not_available">커널에서 OverlayFS를 비활성화하여 모듈을 사용할 수 없습니다.</string>
<string name="refresh">새로고침</string>
<string name="show_system_apps">시스템 앱 보이기</string>
<string name="hide_system_apps">시스템 앱 숨기기</string>

View File

@@ -19,7 +19,6 @@
<string name="module_uninstall_success">%s išdiegtas</string>
<string name="module_version">Versija</string>
<string name="module_author">Autorius</string>
<string name="module_overlay_fs_not_available">overlayfs nepasiekiamas, modulis negali veikti!</string>
<string name="show_system_apps">Rodyti sistemos programas</string>
<string name="hide_system_apps">Slėpti sistemos programas</string>
<string name="send_log">Siųsti žurnalą</string>

View File

@@ -94,7 +94,6 @@
<string name="module_install">Instalēt</string>
<string name="module_uninstall_confirm">Vai tiešām vēlaties atinstalēt moduli %s?</string>
<string name="module_version">Versija</string>
<string name="module_overlay_fs_not_available">overlayfs nav pieejams, modulis nevar darboties!</string>
<string name="safe_mode">Drošais režīms</string>
<string name="module_magisk_conflict">Moduļi ir atspējoti, jo tie konfliktē ar Magisk!</string>
<string name="home_support_content">KernelSU ir un vienmēr būs bezmaksas un atvērtā koda. Tomēr jūs varat parādīt mums, ka jums rūp, veicot ziedojumu.</string>

View File

@@ -32,7 +32,6 @@
<string name="reboot_edl">EDL वर रीबूट करा</string>
<string name="module_uninstall_confirm">तुमची खात्री आहे की तुम्ही मॉड्यूल %s विस्थापित करू इच्छिता\?</string>
<string name="module_uninstall_failed">विस्थापित करण्यात अयशस्वी: %s</string>
<string name="module_overlay_fs_not_available">overlayfs उपलब्ध नाही, मॉड्यूल काम करू शकत नाही!</string>
<string name="show_system_apps">सिस्टम अॅप्स दाखवा</string>
<string name="reboot_bootloader">बूटलोडरवर रीबूट करा</string>
<string name="module_uninstall_success">%s विस्थापित</string>

View File

@@ -38,7 +38,6 @@
<string name="module_uninstall_failed">Mislukt om te verwijderen: %s</string>
<string name="module_version">Versie</string>
<string name="module_author">Auteur</string>
<string name="module_overlay_fs_not_available">Modules zijn niet beschikbaar omdat OverlayFS door de kernel is uitgeschakeld.</string>
<string name="refresh">Vernieuwen</string>
<string name="show_system_apps">Toon systeem apps</string>
<string name="hide_system_apps">Verberg systeem apps</string>

View File

@@ -39,7 +39,6 @@
<string name="module_uninstall_failed">Nie udało się odinstalować: %s</string>
<string name="module_version">Wersja</string>
<string name="module_author">Autor</string>
<string name="module_overlay_fs_not_available">Moduły są niedostępne, ponieważ OverlayFS jest wyłączone przez jądro!</string>
<string name="refresh">Odśwież</string>
<string name="show_system_apps">Pokaż aplikacje systemowe</string>
<string name="hide_system_apps">Ukryj aplikacje systemowe</string>

View File

@@ -38,7 +38,6 @@
<string name="module_uninstall_failed">Não foi possível desinstalar %s</string>
<string name="module_version">Versão</string>
<string name="module_author">Autor</string>
<string name="module_overlay_fs_not_available">Os módulos estão indisponíveis porque OverlayFS está desabilitado pelo kernel!</string>
<string name="refresh">Atualizar</string>
<string name="show_system_apps">Mostrar apps do sistema</string>
<string name="hide_system_apps">Ocultar apps do sistema</string>

View File

@@ -39,7 +39,6 @@
<string name="reboot_edl">Reiniciar em EDL</string>
<string name="module_uninstall_confirm">Tem certeza de que deseja desinstalar o módulo %s\?</string>
<string name="about">Sobre</string>
<string name="module_overlay_fs_not_available">overlayfs não está disponível, o módulo não pode funcionar!</string>
<string name="send_log">Enviar log</string>
<string name="module_uninstall_success">%s desinstalado</string>
<string name="show_system_apps">Mostrar aplicativos do sistema</string>

View File

@@ -38,7 +38,6 @@
<string name="module_uninstall_failed">Dezinstalare eșuată: %s</string>
<string name="module_version">Versiune</string>
<string name="module_author">Autor</string>
<string name="module_overlay_fs_not_available">overlayfs nu este disponibil, modulul nu poate funcționa!</string>
<string name="refresh">Reîmprospătează</string>
<string name="show_system_apps">Arată aplicațiile de sistem</string>
<string name="hide_system_apps">Ascunde aplicațiile de sistem</string>

View File

@@ -40,7 +40,6 @@
<string name="module_uninstall_failed">Не удалось удалить %s</string>
<string name="module_version">Версия</string>
<string name="module_author">Автор</string>
<string name="module_overlay_fs_not_available">Модули недоступны, так как OverlayFS отключен ядром!</string>
<string name="refresh">Обновить страницу</string>
<string name="show_system_apps">Показать системные приложения</string>
<string name="hide_system_apps">Скрыть системные приложения</string>

View File

@@ -24,7 +24,6 @@
<string name="module_uninstall_confirm">Ste prepričani, da želite odstraniti modul %s?</string>
<string name="module_uninstall_success">%s je odmeščen</string>
<string name="module_author">Avtor</string>
<string name="module_overlay_fs_not_available">overlayfs ni na voljo, modul ne more delovati!</string>
<string name="hide_system_apps">Skrij prikaz sistemskih aplikacij</string>
<string name="send_log">Prijavite dnevnik</string>
<string name="home_learn_kernelsu">Naučite se KernelSU</string>

View File

@@ -35,7 +35,6 @@
<string name="reboot_edl">รีบูตเข้าสู่โหมด EDL</string>
<string name="module_uninstall_success">%s ถอนการติดตั้งสำเร็จ</string>
<string name="module_uninstall_failed">ถอนการติดตั้ง %s ล้มเหลว</string>
<string name="module_overlay_fs_not_available">โมดูลไม่สามารถใช้งานได้เนื่องจาก OverlayFS ถูกปิดใช้งานโดยเคอร์เนล!</string>
<string name="module_uninstall_confirm">คุณแน่ใจว่าจะถอนการติดตั้งโมดูล %s หรือไม่\?</string>
<string name="module_author">ผู้สร้าง</string>
<string name="module_version">เวอร์ชัน</string>

View File

@@ -39,7 +39,6 @@
<string name="module_uninstall_failed">Kaldırma başarısız: %s</string>
<string name="module_version">Sürüm</string>
<string name="module_author">Geliştirici</string>
<string name="module_overlay_fs_not_available">OverlayFS çekirdek tarafından devre dışı bırakıldığı için modüller kullanılamıyor.</string>
<string name="refresh">Yenile</string>
<string name="show_system_apps">Sistem uygulamalarını göster</string>
<string name="hide_system_apps">Sistem uygulamalarını gizle</string>

View File

@@ -38,7 +38,6 @@
<string name="module_uninstall_failed">Не вдалося видалити: %s</string>
<string name="module_version">Версія</string>
<string name="module_author">Автор</string>
<string name="module_overlay_fs_not_available">overlayfs не доступний, модуль не може працювати!</string>
<string name="refresh">Освіжати(Оновити)</string>
<string name="show_system_apps">Показати системні додатки</string>
<string name="hide_system_apps">Сховати системні додатки</string>

View File

@@ -57,7 +57,6 @@
<string name="module_uninstall_failed">Lỗi khi gỡ cài đặt: %s</string>
<string name="module_version">Phiên bản</string>
<string name="module_author">Tác giả</string>
<string name="module_overlay_fs_not_available">overlayfs hiện không khả dụng, mô-đun không thể hoạt động!</string>
<string name="refresh">Làm mới</string>
<string name="show_system_apps">Hiển thị ứng dụng hệ thống</string>
<string name="hide_system_apps">Ẩn ứng dụng hệ thống</string>

View File

@@ -39,7 +39,6 @@
<string name="module_uninstall_failed">卸载失败:%s</string>
<string name="module_version">版本</string>
<string name="module_author">作者</string>
<string name="module_overlay_fs_not_available">OverlayFS 被内核禁用,模块不可用!</string>
<string name="refresh">刷新</string>
<string name="show_system_apps">显示系统应用</string>
<string name="hide_system_apps">隐藏系统应用</string>

View File

@@ -38,7 +38,6 @@
<string name="module_uninstall_failed">無法解除安裝:%s</string>
<string name="module_version">版本</string>
<string name="module_author">作者</string>
<string name="module_overlay_fs_not_available">OverlayFS 無法使用,模組無法正常運作!</string>
<string name="refresh">重新整理</string>
<string name="show_system_apps">顯示系統應用程式</string>
<string name="hide_system_apps">隱藏系統應用程式</string>

View File

@@ -37,7 +37,6 @@
<string name="module_uninstall_failed">無法解除安裝:%s</string>
<string name="module_version">版本</string>
<string name="module_author">作者</string>
<string name="module_overlay_fs_not_available">OverlayFS 已遭核心停用,無法使用模組功能。</string>
<string name="refresh">重新載入</string>
<string name="show_system_apps">顯示系統程式</string>
<string name="hide_system_apps">隱藏系統程式</string>

View File

@@ -43,7 +43,6 @@
<string name="module_uninstall_failed">Failed to uninstall: %s</string>
<string name="module_version">Version</string>
<string name="module_author">Author</string>
<string name="module_overlay_fs_not_available">Modules are unavailable as OverlayFS is disabled by the kernel!</string>
<string name="refresh">Refresh</string>
<string name="show_system_apps">Show system apps</string>
<string name="hide_system_apps">Hide system apps</string>