From 23c7bbc7d5874836de90f768c3088407f6d6a1fc Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Tue, 31 Jul 2018 17:42:35 +0800 Subject: [PATCH] Move Const to upper package --- app/src/full/java/com/topjohnwu/magisk/AboutActivity.java | 1 - .../full/java/com/topjohnwu/magisk/{utils => }/Const.java | 5 +---- app/src/full/java/com/topjohnwu/magisk/Data.java | 1 - app/src/full/java/com/topjohnwu/magisk/FlashActivity.java | 1 - app/src/full/java/com/topjohnwu/magisk/LogFragment.java | 1 - app/src/full/java/com/topjohnwu/magisk/MagiskFragment.java | 1 - .../full/java/com/topjohnwu/magisk/MagiskLogFragment.java | 1 - app/src/full/java/com/topjohnwu/magisk/MagiskManager.java | 1 - app/src/full/java/com/topjohnwu/magisk/MainActivity.java | 1 - app/src/full/java/com/topjohnwu/magisk/ModulesFragment.java | 1 - app/src/full/java/com/topjohnwu/magisk/ReposFragment.java | 1 - app/src/full/java/com/topjohnwu/magisk/SettingsActivity.java | 1 - app/src/full/java/com/topjohnwu/magisk/SplashActivity.java | 1 - .../com/topjohnwu/magisk/adapters/ApplicationAdapter.java | 2 +- .../java/com/topjohnwu/magisk/asyncs/CheckSafetyNet.java | 2 +- .../full/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java | 2 +- app/src/full/java/com/topjohnwu/magisk/asyncs/FlashZip.java | 2 +- .../full/java/com/topjohnwu/magisk/asyncs/HideManager.java | 2 +- .../full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java | 2 +- .../full/java/com/topjohnwu/magisk/asyncs/LoadModules.java | 2 +- .../java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java | 2 +- .../full/java/com/topjohnwu/magisk/asyncs/UpdateRepos.java | 2 +- .../com/topjohnwu/magisk/components/InstallMethodDialog.java | 2 +- .../topjohnwu/magisk/components/ManagerInstallDialog.java | 2 +- .../com/topjohnwu/magisk/components/UninstallDialog.java | 2 +- app/src/full/java/com/topjohnwu/magisk/container/Repo.java | 2 +- .../com/topjohnwu/magisk/database/MagiskDatabaseHelper.java | 2 +- .../com/topjohnwu/magisk/database/RepoDatabaseHelper.java | 2 +- .../java/com/topjohnwu/magisk/receivers/ManagerUpdate.java | 2 +- .../java/com/topjohnwu/magisk/receivers/PackageReceiver.java | 2 +- .../com/topjohnwu/magisk/receivers/ShortcutReceiver.java | 2 +- .../java/com/topjohnwu/magisk/services/OnBootService.java | 2 +- .../java/com/topjohnwu/magisk/superuser/RequestActivity.java | 2 +- .../full/java/com/topjohnwu/magisk/superuser/SuReceiver.java | 2 +- .../java/com/topjohnwu/magisk/utils/FingerprintHelper.java | 1 + .../full/java/com/topjohnwu/magisk/utils/LocaleManager.java | 1 + app/src/full/java/com/topjohnwu/magisk/utils/Logger.java | 1 + .../java/com/topjohnwu/magisk/utils/NotificationMgr.java | 1 + app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java | 1 + app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java | 1 + app/src/full/java/com/topjohnwu/magisk/utils/Utils.java | 1 + 41 files changed, 29 insertions(+), 37 deletions(-) rename app/src/full/java/com/topjohnwu/magisk/{utils => }/Const.java (98%) diff --git a/app/src/full/java/com/topjohnwu/magisk/AboutActivity.java b/app/src/full/java/com/topjohnwu/magisk/AboutActivity.java index b32f703b6..790bc6d65 100644 --- a/app/src/full/java/com/topjohnwu/magisk/AboutActivity.java +++ b/app/src/full/java/com/topjohnwu/magisk/AboutActivity.java @@ -12,7 +12,6 @@ import android.view.View; import com.topjohnwu.magisk.asyncs.MarkDownWindow; import com.topjohnwu.magisk.components.AboutCardRow; import com.topjohnwu.magisk.components.Activity; -import com.topjohnwu.magisk.utils.Const; import java.util.Locale; diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/Const.java b/app/src/full/java/com/topjohnwu/magisk/Const.java similarity index 98% rename from app/src/full/java/com/topjohnwu/magisk/utils/Const.java rename to app/src/full/java/com/topjohnwu/magisk/Const.java index dfd77f88d..e34bc71e4 100644 --- a/app/src/full/java/com/topjohnwu/magisk/utils/Const.java +++ b/app/src/full/java/com/topjohnwu/magisk/Const.java @@ -1,10 +1,7 @@ -package com.topjohnwu.magisk.utils; +package com.topjohnwu.magisk; import android.os.Process; -import com.topjohnwu.magisk.BuildConfig; -import com.topjohnwu.magisk.Data; - import java.io.File; import java.util.Arrays; import java.util.List; diff --git a/app/src/full/java/com/topjohnwu/magisk/Data.java b/app/src/full/java/com/topjohnwu/magisk/Data.java index 80216b8e2..be7a6cf30 100644 --- a/app/src/full/java/com/topjohnwu/magisk/Data.java +++ b/app/src/full/java/com/topjohnwu/magisk/Data.java @@ -5,7 +5,6 @@ import android.os.Handler; import android.os.Looper; import android.util.Xml; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.superuser.Shell; import com.topjohnwu.superuser.ShellUtils; diff --git a/app/src/full/java/com/topjohnwu/magisk/FlashActivity.java b/app/src/full/java/com/topjohnwu/magisk/FlashActivity.java index 5eb4acfde..b6e2ac21f 100644 --- a/app/src/full/java/com/topjohnwu/magisk/FlashActivity.java +++ b/app/src/full/java/com/topjohnwu/magisk/FlashActivity.java @@ -17,7 +17,6 @@ import android.widget.Toast; import com.topjohnwu.magisk.asyncs.FlashZip; import com.topjohnwu.magisk.asyncs.InstallMagisk; import com.topjohnwu.magisk.components.Activity; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Download; import com.topjohnwu.magisk.utils.RootUtils; import com.topjohnwu.magisk.utils.Utils; diff --git a/app/src/full/java/com/topjohnwu/magisk/LogFragment.java b/app/src/full/java/com/topjohnwu/magisk/LogFragment.java index 14c2848f8..3cb8de5e3 100644 --- a/app/src/full/java/com/topjohnwu/magisk/LogFragment.java +++ b/app/src/full/java/com/topjohnwu/magisk/LogFragment.java @@ -10,7 +10,6 @@ import android.view.ViewGroup; import com.topjohnwu.magisk.adapters.TabFragmentAdapter; import com.topjohnwu.magisk.components.Fragment; -import com.topjohnwu.magisk.utils.Const; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/full/java/com/topjohnwu/magisk/MagiskFragment.java b/app/src/full/java/com/topjohnwu/magisk/MagiskFragment.java index 98e2881d1..378e5512a 100644 --- a/app/src/full/java/com/topjohnwu/magisk/MagiskFragment.java +++ b/app/src/full/java/com/topjohnwu/magisk/MagiskFragment.java @@ -29,7 +29,6 @@ import com.topjohnwu.magisk.components.Fragment; import com.topjohnwu.magisk.components.MagiskInstallDialog; import com.topjohnwu.magisk.components.ManagerInstallDialog; import com.topjohnwu.magisk.components.UninstallDialog; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Download; import com.topjohnwu.magisk.utils.ISafetyNetHelper; import com.topjohnwu.magisk.utils.Topic; diff --git a/app/src/full/java/com/topjohnwu/magisk/MagiskLogFragment.java b/app/src/full/java/com/topjohnwu/magisk/MagiskLogFragment.java index a7c9ff266..f4f4edc14 100644 --- a/app/src/full/java/com/topjohnwu/magisk/MagiskLogFragment.java +++ b/app/src/full/java/com/topjohnwu/magisk/MagiskLogFragment.java @@ -18,7 +18,6 @@ import android.widget.TextView; import com.topjohnwu.magisk.components.Fragment; import com.topjohnwu.magisk.components.SnackbarMaker; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Download; import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.superuser.Shell; diff --git a/app/src/full/java/com/topjohnwu/magisk/MagiskManager.java b/app/src/full/java/com/topjohnwu/magisk/MagiskManager.java index 2d78f316a..d4847e25f 100644 --- a/app/src/full/java/com/topjohnwu/magisk/MagiskManager.java +++ b/app/src/full/java/com/topjohnwu/magisk/MagiskManager.java @@ -8,7 +8,6 @@ import android.text.TextUtils; import com.topjohnwu.magisk.container.Module; import com.topjohnwu.magisk.database.MagiskDatabaseHelper; import com.topjohnwu.magisk.database.RepoDatabaseHelper; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.LocaleManager; import com.topjohnwu.magisk.utils.RootUtils; import com.topjohnwu.magisk.utils.Topic; diff --git a/app/src/full/java/com/topjohnwu/magisk/MainActivity.java b/app/src/full/java/com/topjohnwu/magisk/MainActivity.java index a8a0a427f..c988d4e20 100644 --- a/app/src/full/java/com/topjohnwu/magisk/MainActivity.java +++ b/app/src/full/java/com/topjohnwu/magisk/MainActivity.java @@ -15,7 +15,6 @@ import android.view.MenuItem; import android.view.View; import com.topjohnwu.magisk.components.Activity; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Download; import com.topjohnwu.magisk.utils.Topic; import com.topjohnwu.superuser.Shell; diff --git a/app/src/full/java/com/topjohnwu/magisk/ModulesFragment.java b/app/src/full/java/com/topjohnwu/magisk/ModulesFragment.java index f995ca982..46f44c355 100644 --- a/app/src/full/java/com/topjohnwu/magisk/ModulesFragment.java +++ b/app/src/full/java/com/topjohnwu/magisk/ModulesFragment.java @@ -19,7 +19,6 @@ import com.topjohnwu.magisk.adapters.ModulesAdapter; import com.topjohnwu.magisk.asyncs.LoadModules; import com.topjohnwu.magisk.components.Fragment; import com.topjohnwu.magisk.container.Module; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Topic; import com.topjohnwu.superuser.Shell; diff --git a/app/src/full/java/com/topjohnwu/magisk/ReposFragment.java b/app/src/full/java/com/topjohnwu/magisk/ReposFragment.java index 494e0c13f..224d91085 100644 --- a/app/src/full/java/com/topjohnwu/magisk/ReposFragment.java +++ b/app/src/full/java/com/topjohnwu/magisk/ReposFragment.java @@ -17,7 +17,6 @@ import android.widget.TextView; import com.topjohnwu.magisk.adapters.ReposAdapter; import com.topjohnwu.magisk.asyncs.UpdateRepos; import com.topjohnwu.magisk.components.Fragment; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Topic; import butterknife.BindView; diff --git a/app/src/full/java/com/topjohnwu/magisk/SettingsActivity.java b/app/src/full/java/com/topjohnwu/magisk/SettingsActivity.java index 83b9ceb1e..bbc06a506 100644 --- a/app/src/full/java/com/topjohnwu/magisk/SettingsActivity.java +++ b/app/src/full/java/com/topjohnwu/magisk/SettingsActivity.java @@ -24,7 +24,6 @@ import com.topjohnwu.magisk.asyncs.CheckUpdates; import com.topjohnwu.magisk.asyncs.HideManager; import com.topjohnwu.magisk.components.Activity; import com.topjohnwu.magisk.receivers.DownloadReceiver; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Download; import com.topjohnwu.magisk.utils.FingerprintHelper; import com.topjohnwu.magisk.utils.LocaleManager; diff --git a/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java b/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java index 33a16a1c5..953627f13 100644 --- a/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java +++ b/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java @@ -12,7 +12,6 @@ import com.topjohnwu.magisk.asyncs.UpdateRepos; import com.topjohnwu.magisk.components.Activity; import com.topjohnwu.magisk.database.RepoDatabaseHelper; import com.topjohnwu.magisk.receivers.ShortcutReceiver; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Download; import com.topjohnwu.magisk.utils.LocaleManager; import com.topjohnwu.magisk.utils.Utils; diff --git a/app/src/full/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java b/app/src/full/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java index 1d984db44..bf2e5f060 100644 --- a/app/src/full/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java +++ b/app/src/full/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java @@ -12,10 +12,10 @@ import android.widget.Filter; import android.widget.ImageView; import android.widget.TextView; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.asyncs.ParallelTask; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.superuser.Shell; import java.util.ArrayList; diff --git a/app/src/full/java/com/topjohnwu/magisk/asyncs/CheckSafetyNet.java b/app/src/full/java/com/topjohnwu/magisk/asyncs/CheckSafetyNet.java index 07f74a375..ed0901546 100644 --- a/app/src/full/java/com/topjohnwu/magisk/asyncs/CheckSafetyNet.java +++ b/app/src/full/java/com/topjohnwu/magisk/asyncs/CheckSafetyNet.java @@ -2,8 +2,8 @@ package com.topjohnwu.magisk.asyncs; import android.app.Activity; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.ISafetyNetHelper; import com.topjohnwu.magisk.utils.WebService; import com.topjohnwu.superuser.Shell; diff --git a/app/src/full/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java b/app/src/full/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java index dca6b55f5..3b1017ad8 100644 --- a/app/src/full/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java +++ b/app/src/full/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java @@ -1,9 +1,9 @@ package com.topjohnwu.magisk.asyncs; import com.topjohnwu.magisk.BuildConfig; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.NotificationMgr; import com.topjohnwu.magisk.utils.WebService; diff --git a/app/src/full/java/com/topjohnwu/magisk/asyncs/FlashZip.java b/app/src/full/java/com/topjohnwu/magisk/asyncs/FlashZip.java index 7325b21d1..1fa2b39da 100644 --- a/app/src/full/java/com/topjohnwu/magisk/asyncs/FlashZip.java +++ b/app/src/full/java/com/topjohnwu/magisk/asyncs/FlashZip.java @@ -4,11 +4,11 @@ import android.app.Activity; import android.net.Uri; import android.view.View; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.FlashActivity; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.components.SnackbarMaker; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.ZipUtils; import com.topjohnwu.superuser.Shell; diff --git a/app/src/full/java/com/topjohnwu/magisk/asyncs/HideManager.java b/app/src/full/java/com/topjohnwu/magisk/asyncs/HideManager.java index 968db0498..9f47921c2 100644 --- a/app/src/full/java/com/topjohnwu/magisk/asyncs/HideManager.java +++ b/app/src/full/java/com/topjohnwu/magisk/asyncs/HideManager.java @@ -4,10 +4,10 @@ import android.app.Activity; import android.app.ProgressDialog; import android.widget.Toast; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.PatchAPK; import com.topjohnwu.magisk.utils.RootUtils; import com.topjohnwu.magisk.utils.Utils; diff --git a/app/src/full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java b/app/src/full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java index f15f8298d..0273e03a0 100644 --- a/app/src/full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java +++ b/app/src/full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java @@ -9,12 +9,12 @@ import android.text.TextUtils; import android.view.View; import android.widget.Toast; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.FlashActivity; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.container.TarEntry; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Download; import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.WebService; diff --git a/app/src/full/java/com/topjohnwu/magisk/asyncs/LoadModules.java b/app/src/full/java/com/topjohnwu/magisk/asyncs/LoadModules.java index 1c2f60336..820054706 100644 --- a/app/src/full/java/com/topjohnwu/magisk/asyncs/LoadModules.java +++ b/app/src/full/java/com/topjohnwu/magisk/asyncs/LoadModules.java @@ -1,10 +1,10 @@ package com.topjohnwu.magisk.asyncs; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.container.Module; import com.topjohnwu.magisk.container.ValueSortedMap; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.superuser.io.SuFile; public class LoadModules extends ParallelTask { diff --git a/app/src/full/java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java b/app/src/full/java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java index 09b05b386..a8aec362c 100644 --- a/app/src/full/java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java +++ b/app/src/full/java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java @@ -8,11 +8,11 @@ import android.os.Handler; import android.support.annotation.NonNull; import android.widget.Toast; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.FlashActivity; import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.components.Activity; import com.topjohnwu.magisk.components.SnackbarMaker; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Download; import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.WebService; diff --git a/app/src/full/java/com/topjohnwu/magisk/asyncs/UpdateRepos.java b/app/src/full/java/com/topjohnwu/magisk/asyncs/UpdateRepos.java index f214e40a9..bd86395c1 100644 --- a/app/src/full/java/com/topjohnwu/magisk/asyncs/UpdateRepos.java +++ b/app/src/full/java/com/topjohnwu/magisk/asyncs/UpdateRepos.java @@ -3,11 +3,11 @@ package com.topjohnwu.magisk.asyncs; import android.database.Cursor; import android.text.TextUtils; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.ReposFragment; import com.topjohnwu.magisk.container.Repo; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Logger; import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.WebService; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java b/app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java index 1fe2b7fd6..0d38d835d 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java +++ b/app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java @@ -7,12 +7,12 @@ import android.support.design.widget.Snackbar; import android.support.v7.app.AlertDialog; import android.widget.Toast; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.FlashActivity; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.receivers.DownloadReceiver; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Download; import com.topjohnwu.magisk.utils.Utils; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/ManagerInstallDialog.java b/app/src/full/java/com/topjohnwu/magisk/components/ManagerInstallDialog.java index 3069f796e..3c068d6a7 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/ManagerInstallDialog.java +++ b/app/src/full/java/com/topjohnwu/magisk/components/ManagerInstallDialog.java @@ -5,12 +5,12 @@ import android.content.Intent; import android.support.annotation.NonNull; import android.text.TextUtils; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.asyncs.MarkDownWindow; import com.topjohnwu.magisk.receivers.ManagerUpdate; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Utils; public class ManagerInstallDialog extends CustomAlertDialog { diff --git a/app/src/full/java/com/topjohnwu/magisk/components/UninstallDialog.java b/app/src/full/java/com/topjohnwu/magisk/components/UninstallDialog.java index 0f79bd785..277ba5437 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/UninstallDialog.java +++ b/app/src/full/java/com/topjohnwu/magisk/components/UninstallDialog.java @@ -7,13 +7,13 @@ import android.net.Uri; import android.support.annotation.NonNull; import android.text.TextUtils; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.FlashActivity; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.asyncs.RestoreImages; import com.topjohnwu.magisk.receivers.DownloadReceiver; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Download; import com.topjohnwu.magisk.utils.Utils; diff --git a/app/src/full/java/com/topjohnwu/magisk/container/Repo.java b/app/src/full/java/com/topjohnwu/magisk/container/Repo.java index 307303bf5..d098a8278 100644 --- a/app/src/full/java/com/topjohnwu/magisk/container/Repo.java +++ b/app/src/full/java/com/topjohnwu/magisk/container/Repo.java @@ -3,7 +3,7 @@ package com.topjohnwu.magisk.container; import android.content.ContentValues; import android.database.Cursor; -import com.topjohnwu.magisk.utils.Const; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.utils.LocaleManager; import com.topjohnwu.magisk.utils.Logger; import com.topjohnwu.magisk.utils.Utils; diff --git a/app/src/full/java/com/topjohnwu/magisk/database/MagiskDatabaseHelper.java b/app/src/full/java/com/topjohnwu/magisk/database/MagiskDatabaseHelper.java index 48a88f931..9dbed6e62 100644 --- a/app/src/full/java/com/topjohnwu/magisk/database/MagiskDatabaseHelper.java +++ b/app/src/full/java/com/topjohnwu/magisk/database/MagiskDatabaseHelper.java @@ -11,12 +11,12 @@ import android.support.annotation.NonNull; import android.text.TextUtils; import android.widget.Toast; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.container.Policy; import com.topjohnwu.magisk.container.SuLogEntry; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.LocaleManager; import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.superuser.Shell; diff --git a/app/src/full/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java b/app/src/full/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java index a61a413af..586f557f9 100644 --- a/app/src/full/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java +++ b/app/src/full/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java @@ -5,10 +5,10 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.container.Repo; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Utils; import java.util.HashSet; diff --git a/app/src/full/java/com/topjohnwu/magisk/receivers/ManagerUpdate.java b/app/src/full/java/com/topjohnwu/magisk/receivers/ManagerUpdate.java index c6c4fc6f1..248832baa 100644 --- a/app/src/full/java/com/topjohnwu/magisk/receivers/ManagerUpdate.java +++ b/app/src/full/java/com/topjohnwu/magisk/receivers/ManagerUpdate.java @@ -6,7 +6,7 @@ import android.content.Intent; import android.net.Uri; import android.os.AsyncTask; -import com.topjohnwu.magisk.utils.Const; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.utils.Download; import com.topjohnwu.magisk.utils.PatchAPK; diff --git a/app/src/full/java/com/topjohnwu/magisk/receivers/PackageReceiver.java b/app/src/full/java/com/topjohnwu/magisk/receivers/PackageReceiver.java index c64fafba8..3342ca43c 100644 --- a/app/src/full/java/com/topjohnwu/magisk/receivers/PackageReceiver.java +++ b/app/src/full/java/com/topjohnwu/magisk/receivers/PackageReceiver.java @@ -4,8 +4,8 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.MagiskManager; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.superuser.Shell; diff --git a/app/src/full/java/com/topjohnwu/magisk/receivers/ShortcutReceiver.java b/app/src/full/java/com/topjohnwu/magisk/receivers/ShortcutReceiver.java index d1704e39e..1edcc99ab 100644 --- a/app/src/full/java/com/topjohnwu/magisk/receivers/ShortcutReceiver.java +++ b/app/src/full/java/com/topjohnwu/magisk/receivers/ShortcutReceiver.java @@ -9,11 +9,11 @@ import android.graphics.drawable.Icon; import android.os.Build; import android.support.annotation.RequiresApi; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.SplashActivity; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.superuser.Shell; diff --git a/app/src/full/java/com/topjohnwu/magisk/services/OnBootService.java b/app/src/full/java/com/topjohnwu/magisk/services/OnBootService.java index 0613ec6fc..6e887f7a3 100644 --- a/app/src/full/java/com/topjohnwu/magisk/services/OnBootService.java +++ b/app/src/full/java/com/topjohnwu/magisk/services/OnBootService.java @@ -5,7 +5,7 @@ import android.content.Intent; import android.support.annotation.NonNull; import android.support.v4.app.JobIntentService; -import com.topjohnwu.magisk.utils.Const; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.utils.NotificationMgr; import com.topjohnwu.superuser.Shell; import com.topjohnwu.superuser.ShellUtils; diff --git a/app/src/full/java/com/topjohnwu/magisk/superuser/RequestActivity.java b/app/src/full/java/com/topjohnwu/magisk/superuser/RequestActivity.java index fccef5bd5..ada8ecb06 100644 --- a/app/src/full/java/com/topjohnwu/magisk/superuser/RequestActivity.java +++ b/app/src/full/java/com/topjohnwu/magisk/superuser/RequestActivity.java @@ -19,13 +19,13 @@ import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.TextView; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.asyncs.ParallelTask; import com.topjohnwu.magisk.components.Activity; import com.topjohnwu.magisk.container.Policy; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.FingerprintHelper; import com.topjohnwu.magisk.utils.Utils; diff --git a/app/src/full/java/com/topjohnwu/magisk/superuser/SuReceiver.java b/app/src/full/java/com/topjohnwu/magisk/superuser/SuReceiver.java index ebaef7cfa..fbecf247c 100644 --- a/app/src/full/java/com/topjohnwu/magisk/superuser/SuReceiver.java +++ b/app/src/full/java/com/topjohnwu/magisk/superuser/SuReceiver.java @@ -7,12 +7,12 @@ import android.content.pm.PackageManager; import android.os.Process; import android.widget.Toast; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.container.Policy; import com.topjohnwu.magisk.container.SuLogEntry; -import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Utils; import java.util.Date; diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/FingerprintHelper.java b/app/src/full/java/com/topjohnwu/magisk/utils/FingerprintHelper.java index f62c175fa..3257dcaf6 100644 --- a/app/src/full/java/com/topjohnwu/magisk/utils/FingerprintHelper.java +++ b/app/src/full/java/com/topjohnwu/magisk/utils/FingerprintHelper.java @@ -9,6 +9,7 @@ import android.security.keystore.KeyGenParameterSpec; import android.security.keystore.KeyPermanentlyInvalidatedException; import android.security.keystore.KeyProperties; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/LocaleManager.java b/app/src/full/java/com/topjohnwu/magisk/utils/LocaleManager.java index ac7ac3878..77c5c51bc 100644 --- a/app/src/full/java/com/topjohnwu/magisk/utils/LocaleManager.java +++ b/app/src/full/java/com/topjohnwu/magisk/utils/LocaleManager.java @@ -4,6 +4,7 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.support.annotation.StringRes; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/Logger.java b/app/src/full/java/com/topjohnwu/magisk/utils/Logger.java index f1cebe725..68756e91a 100644 --- a/app/src/full/java/com/topjohnwu/magisk/utils/Logger.java +++ b/app/src/full/java/com/topjohnwu/magisk/utils/Logger.java @@ -3,6 +3,7 @@ package com.topjohnwu.magisk.utils; import android.util.Log; import com.topjohnwu.magisk.BuildConfig; +import com.topjohnwu.magisk.Const; public class Logger { diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/NotificationMgr.java b/app/src/full/java/com/topjohnwu/magisk/utils/NotificationMgr.java index dea9751e8..1f13871d3 100644 --- a/app/src/full/java/com/topjohnwu/magisk/utils/NotificationMgr.java +++ b/app/src/full/java/com/topjohnwu/magisk/utils/NotificationMgr.java @@ -7,6 +7,7 @@ import android.content.Intent; import android.support.v4.app.NotificationCompat; import android.support.v4.app.TaskStackBuilder; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java b/app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java index 516ed365b..8f57a3224 100644 --- a/app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java +++ b/app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java @@ -1,5 +1,6 @@ package com.topjohnwu.magisk.utils; +import com.topjohnwu.magisk.Const; import com.topjohnwu.utils.JarMap; import java.io.OutputStream; diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java b/app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java index 3810fea4b..48e214baa 100644 --- a/app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java +++ b/app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java @@ -3,6 +3,7 @@ package com.topjohnwu.magisk.utils; import android.content.Context; import android.support.annotation.NonNull; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.R; import com.topjohnwu.superuser.BusyBox; diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/Utils.java b/app/src/full/java/com/topjohnwu/magisk/utils/Utils.java index f401b0a0a..451dbbe9a 100644 --- a/app/src/full/java/com/topjohnwu/magisk/utils/Utils.java +++ b/app/src/full/java/com/topjohnwu/magisk/utils/Utils.java @@ -10,6 +10,7 @@ import android.net.Uri; import android.provider.OpenableColumns; import android.widget.Toast; +import com.topjohnwu.magisk.Const; import com.topjohnwu.magisk.Data; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.services.UpdateCheckService;