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
a6395d35
Commit
a6395d35
authored
Apr 12, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor with AS 3.5
parent
a028cd5c
Hide whitespace changes
Inline
Side-by-side
Showing
45 changed files
with
155 additions
and
135 deletions
+155
-135
App.java
app/src/main/java/com/topjohnwu/magisk/App.java
+4
-4
ApplicationAdapter.java
...m/topjohnwu/magisk/model/adapters/ApplicationAdapter.java
+6
-5
ModulesAdapter.java
...a/com/topjohnwu/magisk/model/adapters/ModulesAdapter.java
+3
-2
PolicyAdapter.java
...va/com/topjohnwu/magisk/model/adapters/PolicyAdapter.java
+4
-3
ReposAdapter.java
...ava/com/topjohnwu/magisk/model/adapters/ReposAdapter.java
+2
-1
StringListAdapter.java
...om/topjohnwu/magisk/model/adapters/StringListAdapter.java
+2
-2
SuLogAdapter.java
...ava/com/topjohnwu/magisk/model/adapters/SuLogAdapter.java
+2
-1
TabFragmentAdapter.java
...m/topjohnwu/magisk/model/adapters/TabFragmentAdapter.java
+3
-3
DownloadModuleService.java
...opjohnwu/magisk/model/download/DownloadModuleService.java
+2
-2
BaseModule.java
...in/java/com/topjohnwu/magisk/model/entity/BaseModule.java
+2
-2
Policy.java
...c/main/java/com/topjohnwu/magisk/model/entity/Policy.java
+2
-2
UpdateCheckService.java
...com/topjohnwu/magisk/model/update/UpdateCheckService.java
+3
-3
DelegateWorker.java
...ava/com/topjohnwu/magisk/model/worker/DelegateWorker.java
+6
-6
MainActivity.java
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.java
+7
-6
SplashActivity.java
...src/main/java/com/topjohnwu/magisk/ui/SplashActivity.java
+2
-2
BaseActivity.java
.../main/java/com/topjohnwu/magisk/ui/base/BaseActivity.java
+7
-7
BaseFragment.java
.../main/java/com/topjohnwu/magisk/ui/base/BaseFragment.java
+2
-1
BasePreferenceFragment.java
.../com/topjohnwu/magisk/ui/base/BasePreferenceFragment.java
+4
-4
FlashActivity.java
...ain/java/com/topjohnwu/magisk/ui/flash/FlashActivity.java
+5
-4
MagiskHideFragment.java
...java/com/topjohnwu/magisk/ui/hide/MagiskHideFragment.java
+5
-4
MagiskFragment.java
...ain/java/com/topjohnwu/magisk/ui/home/MagiskFragment.java
+10
-9
LogFragment.java
...rc/main/java/com/topjohnwu/magisk/ui/log/LogFragment.java
+2
-1
MagiskLogFragment.java
...n/java/com/topjohnwu/magisk/ui/log/MagiskLogFragment.java
+4
-3
SuLogFragment.java
.../main/java/com/topjohnwu/magisk/ui/log/SuLogFragment.java
+3
-2
ModulesFragment.java
.../java/com/topjohnwu/magisk/ui/module/ModulesFragment.java
+5
-4
ReposFragment.java
...in/java/com/topjohnwu/magisk/ui/module/ReposFragment.java
+5
-4
SettingsFragment.java
...va/com/topjohnwu/magisk/ui/settings/SettingsFragment.java
+7
-7
SuperuserFragment.java
.../com/topjohnwu/magisk/ui/superuser/SuperuserFragment.java
+3
-2
SuRequestActivity.java
.../com/topjohnwu/magisk/ui/surequest/SuRequestActivity.java
+3
-2
PatchAPK.java
app/src/main/java/com/topjohnwu/magisk/utils/PatchAPK.java
+2
-2
Utils.java
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
+6
-6
ValueSortedMap.java
.../main/java/com/topjohnwu/magisk/utils/ValueSortedMap.java
+2
-2
MarkDownWindow.java
...c/main/java/com/topjohnwu/magisk/view/MarkDownWindow.java
+2
-1
Notifications.java
...rc/main/java/com/topjohnwu/magisk/view/Notifications.java
+4
-4
ProgressNotification.java
.../java/com/topjohnwu/magisk/view/ProgressNotification.java
+2
-2
SafetyNet.java
app/src/main/java/com/topjohnwu/magisk/view/SafetyNet.java
+3
-2
Shortcuts.java
app/src/main/java/com/topjohnwu/magisk/view/Shortcuts.java
+2
-2
SnackbarMaker.java
...rc/main/java/com/topjohnwu/magisk/view/SnackbarMaker.java
+2
-2
CustomAlertDialog.java
.../com/topjohnwu/magisk/view/dialogs/CustomAlertDialog.java
+3
-2
EnvFixDialog.java
.../java/com/topjohnwu/magisk/view/dialogs/EnvFixDialog.java
+2
-2
FingerprintAuthDialog.java
.../topjohnwu/magisk/view/dialogs/FingerprintAuthDialog.java
+3
-3
InstallMethodDialog.java
...om/topjohnwu/magisk/view/dialogs/InstallMethodDialog.java
+2
-2
ManagerInstallDialog.java
...m/topjohnwu/magisk/view/dialogs/ManagerInstallDialog.java
+2
-2
UninstallDialog.java
...va/com/topjohnwu/magisk/view/dialogs/UninstallDialog.java
+2
-2
build.gradle
build.gradle
+1
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/App.java
View file @
a6395d35
...
...
@@ -10,6 +10,10 @@ import android.os.Build;
import
android.os.Bundle
;
import
android.preference.PreferenceManager
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.appcompat.app.AppCompatDelegate
;
import
com.topjohnwu.magisk.data.database.MagiskDB
;
import
com.topjohnwu.magisk.data.database.RepoDatabaseHelper
;
import
com.topjohnwu.magisk.ui.base.BaseActivity
;
...
...
@@ -20,10 +24,6 @@ import com.topjohnwu.superuser.Shell;
import
java.util.concurrent.ThreadPoolExecutor
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.appcompat.app.AppCompatDelegate
;
public
class
App
extends
Application
implements
Application
.
ActivityLifecycleCallbacks
{
public
static
App
self
;
...
...
app/src/main/java/com/topjohnwu/magisk/model/adapters/ApplicationAdapter.java
View file @
a6395d35
...
...
@@ -13,6 +13,12 @@ import android.widget.CheckBox;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.WorkerThread
;
import
androidx.collection.ArraySet
;
import
androidx.recyclerview.widget.RecyclerView
;
import
com.buildware.widget.indeterm.IndeterminateCheckBox
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.Config
;
...
...
@@ -29,11 +35,6 @@ import java.util.Comparator;
import
java.util.List
;
import
java.util.Set
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.WorkerThread
;
import
androidx.collection.ArraySet
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
java9.util.Comparators
;
import
java9.util.Lists
;
...
...
app/src/main/java/com/topjohnwu/magisk/model/adapters/ModulesAdapter.java
View file @
a6395d35
...
...
@@ -9,6 +9,9 @@ import android.widget.CheckBox;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
androidx.annotation.NonNull
;
import
androidx.recyclerview.widget.RecyclerView
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.model.entity.Module
;
...
...
@@ -17,8 +20,6 @@ import com.topjohnwu.superuser.Shell;
import
java.util.List
;
import
androidx.annotation.NonNull
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
public
class
ModulesAdapter
extends
RecyclerView
.
Adapter
<
ModulesAdapter
.
ViewHolder
>
{
...
...
app/src/main/java/com/topjohnwu/magisk/model/adapters/PolicyAdapter.java
View file @
a6395d35
...
...
@@ -9,6 +9,10 @@ import android.view.ViewGroup;
import
android.widget.ImageView
;
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.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.data.database.MagiskDB
;
...
...
@@ -23,9 +27,6 @@ import com.topjohnwu.magisk.view.dialogs.FingerprintAuthDialog;
import
java.util.List
;
import
androidx.annotation.NonNull
;
import
androidx.appcompat.widget.SwitchCompat
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
public
class
PolicyAdapter
extends
RecyclerView
.
Adapter
<
PolicyAdapter
.
ViewHolder
>
{
...
...
app/src/main/java/com/topjohnwu/magisk/model/adapters/ReposAdapter.java
View file @
a6395d35
...
...
@@ -13,6 +13,8 @@ import android.widget.ImageView;
import
android.widget.SearchView
;
import
android.widget.TextView
;
import
androidx.recyclerview.widget.RecyclerView
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.R
;
...
...
@@ -30,7 +32,6 @@ import java.util.Collections;
import
java.util.List
;
import
java.util.Map
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
java9.util.stream.StreamSupport
;
...
...
app/src/main/java/com/topjohnwu/magisk/model/adapters/StringListAdapter.java
View file @
a6395d35
...
...
@@ -7,13 +7,13 @@ import android.view.View;
import
android.view.ViewGroup
;
import
android.widget.TextView
;
import
java.util.List
;
import
androidx.annotation.IdRes
;
import
androidx.annotation.LayoutRes
;
import
androidx.annotation.NonNull
;
import
androidx.recyclerview.widget.RecyclerView
;
import
java.util.List
;
public
abstract
class
StringListAdapter
<
VH
extends
StringListAdapter
.
ViewHolder
>
extends
RecyclerView
.
Adapter
<
VH
>
{
...
...
app/src/main/java/com/topjohnwu/magisk/model/adapters/SuLogAdapter.java
View file @
a6395d35
...
...
@@ -9,6 +9,8 @@ import android.view.animation.RotateAnimation;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
androidx.recyclerview.widget.RecyclerView
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.data.database.MagiskDB
;
import
com.topjohnwu.magisk.model.entity.SuLogEntry
;
...
...
@@ -19,7 +21,6 @@ import java.util.HashSet;
import
java.util.List
;
import
java.util.Set
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
public
class
SuLogAdapter
extends
SectionedAdapter
<
SuLogAdapter
.
SectionHolder
,
SuLogAdapter
.
LogViewHolder
>
{
...
...
app/src/main/java/com/topjohnwu/magisk/model/adapters/TabFragmentAdapter.java
View file @
a6395d35
package
com
.
topjohnwu
.
magisk
.
model
.
adapters
;
import
java.util.ArrayList
;
import
java.util.List
;
import
androidx.fragment.app.Fragment
;
import
androidx.fragment.app.FragmentManager
;
import
androidx.fragment.app.FragmentPagerAdapter
;
import
java.util.ArrayList
;
import
java.util.List
;
public
class
TabFragmentAdapter
extends
FragmentPagerAdapter
{
private
List
<
Fragment
>
fragmentList
;
...
...
app/src/main/java/com/topjohnwu/magisk/model/download/DownloadModuleService.java
View file @
a6395d35
...
...
@@ -6,6 +6,8 @@ import android.content.Intent;
import
android.net.Uri
;
import
android.os.IBinder
;
import
androidx.annotation.Nullable
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Const
;
...
...
@@ -30,8 +32,6 @@ import java.util.zip.ZipEntry;
import
java.util.zip.ZipInputStream
;
import
java.util.zip.ZipOutputStream
;
import
androidx.annotation.Nullable
;
public
class
DownloadModuleService
extends
Service
{
private
List
<
ProgressNotification
>
notifications
;
...
...
app/src/main/java/com/topjohnwu/magisk/model/entity/BaseModule.java
View file @
a6395d35
...
...
@@ -5,10 +5,10 @@ import android.database.Cursor;
import
android.os.Parcel
;
import
android.os.Parcelable
;
import
java.util.List
;
import
androidx.annotation.NonNull
;
import
java.util.List
;
public
abstract
class
BaseModule
implements
Comparable
<
BaseModule
>,
Parcelable
{
private
String
mId
,
mName
,
mVersion
,
mAuthor
,
mDescription
;
...
...
app/src/main/java/com/topjohnwu/magisk/model/entity/Policy.java
View file @
a6395d35
...
...
@@ -4,10 +4,10 @@ import android.content.ContentValues;
import
android.content.pm.ApplicationInfo
;
import
android.content.pm.PackageManager
;
import
com.topjohnwu.magisk.utils.Utils
;
import
androidx.annotation.NonNull
;
import
com.topjohnwu.magisk.utils.Utils
;
public
class
Policy
implements
Comparable
<
Policy
>{
public
static
final
int
INTERACTIVE
=
0
;
...
...
app/src/main/java/com/topjohnwu/magisk/model/update/UpdateCheckService.java
View file @
a6395d35
package
com
.
topjohnwu
.
magisk
.
model
.
update
;
import
androidx.annotation.NonNull
;
import
androidx.work.ListenableWorker
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.Config
;
...
...
@@ -8,9 +11,6 @@ import com.topjohnwu.magisk.tasks.CheckUpdates;
import
com.topjohnwu.magisk.view.Notifications
;
import
com.topjohnwu.superuser.Shell
;
import
androidx.annotation.NonNull
;
import
androidx.work.ListenableWorker
;
public
class
UpdateCheckService
extends
DelegateWorker
{
@NonNull
...
...
app/src/main/java/com/topjohnwu/magisk/model/worker/DelegateWorker.java
View file @
a6395d35
...
...
@@ -4,12 +4,6 @@ import android.content.Context;
import
android.net.Network
;
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.NonNull
;
import
androidx.annotation.Nullable
;
...
...
@@ -17,6 +11,12 @@ import androidx.annotation.RequiresApi;
import
androidx.work.Data
;
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
{
private
ListenableWorker
worker
;
...
...
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.java
View file @
a6395d35
...
...
@@ -8,6 +8,13 @@ import android.view.Menu;
import
android.view.MenuItem
;
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.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
...
...
@@ -25,12 +32,6 @@ import com.topjohnwu.magisk.utils.Utils;
import
com.topjohnwu.net.Networking
;
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
;
public
class
MainActivity
extends
BaseActivity
...
...
app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.java
View file @
a6395d35
...
...
@@ -5,6 +5,8 @@ import android.content.pm.PackageManager;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
androidx.appcompat.app.AlertDialog
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
...
...
@@ -21,8 +23,6 @@ import com.topjohnwu.magisk.view.Shortcuts;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.superuser.Shell
;
import
androidx.appcompat.app.AlertDialog
;
public
class
SplashActivity
extends
BaseActivity
{
public
static
boolean
DONE
=
false
;
...
...
app/src/main/java/com/topjohnwu/magisk/ui/base/BaseActivity.java
View file @
a6395d35
...
...
@@ -11,13 +11,6 @@ import android.os.Bundle;
import
android.text.TextUtils
;
import
android.view.WindowManager
;
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.Event
;
import
com.topjohnwu.magisk.utils.LocaleManager
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.StyleRes
;
...
...
@@ -26,6 +19,13 @@ import androidx.collection.SparseArrayCompat;
import
androidx.core.app.ActivityCompat
;
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.Event
;
import
com.topjohnwu.magisk.utils.LocaleManager
;
public
abstract
class
BaseActivity
extends
AppCompatActivity
implements
Event
.
AutoListener
{
static
int
[]
EMPTY_INT_ARRAY
=
new
int
[
0
];
...
...
app/src/main/java/com/topjohnwu/magisk/ui/base/BaseFragment.java
View file @
a6395d35
...
...
@@ -2,10 +2,11 @@ package com.topjohnwu.magisk.ui.base;
import
android.content.Intent
;
import
androidx.fragment.app.Fragment
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.utils.Event
;
import
androidx.fragment.app.Fragment
;
import
butterknife.Unbinder
;
public
abstract
class
BaseFragment
extends
Fragment
implements
Event
.
AutoListener
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/base/BasePreferenceFragment.java
View file @
a6395d35
...
...
@@ -8,10 +8,6 @@ import android.view.LayoutInflater;
import
android.view.View
;
import
android.view.ViewGroup
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Event
;
import
androidx.preference.Preference
;
import
androidx.preference.PreferenceCategory
;
import
androidx.preference.PreferenceFragmentCompat
;
...
...
@@ -20,6 +16,10 @@ import androidx.preference.PreferenceScreen;
import
androidx.preference.PreferenceViewHolder
;
import
androidx.recyclerview.widget.RecyclerView
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Event
;
public
abstract
class
BasePreferenceFragment
extends
PreferenceFragmentCompat
implements
SharedPreferences
.
OnSharedPreferenceChangeListener
,
Event
.
AutoListener
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.java
View file @
a6395d35
...
...
@@ -8,6 +8,11 @@ import android.widget.Button;
import
android.widget.LinearLayout
;
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.Const
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.model.adapters.StringListAdapter
;
...
...
@@ -29,10 +34,6 @@ import java.util.Collections;
import
java.util.List
;
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.BindView
;
import
butterknife.OnClick
;
...
...
app/src/main/java/com/topjohnwu/magisk/ui/hide/MagiskHideFragment.java
View file @
a6395d35
...
...
@@ -9,16 +9,17 @@ import android.view.View;
import
android.view.ViewGroup
;
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.R
;
import
com.topjohnwu.magisk.model.adapters.ApplicationAdapter
;
import
com.topjohnwu.magisk.ui.base.BaseFragment
;
import
com.topjohnwu.magisk.utils.Event
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
androidx.swiperefreshlayout.widget.SwipeRefreshLayout
;
import
butterknife.BindView
;
public
class
MagiskHideFragment
extends
BaseFragment
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.java
View file @
a6395d35
...
...
@@ -9,6 +9,16 @@ import android.widget.CheckBox;
import
android.widget.ImageView
;
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.Config
;
import
com.topjohnwu.magisk.Const
;
...
...
@@ -34,15 +44,6 @@ import com.topjohnwu.superuser.Shell;
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.BindView
;
import
butterknife.OnClick
;
...
...
app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.java
View file @
a6395d35
...
...
@@ -7,13 +7,14 @@ import android.view.LayoutInflater;
import
android.view.View
;
import
android.view.ViewGroup
;
import
androidx.viewpager.widget.ViewPager
;
import
com.google.android.material.tabs.TabLayout
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.model.adapters.TabFragmentAdapter
;
import
com.topjohnwu.magisk.ui.MainActivity
;
import
com.topjohnwu.magisk.ui.base.BaseFragment
;
import
androidx.viewpager.widget.ViewPager
;
import
butterknife.BindView
;
public
class
LogFragment
extends
BaseFragment
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/log/MagiskLogFragment.java
View file @
a6395d35
...
...
@@ -8,6 +8,10 @@ import android.view.MenuItem;
import
android.view.View
;
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.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.R
;
...
...
@@ -23,9 +27,6 @@ import java.io.IOException;
import
java.util.Calendar
;
import
java.util.List
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
public
class
MagiskLogFragment
extends
BaseFragment
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/log/SuLogFragment.java
View file @
a6395d35
...
...
@@ -9,12 +9,13 @@ import android.view.View;
import
android.view.ViewGroup
;
import
android.widget.TextView
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.model.adapters.SuLogAdapter
;
import
com.topjohnwu.magisk.ui.base.BaseFragment
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
public
class
SuLogFragment
extends
BaseFragment
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/module/ModulesFragment.java
View file @
a6395d35
...
...
@@ -11,6 +11,11 @@ import android.view.View;
import
android.view.ViewGroup
;
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.Const
;
import
com.topjohnwu.magisk.R
;
...
...
@@ -27,10 +32,6 @@ import java.util.ArrayList;
import
java.util.List
;
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.OnClick
;
...
...
app/src/main/java/com/topjohnwu/magisk/ui/module/ReposFragment.java
View file @
a6395d35
...
...
@@ -11,6 +11,11 @@ import android.view.ViewGroup;
import
android.widget.SearchView
;
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.R
;
import
com.topjohnwu.magisk.model.adapters.ReposAdapter
;
...
...
@@ -18,10 +23,6 @@ import com.topjohnwu.magisk.tasks.UpdateRepos;
import
com.topjohnwu.magisk.ui.base.BaseFragment
;
import
com.topjohnwu.magisk.utils.Event
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
androidx.swiperefreshlayout.widget.SwipeRefreshLayout
;
import
butterknife.BindView
;
public
class
ReposFragment
extends
BaseFragment
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.java
View file @
a6395d35
...
...
@@ -8,6 +8,13 @@ import android.view.View;
import
android.widget.EditText
;
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.Config
;
import
com.topjohnwu.magisk.Const
;
...
...
@@ -28,13 +35,6 @@ import java.io.IOException;
import
java.util.Arrays
;
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
{
private
ListPreference
updateChannel
,
autoRes
,
suNotification
,
...
...
app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.java
View file @
a6395d35
...
...
@@ -7,6 +7,9 @@ import android.view.View;
import
android.view.ViewGroup
;
import
android.widget.TextView
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.model.adapters.PolicyAdapter
;
import
com.topjohnwu.magisk.model.entity.Policy
;
...
...
@@ -14,8 +17,6 @@ import com.topjohnwu.magisk.ui.base.BaseFragment;
import
java.util.List
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
public
class
SuperuserFragment
extends
BaseFragment
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.java
View file @
a6395d35
...
...
@@ -17,6 +17,9 @@ import android.widget.LinearLayout;
import
android.widget.Spinner
;
import
android.widget.TextView
;
import
androidx.annotation.Nullable
;
import
androidx.appcompat.content.res.AppCompatResources
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.Config
;
...
...
@@ -31,8 +34,6 @@ import java.io.IOException;
import
java.util.ArrayList
;
import
java.util.List
;
import
androidx.annotation.Nullable
;
import
androidx.appcompat.content.res.AppCompatResources
;
import
butterknife.BindView
;
import
java9.lang.Iterables
;
...
...
app/src/main/java/com/topjohnwu/magisk/utils/PatchAPK.java
View file @
a6395d35
...
...
@@ -3,6 +3,8 @@ package com.topjohnwu.magisk.utils;
import
android.content.ComponentName
;
import
android.widget.Toast
;
import
androidx.core.app.NotificationCompat
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.ClassMap
;
...
...
@@ -27,8 +29,6 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.jar.JarEntry
;
import
androidx.core.app.NotificationCompat
;
public
class
PatchAPK
{
public
static
final
String
LOWERALPHA
=
"abcdefghijklmnopqrstuvwxyz"
;
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
View file @
a6395d35
...
...
@@ -12,6 +12,12 @@ import android.net.Uri;
import
android.provider.OpenableColumns
;
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.App
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.ClassMap
;
...
...
@@ -30,12 +36,6 @@ import java.util.Locale;
import
java.util.Map
;
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
Utils
{
public
static
void
toast
(
CharSequence
msg
,
int
duration
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/utils/ValueSortedMap.java
View file @
a6395d35
package
com
.
topjohnwu
.
magisk
.
utils
;
import
androidx.annotation.NonNull
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.Collections
;
...
...
@@ -7,8 +9,6 @@ import java.util.HashMap;
import
java.util.List
;
import
java.util.Map
;
import
androidx.annotation.NonNull
;
public
class
ValueSortedMap
<
K
,
V
extends
Comparable
<?
super
V
>>
extends
HashMap
<
K
,
V
>
{
private
List
<
V
>
sorted
=
new
ArrayList
<>();
...
...
app/src/main/java/com/topjohnwu/magisk/view/MarkDownWindow.java
View file @
a6395d35
...
...
@@ -4,6 +4,8 @@ import android.app.Activity;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
androidx.appcompat.app.AlertDialog
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.ResponseListener
;
...
...
@@ -11,7 +13,6 @@ import com.topjohnwu.net.ResponseListener;
import
java.io.InputStream
;
import
java.util.Scanner
;
import
androidx.appcompat.app.AlertDialog
;
import
ru.noties.markwon.Markwon
;
import
ru.noties.markwon.html.HtmlPlugin
;
import
ru.noties.markwon.image.ImagesPlugin
;
...
...
app/src/main/java/com/topjohnwu/magisk/view/Notifications.java
View file @
a6395d35
...
...
@@ -7,6 +7,10 @@ import android.content.Context;
import
android.content.Intent
;
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.ClassMap
;
import
com.topjohnwu.magisk.Config
;
...
...
@@ -16,10 +20,6 @@ import com.topjohnwu.magisk.model.receiver.GeneralReceiver;
import
com.topjohnwu.magisk.ui.SplashActivity
;
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
static
NotificationManagerCompat
mgr
=
NotificationManagerCompat
.
from
(
App
.
self
);
...
...
app/src/main/java/com/topjohnwu/magisk/view/ProgressNotification.java
View file @
a6395d35
...
...
@@ -5,13 +5,13 @@ import android.app.PendingIntent;
import
android.content.Intent
;
import
android.widget.Toast
;
import
androidx.core.app.NotificationCompat
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.net.DownloadProgressListener
;
import
androidx.core.app.NotificationCompat
;
public
class
ProgressNotification
implements
DownloadProgressListener
{
private
NotificationCompat
.
Builder
builder
;
...
...
app/src/main/java/com/topjohnwu/magisk/view/SafetyNet.java
View file @
a6395d35
...
...
@@ -10,6 +10,9 @@ import android.widget.ImageView;
import
android.widget.ProgressBar
;
import
android.widget.TextView
;
import
androidx.annotation.StringRes
;
import
androidx.cardview.widget.CardView
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.R
;
...
...
@@ -20,8 +23,6 @@ import com.topjohnwu.superuser.Shell;
import
java.io.File
;
import
androidx.annotation.StringRes
;
import
androidx.cardview.widget.CardView
;
import
butterknife.BindColor
;
import
butterknife.BindView
;
import
butterknife.OnClick
;
...
...
app/src/main/java/com/topjohnwu/magisk/view/Shortcuts.java
View file @
a6395d35
...
...
@@ -7,6 +7,8 @@ import android.content.pm.ShortcutManager;
import
android.graphics.drawable.Icon
;
import
android.os.Build
;
import
androidx.annotation.RequiresApi
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
...
...
@@ -17,8 +19,6 @@ import com.topjohnwu.superuser.Shell;
import
java.util.ArrayList
;
import
androidx.annotation.RequiresApi
;
public
class
Shortcuts
{
public
static
void
setup
(
Context
context
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/view/SnackbarMaker.java
View file @
a6395d35
...
...
@@ -5,12 +5,12 @@ import android.net.Uri;
import
android.view.View
;
import
android.widget.TextView
;
import
androidx.annotation.StringRes
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Utils
;
import
androidx.annotation.StringRes
;
public
class
SnackbarMaker
{
public
static
Snackbar
make
(
Activity
activity
,
CharSequence
text
,
int
duration
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/view/dialogs/CustomAlertDialog.java
View file @
a6395d35
...
...
@@ -8,13 +8,14 @@ import android.widget.Button;
import
android.widget.LinearLayout
;
import
android.widget.TextView
;
import
com.topjohnwu.magisk.R
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.StringRes
;
import
androidx.annotation.StyleRes
;
import
androidx.appcompat.app.AlertDialog
;
import
com.topjohnwu.magisk.R
;
import
butterknife.BindView
;
public
class
CustomAlertDialog
extends
AlertDialog
.
Builder
{
...
...
app/src/main/java/com/topjohnwu/magisk/view/dialogs/EnvFixDialog.java
View file @
a6395d35
...
...
@@ -4,6 +4,8 @@ import android.app.Activity;
import
android.app.ProgressDialog
;
import
android.widget.Toast
;
import
androidx.annotation.NonNull
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.tasks.MagiskInstaller
;
import
com.topjohnwu.magisk.utils.RootUtils
;
...
...
@@ -12,8 +14,6 @@ import com.topjohnwu.superuser.Shell;
import
com.topjohnwu.superuser.internal.UiThreadHandler
;
import
com.topjohnwu.superuser.io.SuFile
;
import
androidx.annotation.NonNull
;
public
class
EnvFixDialog
extends
CustomAlertDialog
{
public
EnvFixDialog
(
@NonNull
Activity
activity
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/view/dialogs/FingerprintAuthDialog.java
View file @
a6395d35
...
...
@@ -11,13 +11,13 @@ import android.os.Build;
import
android.view.Gravity
;
import
android.widget.Toast
;
import
androidx.annotation.NonNull
;
import
androidx.appcompat.app.AlertDialog
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.FingerprintHelper
;
import
com.topjohnwu.magisk.utils.Utils
;
import
androidx.annotation.NonNull
;
import
androidx.appcompat.app.AlertDialog
;
@TargetApi
(
Build
.
VERSION_CODES
.
M
)
public
class
FingerprintAuthDialog
extends
CustomAlertDialog
{
...
...
app/src/main/java/com/topjohnwu/magisk/view/dialogs/InstallMethodDialog.java
View file @
a6395d35
...
...
@@ -4,6 +4,8 @@ import android.app.Activity;
import
android.content.Intent
;
import
android.widget.Toast
;
import
androidx.appcompat.app.AlertDialog
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
...
...
@@ -19,8 +21,6 @@ import com.topjohnwu.net.Networking;
import
java.io.File
;
import
java.util.List
;
import
androidx.appcompat.app.AlertDialog
;
class
InstallMethodDialog
extends
AlertDialog
.
Builder
{
InstallMethodDialog
(
BaseActivity
activity
,
List
<
String
>
options
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/view/dialogs/ManagerInstallDialog.java
View file @
a6395d35
...
...
@@ -3,14 +3,14 @@ package com.topjohnwu.magisk.view.dialogs;
import
android.app.Activity
;
import
android.text.TextUtils
;
import
androidx.annotation.NonNull
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.DownloadApp
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.magisk.view.MarkDownWindow
;
import
androidx.annotation.NonNull
;
public
class
ManagerInstallDialog
extends
CustomAlertDialog
{
public
ManagerInstallDialog
(
@NonNull
Activity
a
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/view/dialogs/UninstallDialog.java
View file @
a6395d35
...
...
@@ -7,6 +7,8 @@ import android.net.Uri;
import
android.text.TextUtils
;
import
android.widget.Toast
;
import
androidx.annotation.NonNull
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
...
...
@@ -19,8 +21,6 @@ import com.topjohnwu.superuser.Shell;
import
java.io.File
;
import
androidx.annotation.NonNull
;
public
class
UninstallDialog
extends
CustomAlertDialog
{
public
UninstallDialog
(
@NonNull
Activity
activity
)
{
...
...
build.gradle
View file @
a6395d35
...
...
@@ -15,7 +15,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools:r8:1.4.79'
classpath
'com.android.tools.build:gradle:3.
3.2
'
classpath
'com.android.tools.build:gradle:3.
5.0-alpha10
'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.21"
...
...
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