From d1ff7e0ffe47757d987469d9f8f48209d3254e2c Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Sun, 28 Jul 2019 02:10:22 -0700 Subject: [PATCH] Move extensions to its own package --- app/src/main/java/com/topjohnwu/magisk/App.kt | 2 +- app/src/main/java/com/topjohnwu/magisk/Config.kt | 6 +++++- .../java/com/topjohnwu/magisk/data/database/PolicyDao.kt | 2 +- .../java/com/topjohnwu/magisk/data/repository/DBConfig.kt | 2 +- .../com/topjohnwu/magisk/data/repository/LogRepository.kt | 2 +- .../topjohnwu/magisk/data/repository/MagiskRepository.kt | 4 ++-- .../com/topjohnwu/magisk/{utils => extensions}/XAndroid.kt | 3 ++- .../com/topjohnwu/magisk/{utils => extensions}/XBinding.kt | 2 +- .../com/topjohnwu/magisk/{utils => extensions}/XJava.kt | 4 ++-- .../com/topjohnwu/magisk/{utils => extensions}/XKoin.kt | 2 +- .../com/topjohnwu/magisk/{utils => extensions}/XList.kt | 2 +- .../java/com/topjohnwu/magisk/{utils => extensions}/XRx.kt | 2 +- .../java/com/topjohnwu/magisk/{utils => extensions}/XSU.kt | 2 +- .../com/topjohnwu/magisk/{utils => extensions}/XString.kt | 2 +- .../com/topjohnwu/magisk/{utils => extensions}/XTime.kt | 3 ++- .../com/topjohnwu/magisk/{utils => extensions}/XView.kt | 2 +- .../com/topjohnwu/magisk/model/download/DownloadService.kt | 4 ++-- .../com/topjohnwu/magisk/model/download/ModuleProcessor.kt | 2 +- .../topjohnwu/magisk/model/download/RemoteFileService.kt | 4 ++-- .../java/com/topjohnwu/magisk/model/entity/HideAppInfo.kt | 4 ++-- .../java/com/topjohnwu/magisk/model/entity/MagiskLog.kt | 4 ++-- .../magisk/model/entity/internal/DownloadSubject.kt | 4 ++-- .../java/com/topjohnwu/magisk/model/entity/module/Repo.kt | 4 ++-- .../topjohnwu/magisk/model/entity/recycler/HideRvItem.kt | 4 ++-- .../com/topjohnwu/magisk/model/entity/recycler/LogRvItem.kt | 6 +++--- .../topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt | 4 ++-- .../topjohnwu/magisk/model/entity/recycler/PolicyRvItem.kt | 4 ++-- .../main/java/com/topjohnwu/magisk/model/flash/Flashing.kt | 2 +- .../topjohnwu/magisk/model/preference/BooleanProperty.kt | 2 +- .../com/topjohnwu/magisk/model/preference/FloatProperty.kt | 2 +- .../com/topjohnwu/magisk/model/preference/IntProperty.kt | 2 +- .../com/topjohnwu/magisk/model/preference/LongProperty.kt | 2 +- .../com/topjohnwu/magisk/model/preference/StringProperty.kt | 2 +- .../topjohnwu/magisk/model/preference/StringSetProperty.kt | 2 +- .../com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt | 4 ++-- .../com/topjohnwu/magisk/model/update/UpdateCheckService.kt | 2 +- app/src/main/java/com/topjohnwu/magisk/model/zip/Zip.kt | 4 ++-- app/src/main/java/com/topjohnwu/magisk/tasks/FlashZip.kt | 6 +++--- .../main/java/com/topjohnwu/magisk/tasks/InstallerHelper.kt | 4 ++-- .../java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt | 2 +- .../java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt | 2 +- .../main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt | 4 ++-- .../main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt | 4 ++-- .../main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt | 6 +++--- .../java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt | 4 ++-- .../java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt | 2 +- .../java/com/topjohnwu/magisk/ui/module/ReposFragment.kt | 2 +- .../com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt | 2 +- .../com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt | 2 +- .../java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt | 1 + .../java/com/topjohnwu/magisk/utils/FingerprintHelper.kt | 2 ++ .../main/java/com/topjohnwu/magisk/utils/LocaleManager.kt | 1 + app/src/main/java/com/topjohnwu/magisk/utils/RootUtils.kt | 2 ++ app/src/main/java/com/topjohnwu/magisk/utils/SuLogger.kt | 1 + app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt | 1 + .../main/java/com/topjohnwu/magisk/view/MarkDownWindow.kt | 2 +- .../main/java/com/topjohnwu/magisk/view/SnackbarMaker.kt | 2 +- .../java/com/topjohnwu/magisk/view/dialogs/EnvFixDialog.kt | 4 ++-- app/src/main/res/layout/fragment_magisk.xml | 2 +- 59 files changed, 91 insertions(+), 77 deletions(-) rename app/src/main/java/com/topjohnwu/magisk/{utils => extensions}/XAndroid.kt (97%) rename app/src/main/java/com/topjohnwu/magisk/{utils => extensions}/XBinding.kt (73%) rename app/src/main/java/com/topjohnwu/magisk/{utils => extensions}/XJava.kt (87%) rename app/src/main/java/com/topjohnwu/magisk/{utils => extensions}/XKoin.kt (92%) rename app/src/main/java/com/topjohnwu/magisk/{utils => extensions}/XList.kt (98%) rename app/src/main/java/com/topjohnwu/magisk/{utils => extensions}/XRx.kt (87%) rename app/src/main/java/com/topjohnwu/magisk/{utils => extensions}/XSU.kt (92%) rename app/src/main/java/com/topjohnwu/magisk/{utils => extensions}/XString.kt (95%) rename app/src/main/java/com/topjohnwu/magisk/{utils => extensions}/XTime.kt (89%) rename app/src/main/java/com/topjohnwu/magisk/{utils => extensions}/XView.kt (92%) diff --git a/app/src/main/java/com/topjohnwu/magisk/App.kt b/app/src/main/java/com/topjohnwu/magisk/App.kt index 863d0a8b3..318f6c8de 100644 --- a/app/src/main/java/com/topjohnwu/magisk/App.kt +++ b/app/src/main/java/com/topjohnwu/magisk/App.kt @@ -16,9 +16,9 @@ import androidx.work.impl.WorkDatabase_Impl import com.topjohnwu.magisk.data.database.RepoDatabase import com.topjohnwu.magisk.data.database.RepoDatabase_Impl import com.topjohnwu.magisk.di.koinModules +import com.topjohnwu.magisk.extensions.inject import com.topjohnwu.magisk.utils.LocaleManager import com.topjohnwu.magisk.utils.RootUtils -import com.topjohnwu.magisk.utils.inject import com.topjohnwu.net.Networking import com.topjohnwu.superuser.Shell import org.koin.android.ext.koin.androidContext diff --git a/app/src/main/java/com/topjohnwu/magisk/Config.kt b/app/src/main/java/com/topjohnwu/magisk/Config.kt index 72b7c0eec..ca099bd80 100644 --- a/app/src/main/java/com/topjohnwu/magisk/Config.kt +++ b/app/src/main/java/com/topjohnwu/magisk/Config.kt @@ -9,8 +9,12 @@ import com.topjohnwu.magisk.data.database.SettingsDao import com.topjohnwu.magisk.data.database.StringDao import com.topjohnwu.magisk.data.repository.DBConfig import com.topjohnwu.magisk.di.Protected +import com.topjohnwu.magisk.extensions.get +import com.topjohnwu.magisk.extensions.inject +import com.topjohnwu.magisk.extensions.packageName import com.topjohnwu.magisk.model.preference.PreferenceModel -import com.topjohnwu.magisk.utils.* +import com.topjohnwu.magisk.utils.FingerprintHelper +import com.topjohnwu.magisk.utils.Utils import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.io.SuFile import com.topjohnwu.superuser.io.SuFileInputStream diff --git a/app/src/main/java/com/topjohnwu/magisk/data/database/PolicyDao.kt b/app/src/main/java/com/topjohnwu/magisk/data/database/PolicyDao.kt index 24ce2e664..d3a51aba0 100644 --- a/app/src/main/java/com/topjohnwu/magisk/data/database/PolicyDao.kt +++ b/app/src/main/java/com/topjohnwu/magisk/data/database/PolicyDao.kt @@ -4,10 +4,10 @@ import android.content.Context import android.content.pm.PackageManager import com.topjohnwu.magisk.Const import com.topjohnwu.magisk.data.database.base.* +import com.topjohnwu.magisk.extensions.now import com.topjohnwu.magisk.model.entity.MagiskPolicy import com.topjohnwu.magisk.model.entity.toMap import com.topjohnwu.magisk.model.entity.toPolicy -import com.topjohnwu.magisk.utils.now import timber.log.Timber import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/com/topjohnwu/magisk/data/repository/DBConfig.kt b/app/src/main/java/com/topjohnwu/magisk/data/repository/DBConfig.kt index 7a0274c3b..0df96e77f 100644 --- a/app/src/main/java/com/topjohnwu/magisk/data/repository/DBConfig.kt +++ b/app/src/main/java/com/topjohnwu/magisk/data/repository/DBConfig.kt @@ -2,7 +2,7 @@ package com.topjohnwu.magisk.data.repository import com.topjohnwu.magisk.data.database.SettingsDao import com.topjohnwu.magisk.data.database.StringDao -import com.topjohnwu.magisk.utils.trimEmptyToNull +import com.topjohnwu.magisk.extensions.trimEmptyToNull import io.reactivex.schedulers.Schedulers import kotlin.properties.ReadWriteProperty import kotlin.reflect.KProperty diff --git a/app/src/main/java/com/topjohnwu/magisk/data/repository/LogRepository.kt b/app/src/main/java/com/topjohnwu/magisk/data/repository/LogRepository.kt index 209ffe9a6..733eb85b9 100644 --- a/app/src/main/java/com/topjohnwu/magisk/data/repository/LogRepository.kt +++ b/app/src/main/java/com/topjohnwu/magisk/data/repository/LogRepository.kt @@ -3,9 +3,9 @@ package com.topjohnwu.magisk.data.repository import com.topjohnwu.magisk.Const import com.topjohnwu.magisk.data.database.LogDao import com.topjohnwu.magisk.data.database.base.suRaw +import com.topjohnwu.magisk.extensions.toSingle import com.topjohnwu.magisk.model.entity.MagiskLog import com.topjohnwu.magisk.model.entity.WrappedMagiskLog -import com.topjohnwu.magisk.utils.toSingle import com.topjohnwu.superuser.Shell import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/com/topjohnwu/magisk/data/repository/MagiskRepository.kt b/app/src/main/java/com/topjohnwu/magisk/data/repository/MagiskRepository.kt index f61d83715..fe3805ad4 100644 --- a/app/src/main/java/com/topjohnwu/magisk/data/repository/MagiskRepository.kt +++ b/app/src/main/java/com/topjohnwu/magisk/data/repository/MagiskRepository.kt @@ -6,11 +6,11 @@ import com.topjohnwu.magisk.Config import com.topjohnwu.magisk.Info import com.topjohnwu.magisk.data.database.base.su import com.topjohnwu.magisk.data.network.GithubRawServices +import com.topjohnwu.magisk.extensions.inject +import com.topjohnwu.magisk.extensions.toSingle import com.topjohnwu.magisk.model.entity.HideAppInfo import com.topjohnwu.magisk.model.entity.HideTarget import com.topjohnwu.magisk.utils.Utils -import com.topjohnwu.magisk.utils.inject -import com.topjohnwu.magisk.utils.toSingle import com.topjohnwu.superuser.Shell import io.reactivex.Single diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/XAndroid.kt b/app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt similarity index 97% rename from app/src/main/java/com/topjohnwu/magisk/utils/XAndroid.kt rename to app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt index a964adb07..f6e5dec1a 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/XAndroid.kt +++ b/app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt @@ -1,4 +1,4 @@ -package com.topjohnwu.magisk.utils +package com.topjohnwu.magisk.extensions import android.content.Context import android.content.Intent @@ -11,6 +11,7 @@ import android.database.Cursor import android.net.Uri import android.provider.OpenableColumns import com.topjohnwu.magisk.App +import com.topjohnwu.magisk.utils.FileProvider import java.io.File import java.io.FileNotFoundException diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/XBinding.kt b/app/src/main/java/com/topjohnwu/magisk/extensions/XBinding.kt similarity index 73% rename from app/src/main/java/com/topjohnwu/magisk/utils/XBinding.kt rename to app/src/main/java/com/topjohnwu/magisk/extensions/XBinding.kt index ff9307a9e..36874f1e4 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/XBinding.kt +++ b/app/src/main/java/com/topjohnwu/magisk/extensions/XBinding.kt @@ -1,4 +1,4 @@ -package com.topjohnwu.magisk.utils +package com.topjohnwu.magisk.extensions import com.skoumal.teanity.util.KObservableField diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/XJava.kt b/app/src/main/java/com/topjohnwu/magisk/extensions/XJava.kt similarity index 87% rename from app/src/main/java/com/topjohnwu/magisk/utils/XJava.kt rename to app/src/main/java/com/topjohnwu/magisk/extensions/XJava.kt index 41a7b8b94..9ad5caa7e 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/XJava.kt +++ b/app/src/main/java/com/topjohnwu/magisk/extensions/XJava.kt @@ -1,4 +1,4 @@ -package com.topjohnwu.magisk.utils +package com.topjohnwu.magisk.extensions import android.net.Uri import androidx.core.net.toFile @@ -19,7 +19,7 @@ fun ZipInputStream.forEach(callback: (ZipEntry) -> Unit) { fun Uri.writeTo(file: File) = toFile().copyTo(file) fun InputStream.writeTo(file: File) = - withStreams(this, file.outputStream()) { reader, writer -> reader.copyTo(writer) } + withStreams(this, file.outputStream()) { reader, writer -> reader.copyTo(writer) } inline fun withStreams( inStream: In, diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/XKoin.kt b/app/src/main/java/com/topjohnwu/magisk/extensions/XKoin.kt similarity index 92% rename from app/src/main/java/com/topjohnwu/magisk/utils/XKoin.kt rename to app/src/main/java/com/topjohnwu/magisk/extensions/XKoin.kt index d63c7b49a..0f76726dc 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/XKoin.kt +++ b/app/src/main/java/com/topjohnwu/magisk/extensions/XKoin.kt @@ -1,4 +1,4 @@ -package com.topjohnwu.magisk.utils +package com.topjohnwu.magisk.extensions import org.koin.core.context.GlobalContext import org.koin.core.parameter.ParametersDefinition diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/XList.kt b/app/src/main/java/com/topjohnwu/magisk/extensions/XList.kt similarity index 98% rename from app/src/main/java/com/topjohnwu/magisk/utils/XList.kt rename to app/src/main/java/com/topjohnwu/magisk/extensions/XList.kt index 6b065b573..ee79f13f8 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/XList.kt +++ b/app/src/main/java/com/topjohnwu/magisk/extensions/XList.kt @@ -1,4 +1,4 @@ -package com.topjohnwu.magisk.utils +package com.topjohnwu.magisk.extensions import androidx.collection.SparseArrayCompat import androidx.databinding.ObservableList diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/XRx.kt b/app/src/main/java/com/topjohnwu/magisk/extensions/XRx.kt similarity index 87% rename from app/src/main/java/com/topjohnwu/magisk/utils/XRx.kt rename to app/src/main/java/com/topjohnwu/magisk/extensions/XRx.kt index 62a324c6c..7dbb2bd08 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/XRx.kt +++ b/app/src/main/java/com/topjohnwu/magisk/extensions/XRx.kt @@ -1,4 +1,4 @@ -package com.topjohnwu.magisk.utils +package com.topjohnwu.magisk.extensions import io.reactivex.Single import io.reactivex.functions.BiFunction diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/XSU.kt b/app/src/main/java/com/topjohnwu/magisk/extensions/XSU.kt similarity index 92% rename from app/src/main/java/com/topjohnwu/magisk/utils/XSU.kt rename to app/src/main/java/com/topjohnwu/magisk/extensions/XSU.kt index 2d0f2fbd4..d60e9227a 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/XSU.kt +++ b/app/src/main/java/com/topjohnwu/magisk/extensions/XSU.kt @@ -1,4 +1,4 @@ -package com.topjohnwu.magisk.utils +package com.topjohnwu.magisk.extensions import com.topjohnwu.magisk.Info import com.topjohnwu.superuser.Shell diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/XString.kt b/app/src/main/java/com/topjohnwu/magisk/extensions/XString.kt similarity index 95% rename from app/src/main/java/com/topjohnwu/magisk/utils/XString.kt rename to app/src/main/java/com/topjohnwu/magisk/extensions/XString.kt index 3cebc9792..fb0a65840 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/XString.kt +++ b/app/src/main/java/com/topjohnwu/magisk/extensions/XString.kt @@ -1,4 +1,4 @@ -package com.topjohnwu.magisk.utils +package com.topjohnwu.magisk.extensions import android.content.res.Resources diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/XTime.kt b/app/src/main/java/com/topjohnwu/magisk/extensions/XTime.kt similarity index 89% rename from app/src/main/java/com/topjohnwu/magisk/utils/XTime.kt rename to app/src/main/java/com/topjohnwu/magisk/extensions/XTime.kt index 44baef8c8..154ac8d12 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/XTime.kt +++ b/app/src/main/java/com/topjohnwu/magisk/extensions/XTime.kt @@ -1,5 +1,6 @@ -package com.topjohnwu.magisk.utils +package com.topjohnwu.magisk.extensions +import com.topjohnwu.magisk.utils.LocaleManager import java.text.DateFormat import java.text.ParseException import java.text.SimpleDateFormat diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/XView.kt b/app/src/main/java/com/topjohnwu/magisk/extensions/XView.kt similarity index 92% rename from app/src/main/java/com/topjohnwu/magisk/utils/XView.kt rename to app/src/main/java/com/topjohnwu/magisk/extensions/XView.kt index 98ece17f8..b34338d3d 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/XView.kt +++ b/app/src/main/java/com/topjohnwu/magisk/extensions/XView.kt @@ -1,4 +1,4 @@ -package com.topjohnwu.magisk.utils +package com.topjohnwu.magisk.extensions import android.view.View import android.view.ViewTreeObserver diff --git a/app/src/main/java/com/topjohnwu/magisk/model/download/DownloadService.kt b/app/src/main/java/com/topjohnwu/magisk/model/download/DownloadService.kt index f3ccce9b8..58a5d00ca 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/download/DownloadService.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/download/DownloadService.kt @@ -9,14 +9,14 @@ import android.webkit.MimeTypeMap import androidx.core.app.NotificationCompat import com.topjohnwu.magisk.ClassMap import com.topjohnwu.magisk.R +import com.topjohnwu.magisk.extensions.chooser +import com.topjohnwu.magisk.extensions.provide import com.topjohnwu.magisk.model.entity.internal.Configuration.* import com.topjohnwu.magisk.model.entity.internal.Configuration.Flash.Secondary import com.topjohnwu.magisk.model.entity.internal.DownloadSubject import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Magisk import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Module import com.topjohnwu.magisk.ui.flash.FlashActivity -import com.topjohnwu.magisk.utils.chooser -import com.topjohnwu.magisk.utils.provide import java.io.File import kotlin.random.Random.Default.nextInt diff --git a/app/src/main/java/com/topjohnwu/magisk/model/download/ModuleProcessor.kt b/app/src/main/java/com/topjohnwu/magisk/model/download/ModuleProcessor.kt index 0d1a23cb6..b293e5eb4 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/download/ModuleProcessor.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/download/ModuleProcessor.kt @@ -1,6 +1,6 @@ package com.topjohnwu.magisk.model.download -import com.topjohnwu.magisk.utils.withStreams +import com.topjohnwu.magisk.extensions.withStreams import java.io.File import java.io.InputStream import java.util.zip.ZipEntry diff --git a/app/src/main/java/com/topjohnwu/magisk/model/download/RemoteFileService.kt b/app/src/main/java/com/topjohnwu/magisk/model/download/RemoteFileService.kt index e0309e837..b938d77f0 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/download/RemoteFileService.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/download/RemoteFileService.kt @@ -6,12 +6,12 @@ import com.skoumal.teanity.extensions.subscribeK import com.topjohnwu.magisk.Config import com.topjohnwu.magisk.R import com.topjohnwu.magisk.data.network.GithubRawServices +import com.topjohnwu.magisk.extensions.firstMap +import com.topjohnwu.magisk.extensions.writeTo import com.topjohnwu.magisk.model.entity.internal.DownloadSubject import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Magisk import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Module import com.topjohnwu.magisk.utils.ProgInputStream -import com.topjohnwu.magisk.utils.firstMap -import com.topjohnwu.magisk.utils.writeTo import com.topjohnwu.magisk.view.Notifications import com.topjohnwu.superuser.ShellUtils import io.reactivex.Single diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/HideAppInfo.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/HideAppInfo.kt index 74e58ed48..5d6b3f7dd 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/entity/HideAppInfo.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/HideAppInfo.kt @@ -2,8 +2,8 @@ package com.topjohnwu.magisk.model.entity import android.content.pm.ApplicationInfo import android.graphics.drawable.Drawable -import com.topjohnwu.magisk.utils.packageInfo -import com.topjohnwu.magisk.utils.processes +import com.topjohnwu.magisk.extensions.packageInfo +import com.topjohnwu.magisk.extensions.processes class HideAppInfo( val info: ApplicationInfo, diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/MagiskLog.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/MagiskLog.kt index a5669a360..85f815b08 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/entity/MagiskLog.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/MagiskLog.kt @@ -1,8 +1,8 @@ package com.topjohnwu.magisk.model.entity +import com.topjohnwu.magisk.extensions.timeFormatTime +import com.topjohnwu.magisk.extensions.toTime import com.topjohnwu.magisk.model.entity.MagiskPolicy.Companion.ALLOW -import com.topjohnwu.magisk.utils.timeFormatTime -import com.topjohnwu.magisk.utils.toTime import java.util.* data class MagiskLog( diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/internal/DownloadSubject.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/internal/DownloadSubject.kt index aaa1ad6e9..3c8bb0cdc 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/entity/internal/DownloadSubject.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/internal/DownloadSubject.kt @@ -4,10 +4,10 @@ import android.content.Context import android.os.Parcelable import com.topjohnwu.magisk.Config import com.topjohnwu.magisk.Info +import com.topjohnwu.magisk.extensions.cachedFile +import com.topjohnwu.magisk.extensions.get import com.topjohnwu.magisk.model.entity.MagiskJson import com.topjohnwu.magisk.model.entity.module.Repo -import com.topjohnwu.magisk.utils.cachedFile -import com.topjohnwu.magisk.utils.get import kotlinx.android.parcel.IgnoredOnParcel import kotlinx.android.parcel.Parcelize import java.io.File diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/module/Repo.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/module/Repo.kt index 88f478989..3e70beb45 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/entity/module/Repo.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/module/Repo.kt @@ -5,8 +5,8 @@ import androidx.room.Entity import androidx.room.PrimaryKey import com.topjohnwu.magisk.Const import com.topjohnwu.magisk.data.repository.StringRepository -import com.topjohnwu.magisk.utils.get -import com.topjohnwu.magisk.utils.legalFilename +import com.topjohnwu.magisk.extensions.get +import com.topjohnwu.magisk.extensions.legalFilename import kotlinx.android.parcel.Parcelize import java.text.DateFormat import java.util.* diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt index 61cf4de91..1ea743e92 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt @@ -6,12 +6,12 @@ import com.skoumal.teanity.rxbus.RxBus import com.skoumal.teanity.util.DiffObservableList import com.skoumal.teanity.util.KObservableField import com.topjohnwu.magisk.R +import com.topjohnwu.magisk.extensions.inject +import com.topjohnwu.magisk.extensions.toggle import com.topjohnwu.magisk.model.entity.HideAppInfo import com.topjohnwu.magisk.model.entity.HideTarget import com.topjohnwu.magisk.model.entity.state.IndeterminateState import com.topjohnwu.magisk.model.events.HideProcessEvent -import com.topjohnwu.magisk.utils.inject -import com.topjohnwu.magisk.utils.toggle class HideRvItem(val item: HideAppInfo, targets: List) : ComparableRvItem() { diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LogRvItem.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LogRvItem.kt index ad6eb6ec6..8f467b8fd 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LogRvItem.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LogRvItem.kt @@ -4,11 +4,11 @@ import com.skoumal.teanity.databinding.ComparableRvItem import com.skoumal.teanity.util.DiffObservableList import com.skoumal.teanity.util.KObservableField import com.topjohnwu.magisk.R +import com.topjohnwu.magisk.extensions.timeFormatMedium +import com.topjohnwu.magisk.extensions.toTime +import com.topjohnwu.magisk.extensions.toggle import com.topjohnwu.magisk.model.entity.MagiskLog import com.topjohnwu.magisk.model.entity.WrappedMagiskLog -import com.topjohnwu.magisk.utils.timeFormatMedium -import com.topjohnwu.magisk.utils.toTime -import com.topjohnwu.magisk.utils.toggle class LogRvItem : ComparableRvItem() { override val layoutRes: Int = R.layout.item_page_log diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt index 71c2d8ec8..57caade72 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt @@ -6,10 +6,10 @@ import com.skoumal.teanity.databinding.ComparableRvItem import com.skoumal.teanity.extensions.addOnPropertyChangedCallback import com.skoumal.teanity.util.KObservableField import com.topjohnwu.magisk.R +import com.topjohnwu.magisk.extensions.get +import com.topjohnwu.magisk.extensions.toggle import com.topjohnwu.magisk.model.entity.module.Module import com.topjohnwu.magisk.model.entity.module.Repo -import com.topjohnwu.magisk.utils.get -import com.topjohnwu.magisk.utils.toggle class ModuleRvItem(val item: Module) : ComparableRvItem() { diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/PolicyRvItem.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/PolicyRvItem.kt index 764fbd1cf..cbe2b13d7 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/PolicyRvItem.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/PolicyRvItem.kt @@ -6,12 +6,12 @@ import com.skoumal.teanity.extensions.addOnPropertyChangedCallback import com.skoumal.teanity.rxbus.RxBus import com.skoumal.teanity.util.KObservableField import com.topjohnwu.magisk.R +import com.topjohnwu.magisk.extensions.inject +import com.topjohnwu.magisk.extensions.toggle import com.topjohnwu.magisk.model.entity.MagiskPolicy import com.topjohnwu.magisk.model.entity.Policy import com.topjohnwu.magisk.model.events.PolicyEnableEvent import com.topjohnwu.magisk.model.events.PolicyUpdateEvent -import com.topjohnwu.magisk.utils.inject -import com.topjohnwu.magisk.utils.toggle class PolicyRvItem(val item: MagiskPolicy, val icon: Drawable) : ComparableRvItem() { diff --git a/app/src/main/java/com/topjohnwu/magisk/model/flash/Flashing.kt b/app/src/main/java/com/topjohnwu/magisk/model/flash/Flashing.kt index 802e6f91d..046ae6906 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/flash/Flashing.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/flash/Flashing.kt @@ -3,8 +3,8 @@ package com.topjohnwu.magisk.model.flash import android.content.Context import android.net.Uri import androidx.core.os.postDelayed +import com.topjohnwu.magisk.extensions.inject import com.topjohnwu.magisk.tasks.FlashZip -import com.topjohnwu.magisk.utils.inject import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.internal.UiThreadHandler diff --git a/app/src/main/java/com/topjohnwu/magisk/model/preference/BooleanProperty.kt b/app/src/main/java/com/topjohnwu/magisk/model/preference/BooleanProperty.kt index 3acc80dd3..fbe0cd6fa 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/preference/BooleanProperty.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/preference/BooleanProperty.kt @@ -1,7 +1,7 @@ package com.topjohnwu.magisk.model.preference import androidx.core.content.edit -import com.topjohnwu.magisk.utils.trimEmptyToNull +import com.topjohnwu.magisk.extensions.trimEmptyToNull import kotlin.properties.ReadWriteProperty import kotlin.reflect.KProperty diff --git a/app/src/main/java/com/topjohnwu/magisk/model/preference/FloatProperty.kt b/app/src/main/java/com/topjohnwu/magisk/model/preference/FloatProperty.kt index 46ab8cc29..f2f223f12 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/preference/FloatProperty.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/preference/FloatProperty.kt @@ -1,7 +1,7 @@ package com.topjohnwu.magisk.model.preference import androidx.core.content.edit -import com.topjohnwu.magisk.utils.trimEmptyToNull +import com.topjohnwu.magisk.extensions.trimEmptyToNull import kotlin.properties.ReadWriteProperty import kotlin.reflect.KProperty diff --git a/app/src/main/java/com/topjohnwu/magisk/model/preference/IntProperty.kt b/app/src/main/java/com/topjohnwu/magisk/model/preference/IntProperty.kt index 2189acea1..e40164949 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/preference/IntProperty.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/preference/IntProperty.kt @@ -1,7 +1,7 @@ package com.topjohnwu.magisk.model.preference import androidx.core.content.edit -import com.topjohnwu.magisk.utils.trimEmptyToNull +import com.topjohnwu.magisk.extensions.trimEmptyToNull import kotlin.properties.ReadWriteProperty import kotlin.reflect.KProperty diff --git a/app/src/main/java/com/topjohnwu/magisk/model/preference/LongProperty.kt b/app/src/main/java/com/topjohnwu/magisk/model/preference/LongProperty.kt index b97266182..4a0738a7f 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/preference/LongProperty.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/preference/LongProperty.kt @@ -1,7 +1,7 @@ package com.topjohnwu.magisk.model.preference import androidx.core.content.edit -import com.topjohnwu.magisk.utils.trimEmptyToNull +import com.topjohnwu.magisk.extensions.trimEmptyToNull import kotlin.properties.ReadWriteProperty import kotlin.reflect.KProperty diff --git a/app/src/main/java/com/topjohnwu/magisk/model/preference/StringProperty.kt b/app/src/main/java/com/topjohnwu/magisk/model/preference/StringProperty.kt index 52e2d44ef..c5777f0e1 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/preference/StringProperty.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/preference/StringProperty.kt @@ -1,7 +1,7 @@ package com.topjohnwu.magisk.model.preference import androidx.core.content.edit -import com.topjohnwu.magisk.utils.trimEmptyToNull +import com.topjohnwu.magisk.extensions.trimEmptyToNull import kotlin.properties.ReadWriteProperty import kotlin.reflect.KProperty diff --git a/app/src/main/java/com/topjohnwu/magisk/model/preference/StringSetProperty.kt b/app/src/main/java/com/topjohnwu/magisk/model/preference/StringSetProperty.kt index d513940c7..49e20926c 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/preference/StringSetProperty.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/preference/StringSetProperty.kt @@ -1,7 +1,7 @@ package com.topjohnwu.magisk.model.preference import androidx.core.content.edit -import com.topjohnwu.magisk.utils.trimEmptyToNull +import com.topjohnwu.magisk.extensions.trimEmptyToNull import kotlin.properties.ReadWriteProperty import kotlin.reflect.KProperty diff --git a/app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt b/app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt index 0fd552cf8..1d37448ca 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt @@ -9,11 +9,11 @@ import com.topjohnwu.magisk.Const import com.topjohnwu.magisk.Info import com.topjohnwu.magisk.data.database.base.su import com.topjohnwu.magisk.data.repository.AppRepository +import com.topjohnwu.magisk.extensions.inject +import com.topjohnwu.magisk.extensions.reboot import com.topjohnwu.magisk.ui.surequest.SuRequestActivity import com.topjohnwu.magisk.utils.DownloadApp import com.topjohnwu.magisk.utils.SuLogger -import com.topjohnwu.magisk.utils.inject -import com.topjohnwu.magisk.utils.reboot import com.topjohnwu.magisk.view.Notifications import com.topjohnwu.magisk.view.Shortcuts import com.topjohnwu.superuser.Shell diff --git a/app/src/main/java/com/topjohnwu/magisk/model/update/UpdateCheckService.kt b/app/src/main/java/com/topjohnwu/magisk/model/update/UpdateCheckService.kt index 8740ec7fe..7e60c2000 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/update/UpdateCheckService.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/update/UpdateCheckService.kt @@ -4,8 +4,8 @@ import androidx.work.ListenableWorker import com.topjohnwu.magisk.BuildConfig import com.topjohnwu.magisk.Info import com.topjohnwu.magisk.data.repository.MagiskRepository +import com.topjohnwu.magisk.extensions.inject import com.topjohnwu.magisk.model.worker.DelegateWorker -import com.topjohnwu.magisk.utils.inject import com.topjohnwu.magisk.view.Notifications import com.topjohnwu.superuser.Shell diff --git a/app/src/main/java/com/topjohnwu/magisk/model/zip/Zip.kt b/app/src/main/java/com/topjohnwu/magisk/model/zip/Zip.kt index a83942b35..fc118b493 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/zip/Zip.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/zip/Zip.kt @@ -1,7 +1,7 @@ package com.topjohnwu.magisk.model.zip -import com.topjohnwu.magisk.utils.forEach -import com.topjohnwu.magisk.utils.withStreams +import com.topjohnwu.magisk.extensions.forEach +import com.topjohnwu.magisk.extensions.withStreams import com.topjohnwu.superuser.io.SuFile import java.io.File import java.util.zip.ZipInputStream diff --git a/app/src/main/java/com/topjohnwu/magisk/tasks/FlashZip.kt b/app/src/main/java/com/topjohnwu/magisk/tasks/FlashZip.kt index fedf30e87..62951f1f3 100644 --- a/app/src/main/java/com/topjohnwu/magisk/tasks/FlashZip.kt +++ b/app/src/main/java/com/topjohnwu/magisk/tasks/FlashZip.kt @@ -4,9 +4,9 @@ import android.net.Uri import com.skoumal.teanity.extensions.subscribeK import com.topjohnwu.magisk.App import com.topjohnwu.magisk.Const -import com.topjohnwu.magisk.utils.fileName -import com.topjohnwu.magisk.utils.inject -import com.topjohnwu.magisk.utils.readUri +import com.topjohnwu.magisk.extensions.fileName +import com.topjohnwu.magisk.extensions.inject +import com.topjohnwu.magisk.extensions.readUri import com.topjohnwu.magisk.utils.unzip import com.topjohnwu.superuser.Shell import io.reactivex.Single diff --git a/app/src/main/java/com/topjohnwu/magisk/tasks/InstallerHelper.kt b/app/src/main/java/com/topjohnwu/magisk/tasks/InstallerHelper.kt index a674464b5..ca92a4fe8 100644 --- a/app/src/main/java/com/topjohnwu/magisk/tasks/InstallerHelper.kt +++ b/app/src/main/java/com/topjohnwu/magisk/tasks/InstallerHelper.kt @@ -2,8 +2,8 @@ package com.topjohnwu.magisk.tasks import android.content.Context import android.net.Uri -import com.topjohnwu.magisk.utils.get -import com.topjohnwu.magisk.utils.readUri +import com.topjohnwu.magisk.extensions.get +import com.topjohnwu.magisk.extensions.readUri import java.io.File object InstallerHelper { diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt index df6050c75..dceeaba4c 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt @@ -22,6 +22,7 @@ import com.ncapdevi.fragnav.FragNavTransactionOptions import com.skoumal.teanity.view.TeanityActivity import com.skoumal.teanity.viewevents.ViewEvent import com.topjohnwu.magisk.Config +import com.topjohnwu.magisk.extensions.set import com.topjohnwu.magisk.model.events.BackPressEvent import com.topjohnwu.magisk.model.events.PermissionEvent import com.topjohnwu.magisk.model.events.ViewActionEvent @@ -31,7 +32,6 @@ import com.topjohnwu.magisk.model.navigation.Navigator import com.topjohnwu.magisk.model.permissions.PermissionRequestBuilder import com.topjohnwu.magisk.utils.LocaleManager import com.topjohnwu.magisk.utils.Utils -import com.topjohnwu.magisk.utils.set import timber.log.Timber import kotlin.reflect.KClass diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt index a45fc3be9..46a38f2c7 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt @@ -15,12 +15,12 @@ import com.skoumal.teanity.viewevents.SnackbarEvent import com.topjohnwu.magisk.BR import com.topjohnwu.magisk.Const import com.topjohnwu.magisk.R +import com.topjohnwu.magisk.extensions.* import com.topjohnwu.magisk.model.entity.recycler.ConsoleRvItem import com.topjohnwu.magisk.model.flash.FlashResultListener import com.topjohnwu.magisk.model.flash.Flashing import com.topjohnwu.magisk.model.flash.Patching import com.topjohnwu.magisk.ui.base.MagiskViewModel -import com.topjohnwu.magisk.utils.* import com.topjohnwu.superuser.Shell import me.tatarka.bindingcollectionadapter2.ItemBinding import java.io.File diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt index c7c3085ca..5e5a08992 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt @@ -9,13 +9,13 @@ import com.skoumal.teanity.util.DiffObservableList import com.skoumal.teanity.util.KObservableField import com.topjohnwu.magisk.BR import com.topjohnwu.magisk.data.repository.MagiskRepository +import com.topjohnwu.magisk.extensions.toSingle +import com.topjohnwu.magisk.extensions.update import com.topjohnwu.magisk.model.entity.recycler.HideProcessRvItem import com.topjohnwu.magisk.model.entity.recycler.HideRvItem import com.topjohnwu.magisk.model.entity.state.IndeterminateState import com.topjohnwu.magisk.model.events.HideProcessEvent import com.topjohnwu.magisk.ui.base.MagiskViewModel -import com.topjohnwu.magisk.utils.toSingle -import com.topjohnwu.magisk.utils.update import me.tatarka.bindingcollectionadapter2.OnItemBind import timber.log.Timber diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt index 5f81cd5da..f84c29dd6 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt @@ -7,12 +7,12 @@ import com.skoumal.teanity.viewevents.ViewEvent import com.topjohnwu.magisk.* import com.topjohnwu.magisk.data.repository.MagiskRepository import com.topjohnwu.magisk.databinding.FragmentMagiskBinding +import com.topjohnwu.magisk.extensions.inject +import com.topjohnwu.magisk.extensions.writeTo import com.topjohnwu.magisk.model.events.* import com.topjohnwu.magisk.ui.base.MagiskActivity import com.topjohnwu.magisk.ui.base.MagiskFragment import com.topjohnwu.magisk.utils.ISafetyNetHelper -import com.topjohnwu.magisk.utils.writeTo -import com.topjohnwu.magisk.utils.inject import com.topjohnwu.magisk.view.MarkDownWindow import com.topjohnwu.magisk.view.dialogs.* import com.topjohnwu.superuser.Shell diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt index 87648c825..1f75c1bc3 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt @@ -6,13 +6,13 @@ import com.skoumal.teanity.extensions.subscribeK import com.skoumal.teanity.util.KObservableField import com.topjohnwu.magisk.* import com.topjohnwu.magisk.data.repository.MagiskRepository +import com.topjohnwu.magisk.extensions.packageName +import com.topjohnwu.magisk.extensions.res +import com.topjohnwu.magisk.extensions.toggle import com.topjohnwu.magisk.model.events.* import com.topjohnwu.magisk.model.observer.Observer import com.topjohnwu.magisk.ui.base.MagiskViewModel import com.topjohnwu.magisk.utils.ISafetyNetHelper -import com.topjohnwu.magisk.utils.packageName -import com.topjohnwu.magisk.utils.res -import com.topjohnwu.magisk.utils.toggle import com.topjohnwu.superuser.Shell diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt index 0766b5bed..f3e1417f7 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt @@ -10,6 +10,8 @@ import com.skoumal.teanity.util.KObservableField import com.topjohnwu.magisk.BR import com.topjohnwu.magisk.R import com.topjohnwu.magisk.data.database.RepoDao +import com.topjohnwu.magisk.extensions.toSingle +import com.topjohnwu.magisk.extensions.update import com.topjohnwu.magisk.model.entity.module.Module import com.topjohnwu.magisk.model.entity.recycler.ModuleRvItem import com.topjohnwu.magisk.model.entity.recycler.RepoRvItem @@ -19,8 +21,6 @@ import com.topjohnwu.magisk.model.events.OpenChangelogEvent import com.topjohnwu.magisk.model.events.OpenFilePickerEvent import com.topjohnwu.magisk.tasks.RepoUpdater import com.topjohnwu.magisk.ui.base.MagiskViewModel -import com.topjohnwu.magisk.utils.toSingle -import com.topjohnwu.magisk.utils.update import io.reactivex.Single import io.reactivex.disposables.Disposable import me.tatarka.bindingcollectionadapter2.OnItemBind diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt index 02d2036c6..3f213d120 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt @@ -13,10 +13,10 @@ import com.topjohnwu.magisk.ClassMap import com.topjohnwu.magisk.Const import com.topjohnwu.magisk.R import com.topjohnwu.magisk.databinding.FragmentModulesBinding +import com.topjohnwu.magisk.extensions.reboot import com.topjohnwu.magisk.model.events.OpenFilePickerEvent import com.topjohnwu.magisk.ui.base.MagiskFragment import com.topjohnwu.magisk.ui.flash.FlashActivity -import com.topjohnwu.magisk.utils.reboot import com.topjohnwu.superuser.Shell import org.koin.androidx.viewmodel.ext.android.sharedViewModel diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/module/ReposFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/module/ReposFragment.kt index f2f4b1839..8532e36cb 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/module/ReposFragment.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/module/ReposFragment.kt @@ -11,9 +11,9 @@ import com.topjohnwu.magisk.Config import com.topjohnwu.magisk.R import com.topjohnwu.magisk.databinding.FragmentReposBinding import com.topjohnwu.magisk.model.download.DownloadService -import com.topjohnwu.magisk.model.entity.module.Repo import com.topjohnwu.magisk.model.entity.internal.Configuration import com.topjohnwu.magisk.model.entity.internal.DownloadSubject +import com.topjohnwu.magisk.model.entity.module.Repo import com.topjohnwu.magisk.model.events.InstallModuleEvent import com.topjohnwu.magisk.model.events.OpenChangelogEvent import com.topjohnwu.magisk.ui.base.MagiskFragment diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt index 1029d9ace..2bbc313d6 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt @@ -11,6 +11,7 @@ import com.skoumal.teanity.viewevents.SnackbarEvent import com.topjohnwu.magisk.BR import com.topjohnwu.magisk.R import com.topjohnwu.magisk.data.repository.AppRepository +import com.topjohnwu.magisk.extensions.toggle import com.topjohnwu.magisk.model.entity.MagiskPolicy import com.topjohnwu.magisk.model.entity.Policy import com.topjohnwu.magisk.model.entity.recycler.PolicyRvItem @@ -18,7 +19,6 @@ import com.topjohnwu.magisk.model.events.PolicyEnableEvent import com.topjohnwu.magisk.model.events.PolicyUpdateEvent import com.topjohnwu.magisk.ui.base.MagiskViewModel import com.topjohnwu.magisk.utils.FingerprintHelper -import com.topjohnwu.magisk.utils.toggle import com.topjohnwu.magisk.view.dialogs.CustomAlertDialog import com.topjohnwu.magisk.view.dialogs.FingerprintAuthDialog import io.reactivex.Single diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt index 77c735fee..bf5a62d1d 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt @@ -17,6 +17,7 @@ import com.topjohnwu.magisk.BuildConfig import com.topjohnwu.magisk.Config import com.topjohnwu.magisk.R import com.topjohnwu.magisk.data.repository.AppRepository +import com.topjohnwu.magisk.extensions.now import com.topjohnwu.magisk.model.entity.MagiskPolicy import com.topjohnwu.magisk.model.entity.Policy import com.topjohnwu.magisk.model.entity.recycler.SpinnerRvItem @@ -25,7 +26,6 @@ import com.topjohnwu.magisk.model.events.DieEvent import com.topjohnwu.magisk.ui.base.MagiskViewModel import com.topjohnwu.magisk.utils.FingerprintHelper import com.topjohnwu.magisk.utils.SuConnector -import com.topjohnwu.magisk.utils.now import me.tatarka.bindingcollectionadapter2.BindingListViewAdapter import me.tatarka.bindingcollectionadapter2.ItemBinding import timber.log.Timber diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt b/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt index 04eb62bba..b9338b3f0 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt +++ b/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt @@ -18,6 +18,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton import com.google.android.material.navigation.NavigationView import com.skoumal.teanity.extensions.subscribeK import com.topjohnwu.magisk.R +import com.topjohnwu.magisk.extensions.replaceRandomWithSpecial import com.topjohnwu.magisk.model.entity.state.IndeterminateState import io.reactivex.Observable import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/FingerprintHelper.kt b/app/src/main/java/com/topjohnwu/magisk/utils/FingerprintHelper.kt index 63741cbb3..e174f26f9 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/FingerprintHelper.kt +++ b/app/src/main/java/com/topjohnwu/magisk/utils/FingerprintHelper.kt @@ -9,6 +9,8 @@ import android.os.CancellationSignal import android.security.keystore.KeyGenParameterSpec import android.security.keystore.KeyProperties import com.topjohnwu.magisk.Config +import com.topjohnwu.magisk.extensions.get +import com.topjohnwu.magisk.extensions.inject import java.security.KeyStore import javax.crypto.Cipher import javax.crypto.KeyGenerator diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.kt b/app/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.kt index c1c03b6a4..afcb621d0 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.kt +++ b/app/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.kt @@ -9,6 +9,7 @@ import androidx.annotation.StringRes import com.topjohnwu.magisk.App import com.topjohnwu.magisk.Config import com.topjohnwu.magisk.R +import com.topjohnwu.magisk.extensions.inject import com.topjohnwu.superuser.internal.InternalUtils import io.reactivex.Single import java.util.* diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/RootUtils.kt b/app/src/main/java/com/topjohnwu/magisk/utils/RootUtils.kt index edae6e30d..d3f77fdaf 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/RootUtils.kt +++ b/app/src/main/java/com/topjohnwu/magisk/utils/RootUtils.kt @@ -7,6 +7,8 @@ import android.net.Uri import com.topjohnwu.magisk.Const import com.topjohnwu.magisk.Info import com.topjohnwu.magisk.R +import com.topjohnwu.magisk.extensions.rawResource +import com.topjohnwu.magisk.extensions.toShellCmd import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.ShellUtils import com.topjohnwu.superuser.io.SuFile diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/SuLogger.kt b/app/src/main/java/com/topjohnwu/magisk/utils/SuLogger.kt index 71fd12c79..2e1c7b441 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/SuLogger.kt +++ b/app/src/main/java/com/topjohnwu/magisk/utils/SuLogger.kt @@ -9,6 +9,7 @@ import com.topjohnwu.magisk.Config import com.topjohnwu.magisk.R import com.topjohnwu.magisk.data.repository.AppRepository import com.topjohnwu.magisk.data.repository.LogRepository +import com.topjohnwu.magisk.extensions.inject import com.topjohnwu.magisk.model.entity.MagiskPolicy import com.topjohnwu.magisk.model.entity.Policy import com.topjohnwu.magisk.model.entity.toLog diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt index cec5d8c47..9337fec1b 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt +++ b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt @@ -13,6 +13,7 @@ import android.widget.Toast import androidx.work.* import com.topjohnwu.magisk.* import com.topjohnwu.magisk.R +import com.topjohnwu.magisk.extensions.get import com.topjohnwu.magisk.model.update.UpdateCheckService import com.topjohnwu.net.Networking import com.topjohnwu.superuser.Shell diff --git a/app/src/main/java/com/topjohnwu/magisk/view/MarkDownWindow.kt b/app/src/main/java/com/topjohnwu/magisk/view/MarkDownWindow.kt index 9f8f17324..1a1f82b67 100644 --- a/app/src/main/java/com/topjohnwu/magisk/view/MarkDownWindow.kt +++ b/app/src/main/java/com/topjohnwu/magisk/view/MarkDownWindow.kt @@ -7,7 +7,7 @@ import androidx.appcompat.app.AlertDialog import com.skoumal.teanity.extensions.subscribeK import com.topjohnwu.magisk.R import com.topjohnwu.magisk.data.repository.StringRepository -import com.topjohnwu.magisk.utils.inject +import com.topjohnwu.magisk.extensions.inject import io.reactivex.Single import ru.noties.markwon.Markwon import ru.noties.markwon.html.HtmlPlugin diff --git a/app/src/main/java/com/topjohnwu/magisk/view/SnackbarMaker.kt b/app/src/main/java/com/topjohnwu/magisk/view/SnackbarMaker.kt index 7dd57e947..409dfce1f 100644 --- a/app/src/main/java/com/topjohnwu/magisk/view/SnackbarMaker.kt +++ b/app/src/main/java/com/topjohnwu/magisk/view/SnackbarMaker.kt @@ -7,7 +7,7 @@ import android.widget.TextView import androidx.annotation.StringRes import com.google.android.material.snackbar.Snackbar import com.topjohnwu.magisk.R -import com.topjohnwu.magisk.utils.fileName +import com.topjohnwu.magisk.extensions.fileName object SnackbarMaker { diff --git a/app/src/main/java/com/topjohnwu/magisk/view/dialogs/EnvFixDialog.kt b/app/src/main/java/com/topjohnwu/magisk/view/dialogs/EnvFixDialog.kt index 2f965e085..ff139a7c6 100644 --- a/app/src/main/java/com/topjohnwu/magisk/view/dialogs/EnvFixDialog.kt +++ b/app/src/main/java/com/topjohnwu/magisk/view/dialogs/EnvFixDialog.kt @@ -6,10 +6,10 @@ import android.widget.Toast import androidx.core.net.toUri import com.topjohnwu.magisk.Info import com.topjohnwu.magisk.R +import com.topjohnwu.magisk.extensions.cachedFile +import com.topjohnwu.magisk.extensions.reboot import com.topjohnwu.magisk.tasks.MagiskInstaller import com.topjohnwu.magisk.utils.Utils -import com.topjohnwu.magisk.utils.cachedFile -import com.topjohnwu.magisk.utils.reboot import com.topjohnwu.net.Networking import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.ShellUtils diff --git a/app/src/main/res/layout/fragment_magisk.xml b/app/src/main/res/layout/fragment_magisk.xml index 128cc8fea..8491913cc 100644 --- a/app/src/main/res/layout/fragment_magisk.xml +++ b/app/src/main/res/layout/fragment_magisk.xml @@ -15,7 +15,7 @@ - +