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
32c65d8a
Commit
32c65d8a
authored
Mar 07, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade Android Studio
parent
a49328ed
Show whitespace changes
Inline
Side-by-side
Showing
50 changed files
with
157 additions
and
142 deletions
+157
-142
Const.java
app-core/src/main/java/com/topjohnwu/magisk/Const.java
+0
-2
BaseModule.java
.../main/java/com/topjohnwu/magisk/container/BaseModule.java
+2
-2
Policy.java
.../src/main/java/com/topjohnwu/magisk/container/Policy.java
+2
-2
ValueSortedMap.java
...n/java/com/topjohnwu/magisk/container/ValueSortedMap.java
+2
-2
MagiskInstaller.java
...main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java
+3
-3
LocaleManager.java
...c/main/java/com/topjohnwu/magisk/utils/LocaleManager.java
+2
-2
RootUtils.java
...e/src/main/java/com/topjohnwu/magisk/utils/RootUtils.java
+2
-2
Topic.java
app-core/src/main/java/com/topjohnwu/magisk/utils/Topic.java
+2
-2
FlashActivity.java
app/src/full/java/com/topjohnwu/magisk/FlashActivity.java
+5
-4
MainActivity.java
app/src/full/java/com/topjohnwu/magisk/MainActivity.java
+7
-6
SplashActivity.java
app/src/full/java/com/topjohnwu/magisk/SplashActivity.java
+2
-2
SuRequestActivity.java
...src/full/java/com/topjohnwu/magisk/SuRequestActivity.java
+3
-3
ModulesAdapter.java
...ll/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java
+3
-2
PolicyAdapter.java
...ull/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java
+4
-3
ReposAdapter.java
...full/java/com/topjohnwu/magisk/adapters/ReposAdapter.java
+2
-1
StringListAdapter.java
...java/com/topjohnwu/magisk/adapters/StringListAdapter.java
+2
-2
SuLogAdapter.java
...full/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java
+2
-1
TabFragmentAdapter.java
...ava/com/topjohnwu/magisk/adapters/TabFragmentAdapter.java
+3
-3
BaseActivity.java
...ll/java/com/topjohnwu/magisk/components/BaseActivity.java
+7
-7
BaseFragment.java
...ll/java/com/topjohnwu/magisk/components/BaseFragment.java
+2
-1
BasePreferenceFragment.java
...m/topjohnwu/magisk/components/BasePreferenceFragment.java
+4
-4
DelegateWorker.java
.../java/com/topjohnwu/magisk/components/DelegateWorker.java
+6
-6
DownloadModuleService.java
...om/topjohnwu/magisk/components/DownloadModuleService.java
+2
-2
UpdateCheckService.java
...a/com/topjohnwu/magisk/components/UpdateCheckService.java
+3
-3
CustomAlertDialog.java
.../java/com/topjohnwu/magisk/dialogs/CustomAlertDialog.java
+3
-2
EnvFixDialog.java
.../full/java/com/topjohnwu/magisk/dialogs/EnvFixDialog.java
+2
-2
FingerprintAuthDialog.java
...a/com/topjohnwu/magisk/dialogs/FingerprintAuthDialog.java
+3
-3
InstallMethodDialog.java
...ava/com/topjohnwu/magisk/dialogs/InstallMethodDialog.java
+2
-2
ManagerInstallDialog.java
...va/com/topjohnwu/magisk/dialogs/ManagerInstallDialog.java
+2
-2
UninstallDialog.java
...ll/java/com/topjohnwu/magisk/dialogs/UninstallDialog.java
+2
-2
LogFragment.java
...full/java/com/topjohnwu/magisk/fragments/LogFragment.java
+2
-1
MagiskFragment.java
...l/java/com/topjohnwu/magisk/fragments/MagiskFragment.java
+10
-9
MagiskHideFragment.java
...va/com/topjohnwu/magisk/fragments/MagiskHideFragment.java
+5
-4
MagiskLogFragment.java
...ava/com/topjohnwu/magisk/fragments/MagiskLogFragment.java
+4
-3
ModulesFragment.java
.../java/com/topjohnwu/magisk/fragments/ModulesFragment.java
+5
-4
ReposFragment.java
...ll/java/com/topjohnwu/magisk/fragments/ReposFragment.java
+5
-4
SettingsFragment.java
...java/com/topjohnwu/magisk/fragments/SettingsFragment.java
+7
-7
SuLogFragment.java
...ll/java/com/topjohnwu/magisk/fragments/SuLogFragment.java
+3
-2
SuperuserFragment.java
...ava/com/topjohnwu/magisk/fragments/SuperuserFragment.java
+3
-2
MarkDownWindow.java
...ava/com/topjohnwu/magisk/uicomponents/MarkDownWindow.java
+3
-2
Notifications.java
...java/com/topjohnwu/magisk/uicomponents/Notifications.java
+4
-4
ProgressNotification.java
...m/topjohnwu/magisk/uicomponents/ProgressNotification.java
+2
-2
SafetyNet.java
...ull/java/com/topjohnwu/magisk/uicomponents/SafetyNet.java
+3
-2
Shortcuts.java
...ull/java/com/topjohnwu/magisk/uicomponents/Shortcuts.java
+2
-2
SnackbarMaker.java
...java/com/topjohnwu/magisk/uicomponents/SnackbarMaker.java
+2
-2
AppUtils.java
app/src/full/java/com/topjohnwu/magisk/utils/AppUtils.java
+6
-6
PatchAPK.java
app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java
+2
-2
build.gradle
build.gradle
+1
-1
gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+2
-2
BadRequest.java
net/src/main/java/com/topjohnwu/net/BadRequest.java
+0
-1
No files found.
app-core/src/main/java/com/topjohnwu/magisk/Const.java
View file @
32c65d8a
...
@@ -4,8 +4,6 @@ import android.os.Environment;
...
@@ -4,8 +4,6 @@ import android.os.Environment;
import
android.os.Process
;
import
android.os.Process
;
import
java.io.File
;
import
java.io.File
;
import
java.util.Arrays
;
import
java.util.List
;
public
class
Const
{
public
class
Const
{
...
...
app-core/src/main/java/com/topjohnwu/magisk/container/BaseModule.java
View file @
32c65d8a
...
@@ -5,10 +5,10 @@ import android.database.Cursor;
...
@@ -5,10 +5,10 @@ import android.database.Cursor;
import
android.os.Parcel
;
import
android.os.Parcel
;
import
android.os.Parcelable
;
import
android.os.Parcelable
;
import
java.util.List
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
import
java.util.List
;
public
abstract
class
BaseModule
implements
Comparable
<
BaseModule
>,
Parcelable
{
public
abstract
class
BaseModule
implements
Comparable
<
BaseModule
>,
Parcelable
{
private
String
mId
,
mName
,
mVersion
,
mAuthor
,
mDescription
;
private
String
mId
,
mName
,
mVersion
,
mAuthor
,
mDescription
;
...
...
app-core/src/main/java/com/topjohnwu/magisk/container/Policy.java
View file @
32c65d8a
...
@@ -4,10 +4,10 @@ import android.content.ContentValues;
...
@@ -4,10 +4,10 @@ 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.magisk.utils.Utils
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
import
com.topjohnwu.magisk.utils.Utils
;
public
class
Policy
implements
Comparable
<
Policy
>{
public
class
Policy
implements
Comparable
<
Policy
>{
public
static
final
int
INTERACTIVE
=
0
;
public
static
final
int
INTERACTIVE
=
0
;
...
...
app-core/src/main/java/com/topjohnwu/magisk/container/ValueSortedMap.java
View file @
32c65d8a
package
com
.
topjohnwu
.
magisk
.
container
;
package
com
.
topjohnwu
.
magisk
.
container
;
import
androidx.annotation.NonNull
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.Collections
;
...
@@ -7,8 +9,6 @@ import java.util.HashMap;
...
@@ -7,8 +9,6 @@ import java.util.HashMap;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
androidx.annotation.NonNull
;
public
class
ValueSortedMap
<
K
,
V
extends
Comparable
<?
super
V
>>
extends
HashMap
<
K
,
V
>
{
public
class
ValueSortedMap
<
K
,
V
extends
Comparable
<?
super
V
>>
extends
HashMap
<
K
,
V
>
{
private
List
<
V
>
sorted
=
new
ArrayList
<>();
private
List
<
V
>
sorted
=
new
ArrayList
<>();
...
...
app-core/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java
View file @
32c65d8a
...
@@ -4,6 +4,9 @@ import android.net.Uri;
...
@@ -4,6 +4,9 @@ import android.net.Uri;
import
android.os.Build
;
import
android.os.Build
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
androidx.annotation.MainThread
;
import
androidx.annotation.WorkerThread
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Const
;
...
@@ -37,9 +40,6 @@ import java.util.List;
...
@@ -37,9 +40,6 @@ import java.util.List;
import
java.util.zip.ZipEntry
;
import
java.util.zip.ZipEntry
;
import
java.util.zip.ZipInputStream
;
import
java.util.zip.ZipInputStream
;
import
androidx.annotation.MainThread
;
import
androidx.annotation.WorkerThread
;
public
abstract
class
MagiskInstaller
{
public
abstract
class
MagiskInstaller
{
private
List
<
String
>
console
,
logs
;
private
List
<
String
>
console
,
logs
;
...
...
app-core/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.java
View file @
32c65d8a
...
@@ -6,6 +6,8 @@ import android.content.res.Configuration;
...
@@ -6,6 +6,8 @@ import android.content.res.Configuration;
import
android.content.res.Resources
;
import
android.content.res.Resources
;
import
android.os.Build
;
import
android.os.Build
;
import
androidx.annotation.StringRes
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
...
@@ -17,8 +19,6 @@ import java.util.HashSet;
...
@@ -17,8 +19,6 @@ import java.util.HashSet;
import
java.util.List
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Locale
;
import
androidx.annotation.StringRes
;
public
class
LocaleManager
{
public
class
LocaleManager
{
public
static
Locale
locale
=
Locale
.
getDefault
();
public
static
Locale
locale
=
Locale
.
getDefault
();
public
final
static
Locale
defaultLocale
=
Locale
.
getDefault
();
public
final
static
Locale
defaultLocale
=
Locale
.
getDefault
();
...
...
app-core/src/main/java/com/topjohnwu/magisk/utils/RootUtils.java
View file @
32c65d8a
...
@@ -2,6 +2,8 @@ package com.topjohnwu.magisk.utils;
...
@@ -2,6 +2,8 @@ package com.topjohnwu.magisk.utils;
import
android.content.Context
;
import
android.content.Context
;
import
androidx.annotation.NonNull
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.core.R
;
import
com.topjohnwu.magisk.core.R
;
...
@@ -11,8 +13,6 @@ import com.topjohnwu.superuser.io.SuFile;
...
@@ -11,8 +13,6 @@ import com.topjohnwu.superuser.io.SuFile;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
androidx.annotation.NonNull
;
public
class
RootUtils
extends
Shell
.
Initializer
{
public
class
RootUtils
extends
Shell
.
Initializer
{
public
static
void
rmAndLaunch
(
String
rm
,
String
launch
)
{
public
static
void
rmAndLaunch
(
String
rm
,
String
launch
)
{
...
...
app-core/src/main/java/com/topjohnwu/magisk/utils/Topic.java
View file @
32c65d8a
package
com
.
topjohnwu
.
magisk
.
utils
;
package
com
.
topjohnwu
.
magisk
.
utils
;
import
androidx.annotation.IntDef
;
import
com.topjohnwu.superuser.internal.UiThreadHandler
;
import
com.topjohnwu.superuser.internal.UiThreadHandler
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.Retention
;
...
@@ -7,8 +9,6 @@ import java.lang.annotation.RetentionPolicy;
...
@@ -7,8 +9,6 @@ import java.lang.annotation.RetentionPolicy;
import
java.util.HashSet
;
import
java.util.HashSet
;
import
java.util.Set
;
import
java.util.Set
;
import
androidx.annotation.IntDef
;
public
class
Topic
{
public
class
Topic
{
public
static
final
int
MAGISK_HIDE_DONE
=
0
;
public
static
final
int
MAGISK_HIDE_DONE
=
0
;
...
...
app/src/full/java/com/topjohnwu/magisk/FlashActivity.java
View file @
32c65d8a
...
@@ -8,6 +8,11 @@ import android.widget.Button;
...
@@ -8,6 +8,11 @@ import android.widget.Button;
import
android.widget.LinearLayout
;
import
android.widget.LinearLayout
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
androidx.annotation.NonNull
;
import
androidx.appcompat.app.ActionBar
;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.recyclerview.widget.RecyclerView
;
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.FlashZip
;
...
@@ -26,10 +31,6 @@ import java.util.Collections;
...
@@ -26,10 +31,6 @@ import java.util.Collections;
import
java.util.List
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Locale
;
import
androidx.annotation.NonNull
;
import
androidx.appcompat.app.ActionBar
;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindColor
;
import
butterknife.BindColor
;
import
butterknife.BindView
;
import
butterknife.BindView
;
import
butterknife.OnClick
;
import
butterknife.OnClick
;
...
...
app/src/full/java/com/topjohnwu/magisk/MainActivity.java
View file @
32c65d8a
...
@@ -8,6 +8,13 @@ import android.view.Menu;
...
@@ -8,6 +8,13 @@ import android.view.Menu;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
import
android.view.View
;
import
android.view.View
;
import
androidx.annotation.NonNull
;
import
androidx.appcompat.app.ActionBarDrawerToggle
;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.drawerlayout.widget.DrawerLayout
;
import
androidx.fragment.app.Fragment
;
import
androidx.fragment.app.FragmentTransaction
;
import
com.google.android.material.navigation.NavigationView
;
import
com.google.android.material.navigation.NavigationView
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.fragments.LogFragment
;
import
com.topjohnwu.magisk.fragments.LogFragment
;
...
@@ -22,12 +29,6 @@ import com.topjohnwu.magisk.utils.Utils;
...
@@ -22,12 +29,6 @@ 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
androidx.annotation.NonNull
;
import
androidx.appcompat.app.ActionBarDrawerToggle
;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.drawerlayout.widget.DrawerLayout
;
import
androidx.fragment.app.Fragment
;
import
androidx.fragment.app.FragmentTransaction
;
import
butterknife.BindView
;
import
butterknife.BindView
;
public
class
MainActivity
extends
BaseActivity
public
class
MainActivity
extends
BaseActivity
...
...
app/src/full/java/com/topjohnwu/magisk/SplashActivity.java
View file @
32c65d8a
...
@@ -5,6 +5,8 @@ import android.content.pm.PackageManager;
...
@@ -5,6 +5,8 @@ import android.content.pm.PackageManager;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
androidx.appcompat.app.AlertDialog
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.database.RepoDatabaseHelper
;
import
com.topjohnwu.magisk.database.RepoDatabaseHelper
;
import
com.topjohnwu.magisk.tasks.UpdateRepos
;
import
com.topjohnwu.magisk.tasks.UpdateRepos
;
...
@@ -16,8 +18,6 @@ import com.topjohnwu.magisk.utils.Utils;
...
@@ -16,8 +18,6 @@ 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
androidx.appcompat.app.AlertDialog
;
public
class
SplashActivity
extends
BaseActivity
{
public
class
SplashActivity
extends
BaseActivity
{
@Override
@Override
...
...
app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java
View file @
32c65d8a
...
@@ -4,7 +4,6 @@ import android.content.Intent;
...
@@ -4,7 +4,6 @@ import android.content.Intent;
import
android.content.SharedPreferences
;
import
android.content.SharedPreferences
;
import
android.content.pm.PackageManager
;
import
android.content.pm.PackageManager
;
import
android.hardware.fingerprint.FingerprintManager
;
import
android.hardware.fingerprint.FingerprintManager
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.os.CountDownTimer
;
import
android.os.CountDownTimer
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
...
@@ -17,6 +16,9 @@ import android.widget.LinearLayout;
...
@@ -17,6 +16,9 @@ import android.widget.LinearLayout;
import
android.widget.Spinner
;
import
android.widget.Spinner
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
androidx.annotation.Nullable
;
import
androidx.appcompat.content.res.AppCompatResources
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.container.Policy
;
import
com.topjohnwu.magisk.container.Policy
;
import
com.topjohnwu.magisk.utils.FingerprintHelper
;
import
com.topjohnwu.magisk.utils.FingerprintHelper
;
...
@@ -25,8 +27,6 @@ import com.topjohnwu.magisk.utils.Utils;
...
@@ -25,8 +27,6 @@ import com.topjohnwu.magisk.utils.Utils;
import
java.io.IOException
;
import
java.io.IOException
;
import
androidx.annotation.Nullable
;
import
androidx.appcompat.content.res.AppCompatResources
;
import
butterknife.BindView
;
import
butterknife.BindView
;
public
class
SuRequestActivity
extends
BaseActivity
{
public
class
SuRequestActivity
extends
BaseActivity
{
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java
View file @
32c65d8a
...
@@ -9,6 +9,9 @@ import android.widget.CheckBox;
...
@@ -9,6 +9,9 @@ import android.widget.CheckBox;
import
android.widget.ImageView
;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
androidx.annotation.NonNull
;
import
androidx.recyclerview.widget.RecyclerView
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.container.Module
;
import
com.topjohnwu.magisk.container.Module
;
...
@@ -17,8 +20,6 @@ import com.topjohnwu.superuser.Shell;
...
@@ -17,8 +20,6 @@ import com.topjohnwu.superuser.Shell;
import
java.util.List
;
import
java.util.List
;
import
androidx.annotation.NonNull
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.BindView
;
public
class
ModulesAdapter
extends
RecyclerView
.
Adapter
<
ModulesAdapter
.
ViewHolder
>
{
public
class
ModulesAdapter
extends
RecyclerView
.
Adapter
<
ModulesAdapter
.
ViewHolder
>
{
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java
View file @
32c65d8a
...
@@ -9,6 +9,10 @@ import android.view.ViewGroup;
...
@@ -9,6 +9,10 @@ import android.view.ViewGroup;
import
android.widget.ImageView
;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
androidx.annotation.NonNull
;
import
androidx.appcompat.widget.SwitchCompat
;
import
androidx.recyclerview.widget.RecyclerView
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.container.Policy
;
import
com.topjohnwu.magisk.container.Policy
;
...
@@ -22,9 +26,6 @@ import com.topjohnwu.magisk.utils.FingerprintHelper;
...
@@ -22,9 +26,6 @@ import com.topjohnwu.magisk.utils.FingerprintHelper;
import
java.util.List
;
import
java.util.List
;
import
androidx.annotation.NonNull
;
import
androidx.appcompat.widget.SwitchCompat
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.BindView
;
public
class
PolicyAdapter
extends
RecyclerView
.
Adapter
<
PolicyAdapter
.
ViewHolder
>
{
public
class
PolicyAdapter
extends
RecyclerView
.
Adapter
<
PolicyAdapter
.
ViewHolder
>
{
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/ReposAdapter.java
View file @
32c65d8a
...
@@ -12,6 +12,8 @@ import android.view.ViewGroup;
...
@@ -12,6 +12,8 @@ import android.view.ViewGroup;
import
android.widget.ImageView
;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
androidx.recyclerview.widget.RecyclerView
;
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
;
...
@@ -26,7 +28,6 @@ import java.util.ArrayList;
...
@@ -26,7 +28,6 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.BindView
;
public
class
ReposAdapter
extends
SectionedAdapter
<
ReposAdapter
.
SectionHolder
,
ReposAdapter
.
RepoHolder
>
{
public
class
ReposAdapter
extends
SectionedAdapter
<
ReposAdapter
.
SectionHolder
,
ReposAdapter
.
RepoHolder
>
{
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/StringListAdapter.java
View file @
32c65d8a
...
@@ -7,13 +7,13 @@ import android.view.View;
...
@@ -7,13 +7,13 @@ import android.view.View;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
java.util.List
;
import
androidx.annotation.IdRes
;
import
androidx.annotation.IdRes
;
import
androidx.annotation.LayoutRes
;
import
androidx.annotation.LayoutRes
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
import
androidx.recyclerview.widget.RecyclerView
;
import
androidx.recyclerview.widget.RecyclerView
;
import
java.util.List
;
public
abstract
class
StringListAdapter
<
VH
extends
StringListAdapter
.
ViewHolder
>
public
abstract
class
StringListAdapter
<
VH
extends
StringListAdapter
.
ViewHolder
>
extends
RecyclerView
.
Adapter
<
VH
>
{
extends
RecyclerView
.
Adapter
<
VH
>
{
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java
View file @
32c65d8a
...
@@ -9,6 +9,8 @@ import android.view.animation.RotateAnimation;
...
@@ -9,6 +9,8 @@ import android.view.animation.RotateAnimation;
import
android.widget.ImageView
;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
androidx.recyclerview.widget.RecyclerView
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.container.SuLogEntry
;
import
com.topjohnwu.magisk.container.SuLogEntry
;
import
com.topjohnwu.magisk.database.MagiskDB
;
import
com.topjohnwu.magisk.database.MagiskDB
;
...
@@ -19,7 +21,6 @@ import java.util.HashSet;
...
@@ -19,7 +21,6 @@ import java.util.HashSet;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.Set
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.BindView
;
public
class
SuLogAdapter
extends
SectionedAdapter
<
SuLogAdapter
.
SectionHolder
,
SuLogAdapter
.
LogViewHolder
>
{
public
class
SuLogAdapter
extends
SectionedAdapter
<
SuLogAdapter
.
SectionHolder
,
SuLogAdapter
.
LogViewHolder
>
{
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/TabFragmentAdapter.java
View file @
32c65d8a
package
com
.
topjohnwu
.
magisk
.
adapters
;
package
com
.
topjohnwu
.
magisk
.
adapters
;
import
java.util.ArrayList
;
import
java.util.List
;
import
androidx.fragment.app.Fragment
;
import
androidx.fragment.app.Fragment
;
import
androidx.fragment.app.FragmentManager
;
import
androidx.fragment.app.FragmentManager
;
import
androidx.fragment.app.FragmentPagerAdapter
;
import
androidx.fragment.app.FragmentPagerAdapter
;
import
java.util.ArrayList
;
import
java.util.List
;
public
class
TabFragmentAdapter
extends
FragmentPagerAdapter
{
public
class
TabFragmentAdapter
extends
FragmentPagerAdapter
{
private
List
<
Fragment
>
fragmentList
;
private
List
<
Fragment
>
fragmentList
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/BaseActivity.java
View file @
32c65d8a
...
@@ -10,13 +10,6 @@ import android.text.TextUtils;
...
@@ -10,13 +10,6 @@ import android.text.TextUtils;
import
android.view.WindowManager
;
import
android.view.WindowManager
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
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
;
import
androidx.annotation.StyleRes
;
import
androidx.annotation.StyleRes
;
...
@@ -25,6 +18,13 @@ import androidx.appcompat.app.AppCompatDelegate;
...
@@ -25,6 +18,13 @@ import androidx.appcompat.app.AppCompatDelegate;
import
androidx.core.app.ActivityCompat
;
import
androidx.core.app.ActivityCompat
;
import
androidx.core.content.ContextCompat
;
import
androidx.core.content.ContextCompat
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.LocaleManager
;
import
com.topjohnwu.magisk.utils.Topic
;
public
abstract
class
BaseActivity
extends
AppCompatActivity
implements
Topic
.
AutoSubscriber
{
public
abstract
class
BaseActivity
extends
AppCompatActivity
implements
Topic
.
AutoSubscriber
{
public
static
final
String
INTENT_PERM
=
"perm_dialog"
;
public
static
final
String
INTENT_PERM
=
"perm_dialog"
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/BaseFragment.java
View file @
32c65d8a
...
@@ -2,10 +2,11 @@ package com.topjohnwu.magisk.components;
...
@@ -2,10 +2,11 @@ package com.topjohnwu.magisk.components;
import
android.content.Intent
;
import
android.content.Intent
;
import
androidx.fragment.app.Fragment
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.utils.Topic
;
import
com.topjohnwu.magisk.utils.Topic
;
import
androidx.fragment.app.Fragment
;
import
butterknife.Unbinder
;
import
butterknife.Unbinder
;
public
abstract
class
BaseFragment
extends
Fragment
implements
Topic
.
AutoSubscriber
{
public
abstract
class
BaseFragment
extends
Fragment
implements
Topic
.
AutoSubscriber
{
...
...
app/src/full/java/com/topjohnwu/magisk/components/BasePreferenceFragment.java
View file @
32c65d8a
...
@@ -8,10 +8,6 @@ import android.view.LayoutInflater;
...
@@ -8,10 +8,6 @@ import android.view.LayoutInflater;
import
android.view.View
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
com.topjohnwu.magisk.App
;
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
;
import
androidx.preference.PreferenceFragmentCompat
;
import
androidx.preference.PreferenceFragmentCompat
;
...
@@ -20,6 +16,10 @@ import androidx.preference.PreferenceScreen;
...
@@ -20,6 +16,10 @@ import androidx.preference.PreferenceScreen;
import
androidx.preference.PreferenceViewHolder
;
import
androidx.preference.PreferenceViewHolder
;
import
androidx.recyclerview.widget.RecyclerView
;
import
androidx.recyclerview.widget.RecyclerView
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Topic
;
public
abstract
class
BasePreferenceFragment
extends
PreferenceFragmentCompat
public
abstract
class
BasePreferenceFragment
extends
PreferenceFragmentCompat
implements
SharedPreferences
.
OnSharedPreferenceChangeListener
,
Topic
.
AutoSubscriber
{
implements
SharedPreferences
.
OnSharedPreferenceChangeListener
,
Topic
.
AutoSubscriber
{
...
...
app/src/full/java/com/topjohnwu/magisk/components/DelegateWorker.java
View file @
32c65d8a
...
@@ -4,12 +4,6 @@ import android.content.Context;
...
@@ -4,12 +4,6 @@ import android.content.Context;
import
android.net.Network
;
import
android.net.Network
;
import
android.net.Uri
;
import
android.net.Uri
;
import
com.google.common.util.concurrent.ListenableFuture
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.UUID
;
import
androidx.annotation.MainThread
;
import
androidx.annotation.MainThread
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
...
@@ -17,6 +11,12 @@ import androidx.annotation.RequiresApi;
...
@@ -17,6 +11,12 @@ import androidx.annotation.RequiresApi;
import
androidx.work.Data
;
import
androidx.work.Data
;
import
androidx.work.ListenableWorker
;
import
androidx.work.ListenableWorker
;
import
com.google.common.util.concurrent.ListenableFuture
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.UUID
;
public
abstract
class
DelegateWorker
{
public
abstract
class
DelegateWorker
{
private
ListenableWorker
worker
;
private
ListenableWorker
worker
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/DownloadModuleService.java
View file @
32c65d8a
...
@@ -6,6 +6,8 @@ import android.net.Uri;
...
@@ -6,6 +6,8 @@ import android.net.Uri;
import
android.os.IBinder
;
import
android.os.IBinder
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
androidx.annotation.Nullable
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.FlashActivity
;
import
com.topjohnwu.magisk.FlashActivity
;
...
@@ -27,8 +29,6 @@ import java.util.zip.ZipEntry;
...
@@ -27,8 +29,6 @@ import java.util.zip.ZipEntry;
import
java.util.zip.ZipInputStream
;
import
java.util.zip.ZipInputStream
;
import
java.util.zip.ZipOutputStream
;
import
java.util.zip.ZipOutputStream
;
import
androidx.annotation.Nullable
;
public
class
DownloadModuleService
extends
Service
{
public
class
DownloadModuleService
extends
Service
{
private
boolean
running
=
false
;
private
boolean
running
=
false
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/UpdateCheckService.java
View file @
32c65d8a
package
com
.
topjohnwu
.
magisk
.
components
;
package
com
.
topjohnwu
.
magisk
.
components
;
import
androidx.annotation.NonNull
;
import
androidx.work.ListenableWorker
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.tasks.CheckUpdates
;
import
com.topjohnwu.magisk.tasks.CheckUpdates
;
import
com.topjohnwu.magisk.uicomponents.Notifications
;
import
com.topjohnwu.magisk.uicomponents.Notifications
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
androidx.annotation.NonNull
;
import
androidx.work.ListenableWorker
;
public
class
UpdateCheckService
extends
DelegateWorker
{
public
class
UpdateCheckService
extends
DelegateWorker
{
@NonNull
@NonNull
...
...
app/src/full/java/com/topjohnwu/magisk/dialogs/CustomAlertDialog.java
View file @
32c65d8a
...
@@ -8,13 +8,14 @@ import android.widget.Button;
...
@@ -8,13 +8,14 @@ import android.widget.Button;
import
android.widget.LinearLayout
;
import
android.widget.LinearLayout
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.topjohnwu.magisk.R
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.StringRes
;
import
androidx.annotation.StringRes
;
import
androidx.annotation.StyleRes
;
import
androidx.annotation.StyleRes
;
import
androidx.appcompat.app.AlertDialog
;
import
androidx.appcompat.app.AlertDialog
;
import
com.topjohnwu.magisk.R
;
import
butterknife.BindView
;
import
butterknife.BindView
;
public
class
CustomAlertDialog
extends
AlertDialog
.
Builder
{
public
class
CustomAlertDialog
extends
AlertDialog
.
Builder
{
...
...
app/src/full/java/com/topjohnwu/magisk/dialogs/EnvFixDialog.java
View file @
32c65d8a
...
@@ -5,6 +5,8 @@ import android.app.ProgressDialog;
...
@@ -5,6 +5,8 @@ import android.app.ProgressDialog;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
androidx.annotation.NonNull
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.SplashActivity
;
import
com.topjohnwu.magisk.SplashActivity
;
...
@@ -15,8 +17,6 @@ import com.topjohnwu.superuser.io.SuFile;
...
@@ -15,8 +17,6 @@ import com.topjohnwu.superuser.io.SuFile;
import
java.io.IOException
;
import
java.io.IOException
;
import
androidx.annotation.NonNull
;
public
class
EnvFixDialog
extends
CustomAlertDialog
{
public
class
EnvFixDialog
extends
CustomAlertDialog
{
public
EnvFixDialog
(
@NonNull
Activity
activity
)
{
public
EnvFixDialog
(
@NonNull
Activity
activity
)
{
...
...
app/src/full/java/com/topjohnwu/magisk/dialogs/FingerprintAuthDialog.java
View file @
32c65d8a
...
@@ -11,13 +11,13 @@ import android.os.Build;
...
@@ -11,13 +11,13 @@ import android.os.Build;
import
android.view.Gravity
;
import
android.view.Gravity
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
androidx.annotation.NonNull
;
import
androidx.appcompat.app.AlertDialog
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.FingerprintHelper
;
import
com.topjohnwu.magisk.utils.FingerprintHelper
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.magisk.utils.Utils
;
import
androidx.annotation.NonNull
;
import
androidx.appcompat.app.AlertDialog
;
@TargetApi
(
Build
.
VERSION_CODES
.
M
)
@TargetApi
(
Build
.
VERSION_CODES
.
M
)
public
class
FingerprintAuthDialog
extends
CustomAlertDialog
{
public
class
FingerprintAuthDialog
extends
CustomAlertDialog
{
...
...
app/src/full/java/com/topjohnwu/magisk/dialogs/InstallMethodDialog.java
View file @
32c65d8a
...
@@ -4,6 +4,8 @@ import android.app.Activity;
...
@@ -4,6 +4,8 @@ import android.app.Activity;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
androidx.appcompat.app.AlertDialog
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Config
;
...
@@ -19,8 +21,6 @@ import com.topjohnwu.net.Networking;
...
@@ -19,8 +21,6 @@ import com.topjohnwu.net.Networking;
import
java.io.File
;
import
java.io.File
;
import
java.util.List
;
import
java.util.List
;
import
androidx.appcompat.app.AlertDialog
;
class
InstallMethodDialog
extends
AlertDialog
.
Builder
{
class
InstallMethodDialog
extends
AlertDialog
.
Builder
{
InstallMethodDialog
(
BaseActivity
activity
,
List
<
String
>
options
)
{
InstallMethodDialog
(
BaseActivity
activity
,
List
<
String
>
options
)
{
...
...
app/src/full/java/com/topjohnwu/magisk/dialogs/ManagerInstallDialog.java
View file @
32c65d8a
...
@@ -3,14 +3,14 @@ package com.topjohnwu.magisk.dialogs;
...
@@ -3,14 +3,14 @@ package com.topjohnwu.magisk.dialogs;
import
android.app.Activity
;
import
android.app.Activity
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
androidx.annotation.NonNull
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.uicomponents.MarkDownWindow
;
import
com.topjohnwu.magisk.uicomponents.MarkDownWindow
;
import
com.topjohnwu.magisk.utils.DownloadApp
;
import
com.topjohnwu.magisk.utils.DownloadApp
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.magisk.utils.Utils
;
import
androidx.annotation.NonNull
;
public
class
ManagerInstallDialog
extends
CustomAlertDialog
{
public
class
ManagerInstallDialog
extends
CustomAlertDialog
{
public
ManagerInstallDialog
(
@NonNull
Activity
a
)
{
public
ManagerInstallDialog
(
@NonNull
Activity
a
)
{
...
...
app/src/full/java/com/topjohnwu/magisk/dialogs/UninstallDialog.java
View file @
32c65d8a
...
@@ -7,6 +7,8 @@ import android.net.Uri;
...
@@ -7,6 +7,8 @@ import android.net.Uri;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
androidx.annotation.NonNull
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Const
;
...
@@ -19,8 +21,6 @@ import com.topjohnwu.superuser.Shell;
...
@@ -19,8 +21,6 @@ import com.topjohnwu.superuser.Shell;
import
java.io.File
;
import
java.io.File
;
import
androidx.annotation.NonNull
;
public
class
UninstallDialog
extends
CustomAlertDialog
{
public
class
UninstallDialog
extends
CustomAlertDialog
{
public
UninstallDialog
(
@NonNull
Activity
activity
)
{
public
UninstallDialog
(
@NonNull
Activity
activity
)
{
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/LogFragment.java
View file @
32c65d8a
...
@@ -7,13 +7,14 @@ import android.view.LayoutInflater;
...
@@ -7,13 +7,14 @@ import android.view.LayoutInflater;
import
android.view.View
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
androidx.viewpager.widget.ViewPager
;
import
com.google.android.material.tabs.TabLayout
;
import
com.google.android.material.tabs.TabLayout
;
import
com.topjohnwu.magisk.MainActivity
;
import
com.topjohnwu.magisk.MainActivity
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.adapters.TabFragmentAdapter
;
import
com.topjohnwu.magisk.adapters.TabFragmentAdapter
;
import
com.topjohnwu.magisk.components.BaseFragment
;
import
com.topjohnwu.magisk.components.BaseFragment
;
import
androidx.viewpager.widget.ViewPager
;
import
butterknife.BindView
;
import
butterknife.BindView
;
public
class
LogFragment
extends
BaseFragment
{
public
class
LogFragment
extends
BaseFragment
{
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/MagiskFragment.java
View file @
32c65d8a
...
@@ -9,6 +9,16 @@ import android.widget.CheckBox;
...
@@ -9,6 +9,16 @@ import android.widget.CheckBox;
import
android.widget.ImageView
;
import
android.widget.ImageView
;
import
android.widget.LinearLayout
;
import
android.widget.LinearLayout
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.cardview.widget.CardView
;
import
androidx.swiperefreshlayout.widget.SwipeRefreshLayout
;
import
androidx.transition.ChangeBounds
;
import
androidx.transition.Fade
;
import
androidx.transition.Transition
;
import
androidx.transition.TransitionManager
;
import
androidx.transition.TransitionSet
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Const
;
...
@@ -33,15 +43,6 @@ import com.topjohnwu.superuser.Shell;
...
@@ -33,15 +43,6 @@ import com.topjohnwu.superuser.Shell;
import
java.util.Locale
;
import
java.util.Locale
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.cardview.widget.CardView
;
import
androidx.swiperefreshlayout.widget.SwipeRefreshLayout
;
import
androidx.transition.ChangeBounds
;
import
androidx.transition.Fade
;
import
androidx.transition.Transition
;
import
androidx.transition.TransitionManager
;
import
androidx.transition.TransitionSet
;
import
butterknife.BindColor
;
import
butterknife.BindColor
;
import
butterknife.BindView
;
import
butterknife.BindView
;
import
butterknife.OnClick
;
import
butterknife.OnClick
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/MagiskHideFragment.java
View file @
32c65d8a
...
@@ -9,16 +9,17 @@ import android.view.View;
...
@@ -9,16 +9,17 @@ import android.view.View;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
android.widget.SearchView
;
import
android.widget.SearchView
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
androidx.swiperefreshlayout.widget.SwipeRefreshLayout
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Config
;
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
com.topjohnwu.magisk.utils.Topic
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
androidx.swiperefreshlayout.widget.SwipeRefreshLayout
;
import
butterknife.BindView
;
import
butterknife.BindView
;
public
class
MagiskHideFragment
extends
BaseFragment
implements
Topic
.
Subscriber
{
public
class
MagiskHideFragment
extends
BaseFragment
implements
Topic
.
Subscriber
{
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/MagiskLogFragment.java
View file @
32c65d8a
...
@@ -9,6 +9,10 @@ import android.view.MenuItem;
...
@@ -9,6 +9,10 @@ import android.view.MenuItem;
import
android.view.View
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
...
@@ -24,9 +28,6 @@ import java.io.IOException;
...
@@ -24,9 +28,6 @@ import java.io.IOException;
import
java.util.Calendar
;
import
java.util.Calendar
;
import
java.util.List
;
import
java.util.List
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.BindView
;
public
class
MagiskLogFragment
extends
BaseFragment
{
public
class
MagiskLogFragment
extends
BaseFragment
{
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/ModulesFragment.java
View file @
32c65d8a
...
@@ -12,6 +12,11 @@ import android.view.View;
...
@@ -12,6 +12,11 @@ import android.view.View;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
androidx.swiperefreshlayout.widget.SwipeRefreshLayout
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.FlashActivity
;
import
com.topjohnwu.magisk.FlashActivity
;
...
@@ -27,10 +32,6 @@ import java.util.ArrayList;
...
@@ -27,10 +32,6 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
androidx.swiperefreshlayout.widget.SwipeRefreshLayout
;
import
butterknife.BindView
;
import
butterknife.BindView
;
import
butterknife.OnClick
;
import
butterknife.OnClick
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/ReposFragment.java
View file @
32c65d8a
...
@@ -11,6 +11,11 @@ import android.view.ViewGroup;
...
@@ -11,6 +11,11 @@ import android.view.ViewGroup;
import
android.widget.SearchView
;
import
android.widget.SearchView
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
androidx.swiperefreshlayout.widget.SwipeRefreshLayout
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.adapters.ReposAdapter
;
import
com.topjohnwu.magisk.adapters.ReposAdapter
;
...
@@ -21,10 +26,6 @@ import com.topjohnwu.magisk.utils.Topic;
...
@@ -21,10 +26,6 @@ import com.topjohnwu.magisk.utils.Topic;
import
java.util.Map
;
import
java.util.Map
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
androidx.swiperefreshlayout.widget.SwipeRefreshLayout
;
import
butterknife.BindView
;
import
butterknife.BindView
;
public
class
ReposFragment
extends
BaseFragment
implements
Topic
.
Subscriber
{
public
class
ReposFragment
extends
BaseFragment
implements
Topic
.
Subscriber
{
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
View file @
32c65d8a
...
@@ -8,6 +8,13 @@ import android.view.View;
...
@@ -8,6 +8,13 @@ import android.view.View;
import
android.widget.EditText
;
import
android.widget.EditText
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
androidx.appcompat.app.AlertDialog
;
import
androidx.preference.ListPreference
;
import
androidx.preference.Preference
;
import
androidx.preference.PreferenceCategory
;
import
androidx.preference.PreferenceScreen
;
import
androidx.preference.SwitchPreferenceCompat
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Const
;
...
@@ -28,13 +35,6 @@ import com.topjohnwu.superuser.Shell;
...
@@ -28,13 +35,6 @@ import com.topjohnwu.superuser.Shell;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.util.Locale
;
import
java.util.Locale
;
import
androidx.appcompat.app.AlertDialog
;
import
androidx.preference.ListPreference
;
import
androidx.preference.Preference
;
import
androidx.preference.PreferenceCategory
;
import
androidx.preference.PreferenceScreen
;
import
androidx.preference.SwitchPreferenceCompat
;
public
class
SettingsFragment
extends
BasePreferenceFragment
implements
Topic
.
Subscriber
{
public
class
SettingsFragment
extends
BasePreferenceFragment
implements
Topic
.
Subscriber
{
private
ListPreference
updateChannel
,
autoRes
,
suNotification
,
private
ListPreference
updateChannel
,
autoRes
,
suNotification
,
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/SuLogFragment.java
View file @
32c65d8a
...
@@ -9,12 +9,13 @@ import android.view.View;
...
@@ -9,12 +9,13 @@ import android.view.View;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.adapters.SuLogAdapter
;
import
com.topjohnwu.magisk.adapters.SuLogAdapter
;
import
com.topjohnwu.magisk.components.BaseFragment
;
import
com.topjohnwu.magisk.components.BaseFragment
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.BindView
;
public
class
SuLogFragment
extends
BaseFragment
{
public
class
SuLogFragment
extends
BaseFragment
{
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/SuperuserFragment.java
View file @
32c65d8a
...
@@ -7,6 +7,9 @@ import android.view.View;
...
@@ -7,6 +7,9 @@ import android.view.View;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
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
;
...
@@ -14,8 +17,6 @@ import com.topjohnwu.magisk.container.Policy;
...
@@ -14,8 +17,6 @@ import com.topjohnwu.magisk.container.Policy;
import
java.util.List
;
import
java.util.List
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.BindView
;
public
class
SuperuserFragment
extends
BaseFragment
{
public
class
SuperuserFragment
extends
BaseFragment
{
...
...
app/src/full/java/com/topjohnwu/magisk/uicomponents/MarkDownWindow.java
View file @
32c65d8a
...
@@ -8,6 +8,9 @@ import android.graphics.drawable.Drawable;
...
@@ -8,6 +8,9 @@ import android.graphics.drawable.Drawable;
import
android.view.LayoutInflater
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.View
;
import
androidx.annotation.NonNull
;
import
androidx.appcompat.app.AlertDialog
;
import
com.caverock.androidsvg.SVG
;
import
com.caverock.androidsvg.SVG
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
...
@@ -22,8 +25,6 @@ import java.io.IOException;
...
@@ -22,8 +25,6 @@ import java.io.IOException;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.util.concurrent.Callable
;
import
java.util.concurrent.Callable
;
import
androidx.annotation.NonNull
;
import
androidx.appcompat.app.AlertDialog
;
import
ru.noties.markwon.Markwon
;
import
ru.noties.markwon.Markwon
;
import
ru.noties.markwon.SpannableConfiguration
;
import
ru.noties.markwon.SpannableConfiguration
;
import
ru.noties.markwon.spans.AsyncDrawable
;
import
ru.noties.markwon.spans.AsyncDrawable
;
...
...
app/src/full/java/com/topjohnwu/magisk/uicomponents/Notifications.java
View file @
32c65d8a
...
@@ -7,6 +7,10 @@ import android.content.Context;
...
@@ -7,6 +7,10 @@ import android.content.Context;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.os.Build
;
import
android.os.Build
;
import
androidx.core.app.NotificationCompat
;
import
androidx.core.app.NotificationManagerCompat
;
import
androidx.core.app.TaskStackBuilder
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Config
;
...
@@ -16,10 +20,6 @@ import com.topjohnwu.magisk.SplashActivity;
...
@@ -16,10 +20,6 @@ import com.topjohnwu.magisk.SplashActivity;
import
com.topjohnwu.magisk.components.GeneralReceiver
;
import
com.topjohnwu.magisk.components.GeneralReceiver
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.magisk.utils.Utils
;
import
androidx.core.app.NotificationCompat
;
import
androidx.core.app.NotificationManagerCompat
;
import
androidx.core.app.TaskStackBuilder
;
public
class
Notifications
{
public
class
Notifications
{
public
static
NotificationManagerCompat
mgr
=
NotificationManagerCompat
.
from
(
App
.
self
);
public
static
NotificationManagerCompat
mgr
=
NotificationManagerCompat
.
from
(
App
.
self
);
...
...
app/src/full/java/com/topjohnwu/magisk/uicomponents/ProgressNotification.java
View file @
32c65d8a
...
@@ -3,13 +3,13 @@ package com.topjohnwu.magisk.uicomponents;
...
@@ -3,13 +3,13 @@ package com.topjohnwu.magisk.uicomponents;
import
android.app.Notification
;
import
android.app.Notification
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
androidx.core.app.NotificationCompat
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.net.DownloadProgressListener
;
import
com.topjohnwu.net.DownloadProgressListener
;
import
androidx.core.app.NotificationCompat
;
public
class
ProgressNotification
implements
DownloadProgressListener
{
public
class
ProgressNotification
implements
DownloadProgressListener
{
private
NotificationCompat
.
Builder
builder
;
private
NotificationCompat
.
Builder
builder
;
...
...
app/src/full/java/com/topjohnwu/magisk/uicomponents/SafetyNet.java
View file @
32c65d8a
...
@@ -10,6 +10,9 @@ import android.widget.ImageView;
...
@@ -10,6 +10,9 @@ import android.widget.ImageView;
import
android.widget.ProgressBar
;
import
android.widget.ProgressBar
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
androidx.annotation.StringRes
;
import
androidx.cardview.widget.CardView
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
...
@@ -20,8 +23,6 @@ import com.topjohnwu.superuser.Shell;
...
@@ -20,8 +23,6 @@ import com.topjohnwu.superuser.Shell;
import
java.io.File
;
import
java.io.File
;
import
androidx.annotation.StringRes
;
import
androidx.cardview.widget.CardView
;
import
butterknife.BindColor
;
import
butterknife.BindColor
;
import
butterknife.BindView
;
import
butterknife.BindView
;
import
butterknife.OnClick
;
import
butterknife.OnClick
;
...
...
app/src/full/java/com/topjohnwu/magisk/uicomponents/Shortcuts.java
View file @
32c65d8a
...
@@ -7,6 +7,8 @@ import android.content.pm.ShortcutManager;
...
@@ -7,6 +7,8 @@ import android.content.pm.ShortcutManager;
import
android.graphics.drawable.Icon
;
import
android.graphics.drawable.Icon
;
import
android.os.Build
;
import
android.os.Build
;
import
androidx.annotation.RequiresApi
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Const
;
...
@@ -17,8 +19,6 @@ import com.topjohnwu.superuser.Shell;
...
@@ -17,8 +19,6 @@ import com.topjohnwu.superuser.Shell;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
androidx.annotation.RequiresApi
;
public
class
Shortcuts
{
public
class
Shortcuts
{
public
static
void
setup
(
Context
context
)
{
public
static
void
setup
(
Context
context
)
{
...
...
app/src/full/java/com/topjohnwu/magisk/uicomponents/SnackbarMaker.java
View file @
32c65d8a
...
@@ -5,12 +5,12 @@ import android.net.Uri;
...
@@ -5,12 +5,12 @@ import android.net.Uri;
import
android.view.View
;
import
android.view.View
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
androidx.annotation.StringRes
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.magisk.utils.Utils
;
import
androidx.annotation.StringRes
;
public
class
SnackbarMaker
{
public
class
SnackbarMaker
{
public
static
Snackbar
make
(
Activity
activity
,
CharSequence
text
,
int
duration
)
{
public
static
Snackbar
make
(
Activity
activity
,
CharSequence
text
,
int
duration
)
{
...
...
app/src/full/java/com/topjohnwu/magisk/utils/AppUtils.java
View file @
32c65d8a
...
@@ -5,6 +5,12 @@ import android.content.Intent;
...
@@ -5,6 +5,12 @@ import android.content.Intent;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
androidx.work.Constraints
;
import
androidx.work.ExistingPeriodicWorkPolicy
;
import
androidx.work.NetworkType
;
import
androidx.work.PeriodicWorkRequest
;
import
androidx.work.WorkManager
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Const
;
...
@@ -14,12 +20,6 @@ import com.topjohnwu.magisk.tasks.CheckUpdates;
...
@@ -14,12 +20,6 @@ import com.topjohnwu.magisk.tasks.CheckUpdates;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.TimeUnit
;
import
androidx.work.Constraints
;
import
androidx.work.ExistingPeriodicWorkPolicy
;
import
androidx.work.NetworkType
;
import
androidx.work.PeriodicWorkRequest
;
import
androidx.work.WorkManager
;
public
class
AppUtils
{
public
class
AppUtils
{
public
static
void
scheduleUpdateCheck
()
{
public
static
void
scheduleUpdateCheck
()
{
...
...
app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java
View file @
32c65d8a
...
@@ -2,6 +2,8 @@ package com.topjohnwu.magisk.utils;
...
@@ -2,6 +2,8 @@ package com.topjohnwu.magisk.utils;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
androidx.core.app.NotificationCompat
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Config
;
...
@@ -24,8 +26,6 @@ import java.util.ArrayList;
...
@@ -24,8 +26,6 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.List
;
import
java.util.jar.JarEntry
;
import
java.util.jar.JarEntry
;
import
androidx.core.app.NotificationCompat
;
public
class
PatchAPK
{
public
class
PatchAPK
{
public
static
final
String
LOWERALPHA
=
"abcdefghijklmnopqrstuvwxyz"
;
public
static
final
String
LOWERALPHA
=
"abcdefghijklmnopqrstuvwxyz"
;
...
...
build.gradle
View file @
32c65d8a
...
@@ -7,7 +7,7 @@ buildscript {
...
@@ -7,7 +7,7 @@ buildscript {
jcenter
()
jcenter
()
}
}
dependencies
{
dependencies
{
classpath
'com.android.tools.build:gradle:3.
3.2
'
classpath
'com.android.tools.build:gradle:3.
5.0-alpha06
'
// NOTE: Do not place your application dependencies here; they belong
// NOTE: Do not place your application dependencies here; they belong
...
...
gradle/wrapper/gradle-wrapper.properties
View file @
32c65d8a
#
Mon Jan 14 14:36:28
EST 2019
#
Thu Mar 07 02:26:20
EST 2019
distributionBase
=
GRADLE_USER_HOME
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.10
.1-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.2
.1-all.zip
net/src/main/java/com/topjohnwu/net/BadRequest.java
View file @
32c65d8a
...
@@ -6,7 +6,6 @@ import org.json.JSONObject;
...
@@ -6,7 +6,6 @@ import org.json.JSONObject;
import
java.io.File
;
import
java.io.File
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.util.concurrent.Executor
;
class
BadRequest
extends
Request
{
class
BadRequest
extends
Request
{
...
...
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