Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
60f69fea
Commit
60f69fea
authored
Jan 30, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Full project restructuring
parent
5df42638
Hide whitespace changes
Inline
Side-by-side
Showing
91 changed files
with
219 additions
and
238 deletions
+219
-238
.gitignore
app-core/.gitignore
+0
-0
build.gradle
app-core/build.gradle
+1
-1
proguard-rules.pro
app-core/proguard-rules.pro
+0
-0
AndroidManifest.xml
app-core/src/main/AndroidManifest.xml
+1
-1
App.java
app-core/src/main/java/com/topjohnwu/magisk/App.java
+6
-5
Config.java
app-core/src/main/java/com/topjohnwu/magisk/Config.java
+2
-2
Const.java
app-core/src/main/java/com/topjohnwu/magisk/Const.java
+1
-1
BaseModule.java
.../main/java/com/topjohnwu/magisk/container/BaseModule.java
+1
-1
Module.java
.../src/main/java/com/topjohnwu/magisk/container/Module.java
+1
-1
Policy.java
.../src/main/java/com/topjohnwu/magisk/container/Policy.java
+2
-2
Repo.java
...re/src/main/java/com/topjohnwu/magisk/container/Repo.java
+4
-4
SuLogEntry.java
.../main/java/com/topjohnwu/magisk/container/SuLogEntry.java
+2
-2
TarEntry.java
...rc/main/java/com/topjohnwu/magisk/container/TarEntry.java
+1
-1
ValueSortedMap.java
...n/java/com/topjohnwu/magisk/container/ValueSortedMap.java
+1
-1
MagiskDB.java
...src/main/java/com/topjohnwu/magisk/database/MagiskDB.java
+7
-7
RepoDatabaseHelper.java
...ava/com/topjohnwu/magisk/database/RepoDatabaseHelper.java
+5
-5
CheckUpdates.java
...rc/main/java/com/topjohnwu/magisk/tasks/CheckUpdates.java
+4
-4
FlashZip.java
...re/src/main/java/com/topjohnwu/magisk/tasks/FlashZip.java
+5
-5
MagiskInstaller.java
...main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java
+8
-8
SafetyNet.java
...e/src/main/java/com/topjohnwu/magisk/tasks/SafetyNet.java
+5
-5
UpdateRepos.java
...src/main/java/com/topjohnwu/magisk/tasks/UpdateRepos.java
+8
-8
ISafetyNetHelper.java
...ain/java/com/topjohnwu/magisk/utils/ISafetyNetHelper.java
+1
-1
LocaleManager.java
...c/main/java/com/topjohnwu/magisk/utils/LocaleManager.java
+3
-3
Logger.java
...core/src/main/java/com/topjohnwu/magisk/utils/Logger.java
+3
-3
RootUtils.java
...e/src/main/java/com/topjohnwu/magisk/utils/RootUtils.java
+4
-4
Topic.java
app-core/src/main/java/com/topjohnwu/magisk/utils/Topic.java
+2
-2
Utils.java
app-core/src/main/java/com/topjohnwu/magisk/utils/Utils.java
+6
-6
ZipUtils.java
...re/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java
+3
-3
bootctl
app-core/src/main/res/raw/bootctl
+0
-0
nonroot_utils.sh
app-core/src/main/res/raw/nonroot_utils.sh
+0
-0
utils.sh
app-core/src/main/res/raw/utils.sh
+0
-0
build.gradle
app/build.gradle
+4
-4
proguard-rules.pro
app/proguard-rules.pro
+5
-3
a.java
app/src/full/java/a/a.java
+1
-1
e.java
app/src/full/java/a/e.java
+1
-1
AboutActivity.java
app/src/full/java/com/topjohnwu/magisk/AboutActivity.java
+0
-1
ClassMap.java
app/src/full/java/com/topjohnwu/magisk/ClassMap.java
+0
-1
FlashActivity.java
app/src/full/java/com/topjohnwu/magisk/FlashActivity.java
+3
-5
MainActivity.java
app/src/full/java/com/topjohnwu/magisk/MainActivity.java
+2
-4
SplashActivity.java
app/src/full/java/com/topjohnwu/magisk/SplashActivity.java
+4
-6
SuRequestActivity.java
...src/full/java/com/topjohnwu/magisk/SuRequestActivity.java
+1
-2
ApplicationAdapter.java
...ava/com/topjohnwu/magisk/adapters/ApplicationAdapter.java
+3
-3
ModulesAdapter.java
...ll/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java
+1
-1
PolicyAdapter.java
...ull/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java
+2
-2
ReposAdapter.java
...full/java/com/topjohnwu/magisk/adapters/ReposAdapter.java
+3
-3
SuLogAdapter.java
...full/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java
+2
-2
BaseActivity.java
...ll/java/com/topjohnwu/magisk/components/BaseActivity.java
+5
-5
BaseFragment.java
...ll/java/com/topjohnwu/magisk/components/BaseFragment.java
+2
-2
BasePreferenceFragment.java
...m/topjohnwu/magisk/components/BasePreferenceFragment.java
+2
-2
EnvFixDialog.java
...ll/java/com/topjohnwu/magisk/components/EnvFixDialog.java
+2
-2
InstallMethodDialog.java
.../com/topjohnwu/magisk/components/InstallMethodDialog.java
+3
-3
MagiskInstallDialog.java
.../com/topjohnwu/magisk/components/MagiskInstallDialog.java
+2
-2
ManagerInstallDialog.java
...com/topjohnwu/magisk/components/ManagerInstallDialog.java
+2
-2
MarkDownWindow.java
.../java/com/topjohnwu/magisk/components/MarkDownWindow.java
+3
-3
Notifications.java
...l/java/com/topjohnwu/magisk/components/Notifications.java
+4
-4
ProgressNotification.java
...com/topjohnwu/magisk/components/ProgressNotification.java
+2
-2
SnackbarMaker.java
...l/java/com/topjohnwu/magisk/components/SnackbarMaker.java
+1
-1
UninstallDialog.java
...java/com/topjohnwu/magisk/components/UninstallDialog.java
+3
-3
MagiskFragment.java
...l/java/com/topjohnwu/magisk/fragments/MagiskFragment.java
+5
-5
MagiskHideFragment.java
...va/com/topjohnwu/magisk/fragments/MagiskHideFragment.java
+1
-1
MagiskLogFragment.java
...ava/com/topjohnwu/magisk/fragments/MagiskLogFragment.java
+2
-2
ModulesFragment.java
.../java/com/topjohnwu/magisk/fragments/ModulesFragment.java
+4
-4
ReposFragment.java
...ll/java/com/topjohnwu/magisk/fragments/ReposFragment.java
+4
-4
SettingsFragment.java
...java/com/topjohnwu/magisk/fragments/SettingsFragment.java
+6
-6
SuperuserFragment.java
...ava/com/topjohnwu/magisk/fragments/SuperuserFragment.java
+1
-1
GeneralReceiver.java
.../java/com/topjohnwu/magisk/receivers/GeneralReceiver.java
+3
-3
ShortcutReceiver.java
...java/com/topjohnwu/magisk/receivers/ShortcutReceiver.java
+4
-4
DelegateWorker.java
...ll/java/com/topjohnwu/magisk/services/DelegateWorker.java
+0
-4
DownloadModuleService.java
.../com/topjohnwu/magisk/services/DownloadModuleService.java
+3
-3
UpdateCheckService.java
...ava/com/topjohnwu/magisk/services/UpdateCheckService.java
+2
-2
AppUtils.java
app/src/full/java/com/topjohnwu/magisk/utils/AppUtils.java
+2
-3
DownloadApp.java
...src/full/java/com/topjohnwu/magisk/utils/DownloadApp.java
+2
-4
FingerprintHelper.java
...ll/java/com/topjohnwu/magisk/utils/FingerprintHelper.java
+3
-4
PatchAPK.java
app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java
+5
-7
SuConnector.java
...src/full/java/com/topjohnwu/magisk/utils/SuConnector.java
+4
-5
build.py
build.py
+5
-5
AndroidManifest.xml
native/src/main/AndroidManifest.xml
+1
-1
settings.gradle
settings.gradle
+1
-1
.gitignore
signing/.gitignore
+0
-0
build.gradle
signing/build.gradle
+1
-1
BootSigner.java
signing/src/main/java/com/topjohnwu/signing/BootSigner.java
+1
-3
ByteArrayStream.java
.../src/main/java/com/topjohnwu/signing/ByteArrayStream.java
+1
-1
CryptoUtils.java
signing/src/main/java/com/topjohnwu/signing/CryptoUtils.java
+1
-1
JarMap.java
signing/src/main/java/com/topjohnwu/signing/JarMap.java
+1
-1
SignAPK.java
signing/src/main/java/com/topjohnwu/signing/SignAPK.java
+1
-1
SignBoot.java
signing/src/main/java/com/topjohnwu/signing/SignBoot.java
+1
-1
ZipAdjust.java
signing/src/main/java/com/topjohnwu/signing/ZipAdjust.java
+1
-1
ZipSigner.java
signing/src/main/java/com/topjohnwu/signing/ZipSigner.java
+1
-1
testkey.pk8
signing/src/main/resources/keys/testkey.pk8
+0
-0
testkey.x509.pem
signing/src/main/resources/keys/testkey.x509.pem
+0
-0
build.gradle
snet/build.gradle
+2
-2
No files found.
core/.gitignore
→
app-
core/.gitignore
View file @
60f69fea
File moved
core/build.gradle
→
app-
core/build.gradle
View file @
60f69fea
...
@@ -12,7 +12,7 @@ android {
...
@@ -12,7 +12,7 @@ android {
dependencies
{
dependencies
{
implementation
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
implementation
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
api
project
(
':net'
)
api
project
(
':net'
)
api
project
(
':
utils
'
)
api
project
(
':
signing
'
)
api
'org.kamranzafar:jtar:2.3'
api
'org.kamranzafar:jtar:2.3'
def
libsuVersion
=
'2.2.0'
def
libsuVersion
=
'2.2.0'
...
...
core/proguard-rules.pro
→
app-
core/proguard-rules.pro
View file @
60f69fea
File moved
core/src/main/AndroidManifest.xml
→
app-
core/src/main/AndroidManifest.xml
View file @
60f69fea
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"com.topjohnwu.core"
/>
package=
"com.topjohnwu.
magisk.
core"
/>
core/src/main/java/com/topjohnwu/core
/App.java
→
app-core/src/main/java/com/topjohnwu/magisk
/App.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
;
package
com
.
topjohnwu
.
magisk
;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.SharedPreferences
;
import
android.content.SharedPreferences
;
...
@@ -8,10 +8,11 @@ import android.os.Handler;
...
@@ -8,10 +8,11 @@ import android.os.Handler;
import
android.os.Looper
;
import
android.os.Looper
;
import
android.preference.PreferenceManager
;
import
android.preference.PreferenceManager
;
import
com.topjohnwu.core.database.MagiskDB
;
import
com.topjohnwu.magisk.core.BuildConfig
;
import
com.topjohnwu.core.database.RepoDatabaseHelper
;
import
com.topjohnwu.magisk.database.MagiskDB
;
import
com.topjohnwu.core.utils.LocaleManager
;
import
com.topjohnwu.magisk.database.RepoDatabaseHelper
;
import
com.topjohnwu.core.utils.RootUtils
;
import
com.topjohnwu.magisk.utils.LocaleManager
;
import
com.topjohnwu.magisk.utils.RootUtils
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.superuser.ContainerApp
;
import
com.topjohnwu.superuser.ContainerApp
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
...
...
core/src/main/java/com/topjohnwu/core
/Config.java
→
app-core/src/main/java/com/topjohnwu/magisk
/Config.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
;
package
com
.
topjohnwu
.
magisk
;
import
android.content.SharedPreferences
;
import
android.content.SharedPreferences
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.util.Xml
;
import
android.util.Xml
;
import
com.topjohnwu.
core
.utils.Utils
;
import
com.topjohnwu.
magisk
.utils.Utils
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.io.SuFile
;
import
com.topjohnwu.superuser.io.SuFile
;
...
...
core/src/main/java/com/topjohnwu/core
/Const.java
→
app-core/src/main/java/com/topjohnwu/magisk
/Const.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
;
package
com
.
topjohnwu
.
magisk
;
import
android.os.Environment
;
import
android.os.Environment
;
import
android.os.Process
;
import
android.os.Process
;
...
...
core/src/main/java/com/topjohnwu/core
/container/BaseModule.java
→
app-core/src/main/java/com/topjohnwu/magisk
/container/BaseModule.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
container
;
package
com
.
topjohnwu
.
magisk
.
container
;
import
android.content.ContentValues
;
import
android.content.ContentValues
;
import
android.database.Cursor
;
import
android.database.Cursor
;
...
...
core/src/main/java/com/topjohnwu/core
/container/Module.java
→
app-core/src/main/java/com/topjohnwu/magisk
/container/Module.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
container
;
package
com
.
topjohnwu
.
magisk
.
container
;
import
android.os.Parcel
;
import
android.os.Parcel
;
import
android.os.Parcelable
;
import
android.os.Parcelable
;
...
...
core/src/main/java/com/topjohnwu/core
/container/Policy.java
→
app-core/src/main/java/com/topjohnwu/magisk
/container/Policy.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
container
;
package
com
.
topjohnwu
.
magisk
.
container
;
import
android.content.ContentValues
;
import
android.content.ContentValues
;
import
android.content.pm.ApplicationInfo
;
import
android.content.pm.ApplicationInfo
;
import
android.content.pm.PackageManager
;
import
android.content.pm.PackageManager
;
import
com.topjohnwu.
core
.utils.Utils
;
import
com.topjohnwu.
magisk
.utils.Utils
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
...
...
core/src/main/java/com/topjohnwu/core
/container/Repo.java
→
app-core/src/main/java/com/topjohnwu/magisk
/container/Repo.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
container
;
package
com
.
topjohnwu
.
magisk
.
container
;
import
android.content.ContentValues
;
import
android.content.ContentValues
;
import
android.database.Cursor
;
import
android.database.Cursor
;
import
android.os.Parcel
;
import
android.os.Parcel
;
import
android.os.Parcelable
;
import
android.os.Parcelable
;
import
com.topjohnwu.
core
.Const
;
import
com.topjohnwu.
magisk
.Const
;
import
com.topjohnwu.
core
.utils.Logger
;
import
com.topjohnwu.
magisk
.utils.Logger
;
import
com.topjohnwu.
core
.utils.Utils
;
import
com.topjohnwu.
magisk
.utils.Utils
;
import
java.text.DateFormat
;
import
java.text.DateFormat
;
import
java.util.Date
;
import
java.util.Date
;
...
...
core/src/main/java/com/topjohnwu/core
/container/SuLogEntry.java
→
app-core/src/main/java/com/topjohnwu/magisk
/container/SuLogEntry.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
container
;
package
com
.
topjohnwu
.
magisk
.
container
;
import
android.content.ContentValues
;
import
android.content.ContentValues
;
import
com.topjohnwu.
core
.utils.LocaleManager
;
import
com.topjohnwu.
magisk
.utils.LocaleManager
;
import
java.text.DateFormat
;
import
java.text.DateFormat
;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
...
...
core/src/main/java/com/topjohnwu/core
/container/TarEntry.java
→
app-core/src/main/java/com/topjohnwu/magisk
/container/TarEntry.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
container
;
package
com
.
topjohnwu
.
magisk
.
container
;
import
org.kamranzafar.jtar.TarHeader
;
import
org.kamranzafar.jtar.TarHeader
;
...
...
core/src/main/java/com/topjohnwu/core
/container/ValueSortedMap.java
→
app-core/src/main/java/com/topjohnwu/magisk
/container/ValueSortedMap.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
container
;
package
com
.
topjohnwu
.
magisk
.
container
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.Collection
;
...
...
core/src/main/java/com/topjohnwu/core
/database/MagiskDB.java
→
app-core/src/main/java/com/topjohnwu/magisk
/database/MagiskDB.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
database
;
package
com
.
topjohnwu
.
magisk
.
database
;
import
android.content.ContentValues
;
import
android.content.ContentValues
;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.pm.PackageManager
;
import
android.content.pm.PackageManager
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
com.topjohnwu.
core.Const
;
import
com.topjohnwu.
magisk.Config
;
import
com.topjohnwu.
core.Config
;
import
com.topjohnwu.
magisk.Const
;
import
com.topjohnwu.
core
.container.Policy
;
import
com.topjohnwu.
magisk
.container.Policy
;
import
com.topjohnwu.
core
.container.SuLogEntry
;
import
com.topjohnwu.
magisk
.container.SuLogEntry
;
import
com.topjohnwu.
core
.utils.LocaleManager
;
import
com.topjohnwu.
magisk
.utils.LocaleManager
;
import
com.topjohnwu.
core
.utils.Utils
;
import
com.topjohnwu.
magisk
.utils.Utils
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
java.text.DateFormat
;
import
java.text.DateFormat
;
...
...
core/src/main/java/com/topjohnwu/core
/database/RepoDatabaseHelper.java
→
app-core/src/main/java/com/topjohnwu/magisk
/database/RepoDatabaseHelper.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
database
;
package
com
.
topjohnwu
.
magisk
.
database
;
import
android.content.Context
;
import
android.content.Context
;
import
android.database.Cursor
;
import
android.database.Cursor
;
import
android.database.sqlite.SQLiteDatabase
;
import
android.database.sqlite.SQLiteDatabase
;
import
android.database.sqlite.SQLiteOpenHelper
;
import
android.database.sqlite.SQLiteOpenHelper
;
import
com.topjohnwu.
core
.App
;
import
com.topjohnwu.
magisk
.App
;
import
com.topjohnwu.
core.Const
;
import
com.topjohnwu.
magisk.Config
;
import
com.topjohnwu.
core.Config
;
import
com.topjohnwu.
magisk.Const
;
import
com.topjohnwu.
core
.container.Repo
;
import
com.topjohnwu.
magisk
.container.Repo
;
import
java.util.HashSet
;
import
java.util.HashSet
;
import
java.util.Set
;
import
java.util.Set
;
...
...
core/src/main/java/com/topjohnwu/core
/tasks/CheckUpdates.java
→
app-core/src/main/java/com/topjohnwu/magisk
/tasks/CheckUpdates.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
tasks
;
package
com
.
topjohnwu
.
magisk
.
tasks
;
import
com.topjohnwu.
core.Const
;
import
com.topjohnwu.
magisk.Config
;
import
com.topjohnwu.
core.Config
;
import
com.topjohnwu.
magisk.Const
;
import
com.topjohnwu.
core
.utils.Topic
;
import
com.topjohnwu.
magisk
.utils.Topic
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Request
;
import
com.topjohnwu.net.Request
;
import
com.topjohnwu.net.ResponseListener
;
import
com.topjohnwu.net.ResponseListener
;
...
...
core/src/main/java/com/topjohnwu/core
/tasks/FlashZip.java
→
app-core/src/main/java/com/topjohnwu/magisk
/tasks/FlashZip.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
tasks
;
package
com
.
topjohnwu
.
magisk
.
tasks
;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.os.AsyncTask
;
import
android.os.AsyncTask
;
import
com.topjohnwu.
core
.App
;
import
com.topjohnwu.
magisk
.App
;
import
com.topjohnwu.
core
.Const
;
import
com.topjohnwu.
magisk
.Const
;
import
com.topjohnwu.
core
.utils.Utils
;
import
com.topjohnwu.
magisk
.utils.Utils
;
import
com.topjohnwu.
core
.utils.ZipUtils
;
import
com.topjohnwu.
magisk
.utils.ZipUtils
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.ShellUtils
;
...
...
core/src/main/java/com/topjohnwu/core
/tasks/MagiskInstaller.java
→
app-core/src/main/java/com/topjohnwu/magisk
/tasks/MagiskInstaller.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
tasks
;
package
com
.
topjohnwu
.
magisk
.
tasks
;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.os.AsyncTask
;
import
android.os.AsyncTask
;
import
android.os.Build
;
import
android.os.Build
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
com.topjohnwu.
core
.App
;
import
com.topjohnwu.
magisk
.App
;
import
com.topjohnwu.
core.Const
;
import
com.topjohnwu.
magisk.Config
;
import
com.topjohnwu.
core.Config
;
import
com.topjohnwu.
magisk.Const
;
import
com.topjohnwu.
core.R
;
import
com.topjohnwu.
magisk.container.TarEntry
;
import
com.topjohnwu.
core.container.TarEntry
;
import
com.topjohnwu.
magisk.core.R
;
import
com.topjohnwu.
core
.utils.Utils
;
import
com.topjohnwu.
magisk
.utils.Utils
;
import
com.topjohnwu.net.DownloadProgressListener
;
import
com.topjohnwu.net.DownloadProgressListener
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.signing.SignBoot
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.internal.NOPList
;
import
com.topjohnwu.superuser.internal.NOPList
;
import
com.topjohnwu.superuser.io.SuFile
;
import
com.topjohnwu.superuser.io.SuFile
;
import
com.topjohnwu.superuser.io.SuFileInputStream
;
import
com.topjohnwu.superuser.io.SuFileInputStream
;
import
com.topjohnwu.superuser.io.SuFileOutputStream
;
import
com.topjohnwu.superuser.io.SuFileOutputStream
;
import
com.topjohnwu.utils.SignBoot
;
import
org.kamranzafar.jtar.TarInputStream
;
import
org.kamranzafar.jtar.TarInputStream
;
import
org.kamranzafar.jtar.TarOutputStream
;
import
org.kamranzafar.jtar.TarOutputStream
;
...
...
core/src/main/java/com/topjohnwu/core
/tasks/SafetyNet.java
→
app-core/src/main/java/com/topjohnwu/magisk
/tasks/SafetyNet.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
tasks
;
package
com
.
topjohnwu
.
magisk
.
tasks
;
import
android.app.Activity
;
import
android.app.Activity
;
import
com.topjohnwu.
core
.App
;
import
com.topjohnwu.
magisk
.App
;
import
com.topjohnwu.
core
.Const
;
import
com.topjohnwu.
magisk
.Const
;
import
com.topjohnwu.
core
.utils.ISafetyNetHelper
;
import
com.topjohnwu.
magisk
.utils.ISafetyNetHelper
;
import
com.topjohnwu.
core
.utils.Topic
;
import
com.topjohnwu.
magisk
.utils.Topic
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
...
...
core/src/main/java/com/topjohnwu/core
/tasks/UpdateRepos.java
→
app-core/src/main/java/com/topjohnwu/magisk
/tasks/UpdateRepos.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
tasks
;
package
com
.
topjohnwu
.
magisk
.
tasks
;
import
android.database.Cursor
;
import
android.database.Cursor
;
import
android.os.AsyncTask
;
import
android.os.AsyncTask
;
import
com.topjohnwu.
core
.App
;
import
com.topjohnwu.
magisk
.App
;
import
com.topjohnwu.
core.Const
;
import
com.topjohnwu.
magisk.Config
;
import
com.topjohnwu.
core.Config
;
import
com.topjohnwu.
magisk.Const
;
import
com.topjohnwu.
core
.container.Repo
;
import
com.topjohnwu.
magisk
.container.Repo
;
import
com.topjohnwu.
core
.utils.Logger
;
import
com.topjohnwu.
magisk
.utils.Logger
;
import
com.topjohnwu.
core
.utils.Topic
;
import
com.topjohnwu.
magisk
.utils.Topic
;
import
com.topjohnwu.
core
.utils.Utils
;
import
com.topjohnwu.
magisk
.utils.Utils
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Request
;
import
com.topjohnwu.net.Request
;
...
...
core/src/main/java/com/topjohnwu/core
/utils/ISafetyNetHelper.java
→
app-core/src/main/java/com/topjohnwu/magisk
/utils/ISafetyNetHelper.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
utils
;
package
com
.
topjohnwu
.
magisk
.
utils
;
public
interface
ISafetyNetHelper
{
public
interface
ISafetyNetHelper
{
...
...
core/src/main/java/com/topjohnwu/core
/utils/LocaleManager.java
→
app-core/src/main/java/com/topjohnwu/magisk
/utils/LocaleManager.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
utils
;
package
com
.
topjohnwu
.
magisk
.
utils
;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.res.Configuration
;
import
android.content.res.Configuration
;
import
android.content.res.Resources
;
import
android.content.res.Resources
;
import
android.os.Build
;
import
android.os.Build
;
import
com.topjohnwu.
core
.App
;
import
com.topjohnwu.
magisk
.App
;
import
com.topjohnwu.
core
.Config
;
import
com.topjohnwu.
magisk
.Config
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
...
...
core/src/main/java/com/topjohnwu/core
/utils/Logger.java
→
app-core/src/main/java/com/topjohnwu/magisk
/utils/Logger.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
utils
;
package
com
.
topjohnwu
.
magisk
.
utils
;
import
android.util.Log
;
import
android.util.Log
;
import
com.topjohnwu.
core.BuildConfig
;
import
com.topjohnwu.
magisk.Const
;
import
com.topjohnwu.
core.Const
;
import
com.topjohnwu.
magisk.core.BuildConfig
;
public
class
Logger
{
public
class
Logger
{
...
...
core/src/main/java/com/topjohnwu/core
/utils/RootUtils.java
→
app-core/src/main/java/com/topjohnwu/magisk
/utils/RootUtils.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
utils
;
package
com
.
topjohnwu
.
magisk
.
utils
;
import
android.content.Context
;
import
android.content.Context
;
import
com.topjohnwu.
core.Const
;
import
com.topjohnwu.
magisk.Config
;
import
com.topjohnwu.
core.Config
;
import
com.topjohnwu.
magisk.Const
;
import
com.topjohnwu.core.R
;
import
com.topjohnwu.
magisk.
core.R
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.io.SuFile
;
import
com.topjohnwu.superuser.io.SuFile
;
...
...
core/src/main/java/com/topjohnwu/core
/utils/Topic.java
→
app-core/src/main/java/com/topjohnwu/magisk
/utils/Topic.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
utils
;
package
com
.
topjohnwu
.
magisk
.
utils
;
import
com.topjohnwu.
core
.App
;
import
com.topjohnwu.
magisk
.App
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.RetentionPolicy
;
import
java.lang.annotation.RetentionPolicy
;
...
...
core/src/main/java/com/topjohnwu/core
/utils/Utils.java
→
app-core/src/main/java/com/topjohnwu/magisk
/utils/Utils.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
utils
;
package
com
.
topjohnwu
.
magisk
.
utils
;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.SharedPreferences
;
import
android.content.SharedPreferences
;
...
@@ -13,11 +13,11 @@ import android.os.Build;
...
@@ -13,11 +13,11 @@ import android.os.Build;
import
android.provider.OpenableColumns
;
import
android.provider.OpenableColumns
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.topjohnwu.
core
.App
;
import
com.topjohnwu.
magisk
.App
;
import
com.topjohnwu.
core.Const
;
import
com.topjohnwu.
magisk.Config
;
import
com.topjohnwu.
core.Config
;
import
com.topjohnwu.
magisk.Const
;
import
com.topjohnwu.
core
.container.Module
;
import
com.topjohnwu.
magisk
.container.Module
;
import
com.topjohnwu.
core
.container.ValueSortedMap
;
import
com.topjohnwu.
magisk
.container.ValueSortedMap
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.io.SuFile
;
import
com.topjohnwu.superuser.io.SuFile
;
...
...
core/src/main/java/com/topjohnwu/core
/utils/ZipUtils.java
→
app-core/src/main/java/com/topjohnwu/magisk
/utils/ZipUtils.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
utils
;
package
com
.
topjohnwu
.
magisk
.
utils
;
import
com.topjohnwu.signing.JarMap
;
import
com.topjohnwu.signing.SignAPK
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.io.SuFile
;
import
com.topjohnwu.superuser.io.SuFile
;
import
com.topjohnwu.superuser.io.SuFileOutputStream
;
import
com.topjohnwu.superuser.io.SuFileOutputStream
;
import
com.topjohnwu.utils.JarMap
;
import
com.topjohnwu.utils.SignAPK
;
import
java.io.BufferedInputStream
;
import
java.io.BufferedInputStream
;
import
java.io.BufferedOutputStream
;
import
java.io.BufferedOutputStream
;
...
...
core/src/main/res/raw/bootctl
→
app-
core/src/main/res/raw/bootctl
View file @
60f69fea
File moved
core/src/main/res/raw/nonroot_utils.sh
→
app-
core/src/main/res/raw/nonroot_utils.sh
View file @
60f69fea
File moved
core/src/main/res/raw/utils.sh
→
app-
core/src/main/res/raw/utils.sh
View file @
60f69fea
File moved
app/build.gradle
View file @
60f69fea
...
@@ -6,7 +6,7 @@ configProps.load(new FileInputStream(configPath))
...
@@ -6,7 +6,7 @@ configProps.load(new FileInputStream(configPath))
android
{
android
{
defaultConfig
{
defaultConfig
{
applicationId
"com.topjohnwu.magisk"
applicationId
'com.topjohnwu.magisk'
vectorDrawables
.
useSupportLibrary
=
true
vectorDrawables
.
useSupportLibrary
=
true
}
}
...
@@ -33,7 +33,7 @@ android {
...
@@ -33,7 +33,7 @@ android {
}
}
}
}
flavorDimensions
"mode"
flavorDimensions
'mode'
productFlavors
{
productFlavors
{
full
{
full
{
...
@@ -47,7 +47,7 @@ android {
...
@@ -47,7 +47,7 @@ android {
}
}
stub
{
stub
{
versionCode
1
versionCode
1
versionName
"stub"
versionName
'stub'
}
}
}
}
...
@@ -59,7 +59,7 @@ android {
...
@@ -59,7 +59,7 @@ android {
dependencies
{
dependencies
{
implementation
fileTree
(
include:
[
'*.jar'
],
dir:
'libs'
)
implementation
fileTree
(
include:
[
'*.jar'
],
dir:
'libs'
)
implementation
project
(
':net'
)
implementation
project
(
':net'
)
fullImplementation
project
(
':core'
)
fullImplementation
project
(
':
app-
core'
)
fullImplementation
'ru.noties:markwon:2.0.1'
fullImplementation
'ru.noties:markwon:2.0.1'
fullImplementation
'com.caverock:androidsvg-aar:1.3'
fullImplementation
'com.caverock:androidsvg-aar:1.3'
...
...
app/proguard-rules.pro
View file @
60f69fea
...
@@ -23,14 +23,16 @@
...
@@ -23,14 +23,16 @@
-
dontwarn
javax
.
naming
.
**
-
dontwarn
javax
.
naming
.
**
# Snet extention
# Snet extention
-
keepclassmembers
class
com
.
topjohnwu
.
core
.
utils
.
ISafetyNetHelper
{
*
;
}
-
keepclassmembers
class
com
.
topjohnwu
.
magisk
.
utils
.
ISafetyNetHelper
{
*
;
}
-
keepclassmembers
class
com
.
topjohnwu
.
core
.
utils
.
BootSigner
{
*
;
}
# BootSigner
-
keepclassmembers
class
com
.
topjohnwu
.
signer
.
BootSigner
{
*
;
}
# SVG
# SVG
-
dontwarn
com
.
caverock
.
androidsvg
.
SVGAndroidRenderer
-
dontwarn
com
.
caverock
.
androidsvg
.
SVGAndroidRenderer
# Strip logging
# Strip logging
-
assumenosideeffects
class
com
.
topjohnwu
.
core
.
utils
.
Logger
{
-
assumenosideeffects
class
com
.
topjohnwu
.
magisk
.
utils
.
Logger
{
public
***
debug
(...);
public
***
debug
(...);
}
}
...
...
app/src/full/java/a/a.java
View file @
60f69fea
package
a
;
package
a
;
import
com.topjohnwu.core.utils.BootSigner
;
import
com.topjohnwu.magisk.utils.PatchAPK
;
import
com.topjohnwu.magisk.utils.PatchAPK
;
import
com.topjohnwu.signing.BootSigner
;
import
androidx.annotation.Keep
;
import
androidx.annotation.Keep
;
...
...
app/src/full/java/a/e.java
View file @
60f69fea
package
a
;
package
a
;
import
com.topjohnwu.
core
.App
;
import
com.topjohnwu.
magisk
.App
;
public
class
e
extends
App
{
public
class
e
extends
App
{
/* stub */
/* stub */
...
...
app/src/full/java/com/topjohnwu/magisk/AboutActivity.java
View file @
60f69fea
...
@@ -5,7 +5,6 @@ import android.os.Bundle;
...
@@ -5,7 +5,6 @@ import android.os.Bundle;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.view.View
;
import
android.view.View
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.magisk.components.AboutCardRow
;
import
com.topjohnwu.magisk.components.AboutCardRow
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.components.MarkDownWindow
;
import
com.topjohnwu.magisk.components.MarkDownWindow
;
...
...
app/src/full/java/com/topjohnwu/magisk/ClassMap.java
View file @
60f69fea
package
com
.
topjohnwu
.
magisk
;
package
com
.
topjohnwu
.
magisk
;
import
com.topjohnwu.core.App
;
import
com.topjohnwu.magisk.components.AboutCardRow
;
import
com.topjohnwu.magisk.components.AboutCardRow
;
import
com.topjohnwu.magisk.receivers.GeneralReceiver
;
import
com.topjohnwu.magisk.receivers.GeneralReceiver
;
import
com.topjohnwu.magisk.receivers.ShortcutReceiver
;
import
com.topjohnwu.magisk.receivers.ShortcutReceiver
;
...
...
app/src/full/java/com/topjohnwu/magisk/FlashActivity.java
View file @
60f69fea
...
@@ -8,13 +8,11 @@ import android.widget.Button;
...
@@ -8,13 +8,11 @@ import android.widget.Button;
import
android.widget.LinearLayout
;
import
android.widget.LinearLayout
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.topjohnwu.core.App
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.core.tasks.FlashZip
;
import
com.topjohnwu.core.tasks.MagiskInstaller
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.adapters.StringListAdapter
;
import
com.topjohnwu.magisk.adapters.StringListAdapter
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.tasks.FlashZip
;
import
com.topjohnwu.magisk.tasks.MagiskInstaller
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.superuser.CallbackList
;
import
com.topjohnwu.superuser.CallbackList
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
...
...
app/src/full/java/com/topjohnwu/magisk/MainActivity.java
View file @
60f69fea
...
@@ -9,10 +9,6 @@ import android.view.MenuItem;
...
@@ -9,10 +9,6 @@ import android.view.MenuItem;
import
android.view.View
;
import
android.view.View
;
import
com.google.android.material.navigation.NavigationView
;
import
com.google.android.material.navigation.NavigationView
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.core.utils.Topic
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.fragments.LogFragment
;
import
com.topjohnwu.magisk.fragments.LogFragment
;
import
com.topjohnwu.magisk.fragments.MagiskFragment
;
import
com.topjohnwu.magisk.fragments.MagiskFragment
;
...
@@ -21,6 +17,8 @@ import com.topjohnwu.magisk.fragments.ModulesFragment;
...
@@ -21,6 +17,8 @@ import com.topjohnwu.magisk.fragments.ModulesFragment;
import
com.topjohnwu.magisk.fragments.ReposFragment
;
import
com.topjohnwu.magisk.fragments.ReposFragment
;
import
com.topjohnwu.magisk.fragments.SettingsFragment
;
import
com.topjohnwu.magisk.fragments.SettingsFragment
;
import
com.topjohnwu.magisk.fragments.SuperuserFragment
;
import
com.topjohnwu.magisk.fragments.SuperuserFragment
;
import
com.topjohnwu.magisk.utils.Topic
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
...
...
app/src/full/java/com/topjohnwu/magisk/SplashActivity.java
View file @
60f69fea
...
@@ -5,16 +5,14 @@ import android.content.pm.PackageManager;
...
@@ -5,16 +5,14 @@ import android.content.pm.PackageManager;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.core.tasks.CheckUpdates
;
import
com.topjohnwu.core.tasks.UpdateRepos
;
import
com.topjohnwu.core.utils.LocaleManager
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.components.Notifications
;
import
com.topjohnwu.magisk.components.Notifications
;
import
com.topjohnwu.magisk.receivers.ShortcutReceiver
;
import
com.topjohnwu.magisk.receivers.ShortcutReceiver
;
import
com.topjohnwu.magisk.tasks.CheckUpdates
;
import
com.topjohnwu.magisk.tasks.UpdateRepos
;
import
com.topjohnwu.magisk.utils.AppUtils
;
import
com.topjohnwu.magisk.utils.AppUtils
;
import
com.topjohnwu.magisk.utils.LocaleManager
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
...
...
app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java
View file @
60f69fea
...
@@ -16,9 +16,8 @@ import android.widget.LinearLayout;
...
@@ -16,9 +16,8 @@ import android.widget.LinearLayout;
import
android.widget.Spinner
;
import
android.widget.Spinner
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.core.container.Policy
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.container.Policy
;
import
com.topjohnwu.magisk.utils.FingerprintHelper
;
import
com.topjohnwu.magisk.utils.FingerprintHelper
;
import
com.topjohnwu.magisk.utils.SuConnector
;
import
com.topjohnwu.magisk.utils.SuConnector
;
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java
View file @
60f69fea
...
@@ -13,10 +13,10 @@ import android.widget.Filter;
...
@@ -13,10 +13,10 @@ import android.widget.Filter;
import
android.widget.ImageView
;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.core.utils.Topic
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Topic
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java
View file @
60f69fea
...
@@ -10,9 +10,9 @@ import android.widget.ImageView;
...
@@ -10,9 +10,9 @@ import android.widget.ImageView;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.core.container.Module
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.components.SnackbarMaker
;
import
com.topjohnwu.magisk.components.SnackbarMaker
;
import
com.topjohnwu.magisk.container.Module
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
java.util.List
;
import
java.util.List
;
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java
View file @
60f69fea
...
@@ -11,12 +11,12 @@ import android.widget.ImageView;
...
@@ -11,12 +11,12 @@ import android.widget.ImageView;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.core.container.Policy
;
import
com.topjohnwu.core.database.MagiskDB
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.components.CustomAlertDialog
;
import
com.topjohnwu.magisk.components.CustomAlertDialog
;
import
com.topjohnwu.magisk.components.ExpandableViewHolder
;
import
com.topjohnwu.magisk.components.ExpandableViewHolder
;
import
com.topjohnwu.magisk.components.SnackbarMaker
;
import
com.topjohnwu.magisk.components.SnackbarMaker
;
import
com.topjohnwu.magisk.container.Policy
;
import
com.topjohnwu.magisk.database.MagiskDB
;
import
com.topjohnwu.magisk.utils.FingerprintHelper
;
import
com.topjohnwu.magisk.utils.FingerprintHelper
;
import
java.util.List
;
import
java.util.List
;
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/ReposAdapter.java
View file @
60f69fea
...
@@ -12,14 +12,14 @@ import android.view.ViewGroup;
...
@@ -12,14 +12,14 @@ import android.view.ViewGroup;
import
android.widget.ImageView
;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.topjohnwu.core.container.Module
;
import
com.topjohnwu.core.container.Repo
;
import
com.topjohnwu.core.database.RepoDatabaseHelper
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.components.CustomAlertDialog
;
import
com.topjohnwu.magisk.components.CustomAlertDialog
;
import
com.topjohnwu.magisk.components.MarkDownWindow
;
import
com.topjohnwu.magisk.components.MarkDownWindow
;
import
com.topjohnwu.magisk.container.Module
;
import
com.topjohnwu.magisk.container.Repo
;
import
com.topjohnwu.magisk.database.RepoDatabaseHelper
;
import
com.topjohnwu.magisk.services.DownloadModuleService
;
import
com.topjohnwu.magisk.services.DownloadModuleService
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java
View file @
60f69fea
...
@@ -9,10 +9,10 @@ import android.view.animation.RotateAnimation;
...
@@ -9,10 +9,10 @@ import android.view.animation.RotateAnimation;
import
android.widget.ImageView
;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.topjohnwu.core.container.SuLogEntry
;
import
com.topjohnwu.core.database.MagiskDB
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.components.ExpandableViewHolder
;
import
com.topjohnwu.magisk.components.ExpandableViewHolder
;
import
com.topjohnwu.magisk.container.SuLogEntry
;
import
com.topjohnwu.magisk.database.MagiskDB
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.HashSet
;
import
java.util.HashSet
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/BaseActivity.java
View file @
60f69fea
...
@@ -9,12 +9,12 @@ import android.os.Bundle;
...
@@ -9,12 +9,12 @@ import android.os.Bundle;
import
android.view.WindowManager
;
import
android.view.WindowManager
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.topjohnwu.core.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.core.utils.LocaleManager
;
import
com.topjohnwu.core.utils.Topic
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.LocaleManager
;
import
com.topjohnwu.magisk.utils.Topic
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/BaseFragment.java
View file @
60f69fea
...
@@ -2,8 +2,8 @@ package com.topjohnwu.magisk.components;
...
@@ -2,8 +2,8 @@ package com.topjohnwu.magisk.components;
import
android.content.Intent
;
import
android.content.Intent
;
import
com.topjohnwu.
core
.App
;
import
com.topjohnwu.
magisk
.App
;
import
com.topjohnwu.
core
.utils.Topic
;
import
com.topjohnwu.
magisk
.utils.Topic
;
import
androidx.fragment.app.Fragment
;
import
androidx.fragment.app.Fragment
;
import
butterknife.Unbinder
;
import
butterknife.Unbinder
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/BasePreferenceFragment.java
View file @
60f69fea
...
@@ -8,9 +8,9 @@ import android.view.LayoutInflater;
...
@@ -8,9 +8,9 @@ import android.view.LayoutInflater;
import
android.view.View
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
com.topjohnwu.core.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.core.utils.Topic
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Topic
;
import
androidx.preference.Preference
;
import
androidx.preference.Preference
;
import
androidx.preference.PreferenceCategory
;
import
androidx.preference.PreferenceCategory
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/EnvFixDialog.java
View file @
60f69fea
...
@@ -4,9 +4,9 @@ import android.app.Activity;
...
@@ -4,9 +4,9 @@ import android.app.Activity;
import
android.app.ProgressDialog
;
import
android.app.ProgressDialog
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.topjohnwu.core.tasks.MagiskInstaller
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.tasks.MagiskInstaller
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.io.SuFile
;
import
com.topjohnwu.superuser.io.SuFile
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java
View file @
60f69fea
...
@@ -5,12 +5,12 @@ import android.content.Intent;
...
@@ -5,12 +5,12 @@ import android.content.Intent;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.FlashActivity
;
import
com.topjohnwu.magisk.FlashActivity
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
import
java.io.File
;
import
java.io.File
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/MagiskInstallDialog.java
View file @
60f69fea
...
@@ -3,10 +3,10 @@ package com.topjohnwu.magisk.components;
...
@@ -3,10 +3,10 @@ package com.topjohnwu.magisk.components;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.AppUtils
;
import
com.topjohnwu.magisk.utils.AppUtils
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.ShellUtils
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/ManagerInstallDialog.java
View file @
60f69fea
...
@@ -3,10 +3,10 @@ package com.topjohnwu.magisk.components;
...
@@ -3,10 +3,10 @@ package com.topjohnwu.magisk.components;
import
android.app.Activity
;
import
android.app.Activity
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.DownloadApp
;
import
com.topjohnwu.magisk.utils.DownloadApp
;
import
com.topjohnwu.magisk.utils.Utils
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/MarkDownWindow.java
View file @
60f69fea
...
@@ -11,13 +11,13 @@ import android.view.View;
...
@@ -11,13 +11,13 @@ import android.view.View;
import
com.caverock.androidsvg.SVG
;
import
com.caverock.androidsvg.SVG
;
import
com.caverock.androidsvg.SVGParseException
;
import
com.caverock.androidsvg.SVGParseException
;
import
com.topjohnwu.core.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.ResponseListener
;
import
com.topjohnwu.net.ResponseListener
;
import
com.topjohnwu.signing.ByteArrayStream
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.utils.ByteArrayStream
;
import
java.io.ByteArrayOutputStream
;
import
java.io.ByteArrayOutputStream
;
import
java.io.IOException
;
import
java.io.IOException
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/Notifications.java
View file @
60f69fea
...
@@ -7,14 +7,14 @@ import android.content.Context;
...
@@ -7,14 +7,14 @@ import android.content.Context;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.os.Build
;
import
android.os.Build
;
import
com.topjohnwu.core.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.SplashActivity
;
import
com.topjohnwu.magisk.SplashActivity
;
import
com.topjohnwu.magisk.receivers.GeneralReceiver
;
import
com.topjohnwu.magisk.receivers.GeneralReceiver
;
import
com.topjohnwu.magisk.utils.Utils
;
import
androidx.core.app.NotificationCompat
;
import
androidx.core.app.NotificationCompat
;
import
androidx.core.app.NotificationManagerCompat
;
import
androidx.core.app.NotificationManagerCompat
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/ProgressNotification.java
View file @
60f69fea
...
@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.components;
...
@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.components;
import
android.app.Notification
;
import
android.app.Notification
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.topjohnwu.core.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.net.DownloadProgressListener
;
import
com.topjohnwu.net.DownloadProgressListener
;
import
androidx.core.app.NotificationCompat
;
import
androidx.core.app.NotificationCompat
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/SnackbarMaker.java
View file @
60f69fea
...
@@ -6,8 +6,8 @@ import android.view.View;
...
@@ -6,8 +6,8 @@ import android.view.View;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Utils
;
import
androidx.annotation.StringRes
;
import
androidx.annotation.StringRes
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/UninstallDialog.java
View file @
60f69fea
...
@@ -7,12 +7,12 @@ import android.net.Uri;
...
@@ -7,12 +7,12 @@ import android.net.Uri;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.FlashActivity
;
import
com.topjohnwu.magisk.FlashActivity
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/MagiskFragment.java
View file @
60f69fea
...
@@ -12,12 +12,8 @@ import android.widget.LinearLayout;
...
@@ -12,12 +12,8 @@ import android.widget.LinearLayout;
import
android.widget.ProgressBar
;
import
android.widget.ProgressBar
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.core.tasks.CheckUpdates
;
import
com.topjohnwu.core.tasks.SafetyNet
;
import
com.topjohnwu.core.utils.ISafetyNetHelper
;
import
com.topjohnwu.core.utils.Topic
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.MainActivity
;
import
com.topjohnwu.magisk.MainActivity
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.components.BaseActivity
;
...
@@ -29,6 +25,10 @@ import com.topjohnwu.magisk.components.MagiskInstallDialog;
...
@@ -29,6 +25,10 @@ import com.topjohnwu.magisk.components.MagiskInstallDialog;
import
com.topjohnwu.magisk.components.ManagerInstallDialog
;
import
com.topjohnwu.magisk.components.ManagerInstallDialog
;
import
com.topjohnwu.magisk.components.UninstallDialog
;
import
com.topjohnwu.magisk.components.UninstallDialog
;
import
com.topjohnwu.magisk.components.UpdateCardHolder
;
import
com.topjohnwu.magisk.components.UpdateCardHolder
;
import
com.topjohnwu.magisk.tasks.CheckUpdates
;
import
com.topjohnwu.magisk.tasks.SafetyNet
;
import
com.topjohnwu.magisk.utils.ISafetyNetHelper
;
import
com.topjohnwu.magisk.utils.Topic
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.ShellUtils
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/MagiskHideFragment.java
View file @
60f69fea
...
@@ -8,10 +8,10 @@ import android.view.View;
...
@@ -8,10 +8,10 @@ import android.view.View;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
android.widget.SearchView
;
import
android.widget.SearchView
;
import
com.topjohnwu.core.utils.Topic
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.adapters.ApplicationAdapter
;
import
com.topjohnwu.magisk.adapters.ApplicationAdapter
;
import
com.topjohnwu.magisk.components.BaseFragment
;
import
com.topjohnwu.magisk.components.BaseFragment
;
import
com.topjohnwu.magisk.utils.Topic
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/MagiskLogFragment.java
View file @
60f69fea
...
@@ -10,12 +10,12 @@ import android.view.View;
...
@@ -10,12 +10,12 @@ import android.view.View;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.adapters.StringListAdapter
;
import
com.topjohnwu.magisk.adapters.StringListAdapter
;
import
com.topjohnwu.magisk.components.BaseFragment
;
import
com.topjohnwu.magisk.components.BaseFragment
;
import
com.topjohnwu.magisk.components.SnackbarMaker
;
import
com.topjohnwu.magisk.components.SnackbarMaker
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.internal.NOPList
;
import
com.topjohnwu.superuser.internal.NOPList
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/ModulesFragment.java
View file @
60f69fea
...
@@ -12,15 +12,15 @@ import android.view.View;
...
@@ -12,15 +12,15 @@ import android.view.View;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.core.container.Module
;
import
com.topjohnwu.core.utils.Topic
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.FlashActivity
;
import
com.topjohnwu.magisk.FlashActivity
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.adapters.ModulesAdapter
;
import
com.topjohnwu.magisk.adapters.ModulesAdapter
;
import
com.topjohnwu.magisk.components.BaseFragment
;
import
com.topjohnwu.magisk.components.BaseFragment
;
import
com.topjohnwu.magisk.container.Module
;
import
com.topjohnwu.magisk.utils.Topic
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/ReposFragment.java
View file @
60f69fea
...
@@ -11,13 +11,13 @@ import android.view.ViewGroup;
...
@@ -11,13 +11,13 @@ import android.view.ViewGroup;
import
android.widget.SearchView
;
import
android.widget.SearchView
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.core.container.Module
;
import
com.topjohnwu.core.tasks.UpdateRepos
;
import
com.topjohnwu.core.utils.Topic
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.adapters.ReposAdapter
;
import
com.topjohnwu.magisk.adapters.ReposAdapter
;
import
com.topjohnwu.magisk.components.BaseFragment
;
import
com.topjohnwu.magisk.components.BaseFragment
;
import
com.topjohnwu.magisk.container.Module
;
import
com.topjohnwu.magisk.tasks.UpdateRepos
;
import
com.topjohnwu.magisk.utils.Topic
;
import
java.util.Map
;
import
java.util.Map
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
View file @
60f69fea
...
@@ -8,19 +8,19 @@ import android.view.View;
...
@@ -8,19 +8,19 @@ import android.view.View;
import
android.widget.EditText
;
import
android.widget.EditText
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.core.tasks.CheckUpdates
;
import
com.topjohnwu.core.utils.LocaleManager
;
import
com.topjohnwu.core.utils.Topic
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.components.BasePreferenceFragment
;
import
com.topjohnwu.magisk.components.BasePreferenceFragment
;
import
com.topjohnwu.magisk.tasks.CheckUpdates
;
import
com.topjohnwu.magisk.utils.AppUtils
;
import
com.topjohnwu.magisk.utils.AppUtils
;
import
com.topjohnwu.magisk.utils.DownloadApp
;
import
com.topjohnwu.magisk.utils.DownloadApp
;
import
com.topjohnwu.magisk.utils.FingerprintHelper
;
import
com.topjohnwu.magisk.utils.FingerprintHelper
;
import
com.topjohnwu.magisk.utils.LocaleManager
;
import
com.topjohnwu.magisk.utils.PatchAPK
;
import
com.topjohnwu.magisk.utils.PatchAPK
;
import
com.topjohnwu.magisk.utils.Topic
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/SuperuserFragment.java
View file @
60f69fea
...
@@ -7,10 +7,10 @@ import android.view.View;
...
@@ -7,10 +7,10 @@ import android.view.View;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.topjohnwu.core.container.Policy
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.adapters.PolicyAdapter
;
import
com.topjohnwu.magisk.adapters.PolicyAdapter
;
import
com.topjohnwu.magisk.components.BaseFragment
;
import
com.topjohnwu.magisk.components.BaseFragment
;
import
com.topjohnwu.magisk.container.Policy
;
import
java.util.List
;
import
java.util.List
;
...
...
app/src/full/java/com/topjohnwu/magisk/receivers/GeneralReceiver.java
View file @
60f69fea
...
@@ -5,10 +5,10 @@ import android.content.Context;
...
@@ -5,10 +5,10 @@ import android.content.Context;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.os.AsyncTask
;
import
android.os.AsyncTask
;
import
com.topjohnwu.core.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.SuRequestActivity
;
import
com.topjohnwu.magisk.SuRequestActivity
;
import
com.topjohnwu.magisk.components.Notifications
;
import
com.topjohnwu.magisk.components.Notifications
;
import
com.topjohnwu.magisk.utils.DownloadApp
;
import
com.topjohnwu.magisk.utils.DownloadApp
;
...
...
app/src/full/java/com/topjohnwu/magisk/receivers/ShortcutReceiver.java
View file @
60f69fea
...
@@ -8,13 +8,13 @@ import android.content.pm.ShortcutManager;
...
@@ -8,13 +8,13 @@ import android.content.pm.ShortcutManager;
import
android.graphics.drawable.Icon
;
import
android.graphics.drawable.Icon
;
import
android.os.Build
;
import
android.os.Build
;
import
com.topjohnwu.core.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.SplashActivity
;
import
com.topjohnwu.magisk.SplashActivity
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
...
...
app/src/full/java/com/topjohnwu/magisk/services/DelegateWorker.java
View file @
60f69fea
...
@@ -9,17 +9,13 @@ import com.google.common.util.concurrent.ListenableFuture;
...
@@ -9,17 +9,13 @@ import com.google.common.util.concurrent.ListenableFuture;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.Set
;
import
java.util.UUID
;
import
java.util.UUID
;
import
java.util.concurrent.Executor
;
import
androidx.annotation.MainThread
;
import
androidx.annotation.MainThread
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.RequiresApi
;
import
androidx.annotation.RequiresApi
;
import
androidx.annotation.RestrictTo
;
import
androidx.work.Data
;
import
androidx.work.Data
;
import
androidx.work.ListenableWorker
;
import
androidx.work.ListenableWorker
;
import
androidx.work.WorkerFactory
;
import
androidx.work.impl.utils.taskexecutor.TaskExecutor
;
public
abstract
class
DelegateWorker
{
public
abstract
class
DelegateWorker
{
...
...
app/src/full/java/com/topjohnwu/magisk/services/DownloadModuleService.java
View file @
60f69fea
...
@@ -6,13 +6,13 @@ import android.net.Uri;
...
@@ -6,13 +6,13 @@ import android.net.Uri;
import
android.os.IBinder
;
import
android.os.IBinder
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.core.container.Repo
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.FlashActivity
;
import
com.topjohnwu.magisk.FlashActivity
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.components.ProgressNotification
;
import
com.topjohnwu.magisk.components.ProgressNotification
;
import
com.topjohnwu.magisk.container.Repo
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.ShellUtils
;
...
...
app/src/full/java/com/topjohnwu/magisk/services/UpdateCheckService.java
View file @
60f69fea
package
com
.
topjohnwu
.
magisk
.
services
;
package
com
.
topjohnwu
.
magisk
.
services
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.core.tasks.CheckUpdates
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.components.Notifications
;
import
com.topjohnwu.magisk.components.Notifications
;
import
com.topjohnwu.magisk.tasks.CheckUpdates
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
...
...
app/src/full/java/com/topjohnwu/magisk/utils/AppUtils.java
View file @
60f69fea
...
@@ -5,10 +5,9 @@ import android.content.Intent;
...
@@ -5,10 +5,9 @@ import android.content.Intent;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.services.UpdateCheckService
;
import
com.topjohnwu.magisk.services.UpdateCheckService
;
...
...
app/src/full/java/com/topjohnwu/magisk/utils/DownloadApp.java
View file @
60f69fea
...
@@ -2,11 +2,9 @@ package com.topjohnwu.magisk.utils;
...
@@ -2,11 +2,9 @@ package com.topjohnwu.magisk.utils;
import
android.os.AsyncTask
;
import
android.os.AsyncTask
;
import
com.topjohnwu.core.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.core.utils.RootUtils
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.components.ProgressNotification
;
import
com.topjohnwu.magisk.components.ProgressNotification
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
...
...
app/src/full/java/com/topjohnwu/magisk/utils/FingerprintHelper.java
View file @
60f69fea
...
@@ -16,10 +16,9 @@ import android.security.keystore.KeyProperties;
...
@@ -16,10 +16,9 @@ import android.security.keystore.KeyProperties;
import
android.view.Gravity
;
import
android.view.Gravity
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.topjohnwu.core.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.components.CustomAlertDialog
;
import
com.topjohnwu.magisk.components.CustomAlertDialog
;
...
...
app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java
View file @
60f69fea
...
@@ -3,17 +3,15 @@ package com.topjohnwu.magisk.utils;
...
@@ -3,17 +3,15 @@ package com.topjohnwu.magisk.utils;
import
android.os.AsyncTask
;
import
android.os.AsyncTask
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.topjohnwu.core.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.core.Const
;
import
com.topjohnwu.core.utils.RootUtils
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.components.Notifications
;
import
com.topjohnwu.magisk.components.Notifications
;
import
com.topjohnwu.signing.JarMap
;
import
com.topjohnwu.signing.SignAPK
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.utils.JarMap
;
import
com.topjohnwu.utils.SignAPK
;
import
java.io.BufferedOutputStream
;
import
java.io.BufferedOutputStream
;
import
java.io.File
;
import
java.io.File
;
...
...
app/src/full/java/com/topjohnwu/magisk/utils/SuConnector.java
View file @
60f69fea
...
@@ -9,12 +9,11 @@ import android.os.Process;
...
@@ -9,12 +9,11 @@ import android.os.Process;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.topjohnwu.core.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.core.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.core.container.Policy
;
import
com.topjohnwu.core.container.SuLogEntry
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.container.Policy
;
import
com.topjohnwu.magisk.container.SuLogEntry
;
import
java.io.BufferedInputStream
;
import
java.io.BufferedInputStream
;
import
java.io.BufferedOutputStream
;
import
java.io.BufferedOutputStream
;
...
...
build.py
View file @
60f69fea
...
@@ -89,7 +89,7 @@ def zip_with_msg(zipfile, source, target):
...
@@ -89,7 +89,7 @@ def zip_with_msg(zipfile, source, target):
def
collect_binary
():
def
collect_binary
():
for
arch
in
archs
:
for
arch
in
archs
:
mkdir_p
(
os
.
path
.
join
(
'native'
,
'out'
,
arch
))
mkdir_p
(
os
.
path
.
join
(
'native'
,
'out'
,
arch
))
for
bin
in
[
'magisk'
,
'magiskinit'
,
'magiskboot'
,
'busybox'
,
'b64xz'
]:
for
bin
in
[
'magisk'
,
'magiskinit'
,
'magiskboot'
,
'busybox'
]:
source
=
os
.
path
.
join
(
'native'
,
'libs'
,
arch
,
bin
)
source
=
os
.
path
.
join
(
'native'
,
'libs'
,
arch
,
bin
)
target
=
os
.
path
.
join
(
'native'
,
'out'
,
arch
,
bin
)
target
=
os
.
path
.
join
(
'native'
,
'out'
,
arch
,
bin
)
mv
(
source
,
target
)
mv
(
source
,
target
)
...
@@ -105,11 +105,11 @@ def xz(data):
...
@@ -105,11 +105,11 @@ def xz(data):
def
sign_zip
(
unsigned
,
output
,
release
):
def
sign_zip
(
unsigned
,
output
,
release
):
signer_name
=
'zipsigner-3.0.jar'
signer_name
=
'zipsigner-3.0.jar'
zipsigner
=
os
.
path
.
join
(
'
utils
'
,
'build'
,
'libs'
,
signer_name
)
zipsigner
=
os
.
path
.
join
(
'
signing
'
,
'build'
,
'libs'
,
signer_name
)
if
not
os
.
path
.
exists
(
zipsigner
):
if
not
os
.
path
.
exists
(
zipsigner
):
header
(
'* Building '
+
signer_name
)
header
(
'* Building '
+
signer_name
)
proc
=
execv
([
gradlew
,
'
utils
:shadowJar'
])
proc
=
execv
([
gradlew
,
'
signing
:shadowJar'
])
if
proc
.
returncode
!=
0
:
if
proc
.
returncode
!=
0
:
error
(
f
'Build {signer_name} failed!'
)
error
(
f
'Build {signer_name} failed!'
)
...
@@ -236,7 +236,7 @@ def build_apk(args, flavor):
...
@@ -236,7 +236,7 @@ def build_apk(args, flavor):
def
build_app
(
args
):
def
build_app
(
args
):
source
=
os
.
path
.
join
(
'scripts'
,
'util_functions.sh'
)
source
=
os
.
path
.
join
(
'scripts'
,
'util_functions.sh'
)
target
=
os
.
path
.
join
(
'core'
,
'src'
,
'main'
,
'res'
,
'raw'
,
'util_functions.sh'
)
target
=
os
.
path
.
join
(
'
app-
core'
,
'src'
,
'main'
,
'res'
,
'raw'
,
'util_functions.sh'
)
cp
(
source
,
target
)
cp
(
source
,
target
)
build_apk
(
args
,
'Full'
)
build_apk
(
args
,
'Full'
)
...
@@ -379,7 +379,7 @@ def cleanup(args):
...
@@ -379,7 +379,7 @@ def cleanup(args):
if
'java'
in
args
.
target
:
if
'java'
in
args
.
target
:
header
(
'* Cleaning java'
)
header
(
'* Cleaning java'
)
execv
([
gradlew
,
'app:clean'
,
'
snet:clean'
,
'utils
:clean'
])
execv
([
gradlew
,
'app:clean'
,
'
app-core:clean'
,
'snet:clean'
,
'signing
:clean'
])
def
build_all
(
args
):
def
build_all
(
args
):
vars
(
args
)[
'target'
]
=
[]
vars
(
args
)[
'target'
]
=
[]
...
...
native/src/main/AndroidManifest.xml
View file @
60f69fea
<manifest
package=
"com.topjohnwu.
core.magisk
"
/>
<manifest
package=
"com.topjohnwu.
magisk.binary
"
/>
settings.gradle
View file @
60f69fea
include
':app'
,
':
native'
,
':utils'
,
':snet'
,
':net'
,
':core
'
include
':app'
,
':
app-core'
,
':net'
,
':signing'
,
':native'
,
':snet
'
utils
/.gitignore
→
signing
/.gitignore
View file @
60f69fea
File moved
utils
/build.gradle
→
signing
/build.gradle
View file @
60f69fea
...
@@ -8,7 +8,7 @@ targetCompatibility = "1.8"
...
@@ -8,7 +8,7 @@ targetCompatibility = "1.8"
jar
{
jar
{
manifest
{
manifest
{
attributes
'Main-Class'
:
'com.topjohnwu.
utils
.ZipSigner'
attributes
'Main-Class'
:
'com.topjohnwu.
signing
.ZipSigner'
}
}
}
}
...
...
core/src/main/java/com/topjohnwu/core/utils
/BootSigner.java
→
signing/src/main/java/com/topjohnwu/signing
/BootSigner.java
View file @
60f69fea
package
com
.
topjohnwu
.
core
.
utils
;
package
com
.
topjohnwu
.
signing
;
import
com.topjohnwu.utils.SignBoot
;
import
java.io.FileInputStream
;
import
java.io.FileInputStream
;
import
java.io.InputStream
;
import
java.io.InputStream
;
...
...
utils/src/main/java/com/topjohnwu/utils
/ByteArrayStream.java
→
signing/src/main/java/com/topjohnwu/signing
/ByteArrayStream.java
View file @
60f69fea
package
com
.
topjohnwu
.
utils
;
package
com
.
topjohnwu
.
signing
;
import
java.io.ByteArrayInputStream
;
import
java.io.ByteArrayInputStream
;
import
java.io.ByteArrayOutputStream
;
import
java.io.ByteArrayOutputStream
;
...
...
utils/src/main/java/com/topjohnwu/utils
/CryptoUtils.java
→
signing/src/main/java/com/topjohnwu/signing
/CryptoUtils.java
View file @
60f69fea
package
com
.
topjohnwu
.
utils
;
package
com
.
topjohnwu
.
signing
;
import
org.bouncycastle.asn1.ASN1InputStream
;
import
org.bouncycastle.asn1.ASN1InputStream
;
import
org.bouncycastle.asn1.ASN1ObjectIdentifier
;
import
org.bouncycastle.asn1.ASN1ObjectIdentifier
;
...
...
utils/src/main/java/com/topjohnwu/utils
/JarMap.java
→
signing/src/main/java/com/topjohnwu/signing
/JarMap.java
View file @
60f69fea
package
com
.
topjohnwu
.
utils
;
package
com
.
topjohnwu
.
signing
;
import
java.io.Closeable
;
import
java.io.Closeable
;
import
java.io.File
;
import
java.io.File
;
...
...
utils/src/main/java/com/topjohnwu/utils
/SignAPK.java
→
signing/src/main/java/com/topjohnwu/signing
/SignAPK.java
View file @
60f69fea
package
com
.
topjohnwu
.
utils
;
package
com
.
topjohnwu
.
signing
;
import
org.bouncycastle.asn1.ASN1InputStream
;
import
org.bouncycastle.asn1.ASN1InputStream
;
import
org.bouncycastle.asn1.ASN1ObjectIdentifier
;
import
org.bouncycastle.asn1.ASN1ObjectIdentifier
;
...
...
utils/src/main/java/com/topjohnwu/utils
/SignBoot.java
→
signing/src/main/java/com/topjohnwu/signing
/SignBoot.java
View file @
60f69fea
package
com
.
topjohnwu
.
utils
;
package
com
.
topjohnwu
.
signing
;
import
org.bouncycastle.asn1.ASN1Encodable
;
import
org.bouncycastle.asn1.ASN1Encodable
;
import
org.bouncycastle.asn1.ASN1EncodableVector
;
import
org.bouncycastle.asn1.ASN1EncodableVector
;
...
...
utils/src/main/java/com/topjohnwu/utils
/ZipAdjust.java
→
signing/src/main/java/com/topjohnwu/signing
/ZipAdjust.java
View file @
60f69fea
package
com
.
topjohnwu
.
utils
;
package
com
.
topjohnwu
.
signing
;
import
java.io.File
;
import
java.io.File
;
import
java.io.FileOutputStream
;
import
java.io.FileOutputStream
;
...
...
utils/src/main/java/com/topjohnwu/utils
/ZipSigner.java
→
signing/src/main/java/com/topjohnwu/signing
/ZipSigner.java
View file @
60f69fea
package
com
.
topjohnwu
.
utils
;
package
com
.
topjohnwu
.
signing
;
import
java.io.FileInputStream
;
import
java.io.FileInputStream
;
import
java.io.FileOutputStream
;
import
java.io.FileOutputStream
;
...
...
utils
/src/main/resources/keys/testkey.pk8
→
signing
/src/main/resources/keys/testkey.pk8
View file @
60f69fea
File moved
utils
/src/main/resources/keys/testkey.x509.pem
→
signing
/src/main/resources/keys/testkey.x509.pem
View file @
60f69fea
File moved
snet/build.gradle
View file @
60f69fea
...
@@ -2,10 +2,10 @@ apply plugin: 'com.android.application'
...
@@ -2,10 +2,10 @@ apply plugin: 'com.android.application'
android
{
android
{
defaultConfig
{
defaultConfig
{
applicationId
"com.topjohnwu.snet"
applicationId
'com.topjohnwu.snet'
minSdkVersion
14
minSdkVersion
14
versionCode
12
versionCode
12
versionName
"snet"
versionName
'snet'
}
}
buildTypes
{
buildTypes
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment