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
06594949
Commit
06594949
authored
Sep 10, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate to AndroidX support library
parent
39c82576
Hide whitespace changes
Inline
Side-by-side
Showing
67 changed files
with
199 additions
and
169 deletions
+199
-169
build.gradle
app/build.gradle
+12
-8
AboutActivity.java
app/src/full/java/com/topjohnwu/magisk/AboutActivity.java
+3
-3
DonationActivity.java
app/src/full/java/com/topjohnwu/magisk/DonationActivity.java
+3
-3
FlashActivity.java
app/src/full/java/com/topjohnwu/magisk/FlashActivity.java
+2
-2
MainActivity.java
app/src/full/java/com/topjohnwu/magisk/MainActivity.java
+7
-7
NoUIActivity.java
app/src/full/java/com/topjohnwu/magisk/NoUIActivity.java
+2
-2
ApplicationAdapter.java
...ava/com/topjohnwu/magisk/adapters/ApplicationAdapter.java
+2
-2
ModulesAdapter.java
...ll/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java
+2
-2
PolicyAdapter.java
...ull/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java
+2
-2
ReposAdapter.java
...full/java/com/topjohnwu/magisk/adapters/ReposAdapter.java
+1
-1
SectionedAdapter.java
.../java/com/topjohnwu/magisk/adapters/SectionedAdapter.java
+2
-1
SuLogAdapter.java
...full/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java
+1
-1
TabFragmentAdapter.java
...ava/com/topjohnwu/magisk/adapters/TabFragmentAdapter.java
+4
-4
InstallMagisk.java
.../full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
+2
-1
MarkDownWindow.java
...full/java/com/topjohnwu/magisk/asyncs/MarkDownWindow.java
+2
-1
ProcessRepoZip.java
...full/java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java
+2
-1
BaseFragment.java
...ll/java/com/topjohnwu/magisk/components/BaseFragment.java
+2
-1
CustomAlertDialog.java
...va/com/topjohnwu/magisk/components/CustomAlertDialog.java
+5
-5
EnvFixDialog.java
...ll/java/com/topjohnwu/magisk/components/EnvFixDialog.java
+2
-1
FlavorActivity.java
.../java/com/topjohnwu/magisk/components/FlavorActivity.java
+4
-3
InstallMethodDialog.java
.../com/topjohnwu/magisk/components/InstallMethodDialog.java
+3
-2
ManagerInstallDialog.java
...com/topjohnwu/magisk/components/ManagerInstallDialog.java
+2
-1
SnackbarMaker.java
...l/java/com/topjohnwu/magisk/components/SnackbarMaker.java
+4
-3
UninstallDialog.java
...java/com/topjohnwu/magisk/components/UninstallDialog.java
+2
-1
BaseModule.java
.../full/java/com/topjohnwu/magisk/container/BaseModule.java
+2
-1
Policy.java
app/src/full/java/com/topjohnwu/magisk/container/Policy.java
+2
-1
ValueSortedMap.java
...l/java/com/topjohnwu/magisk/container/ValueSortedMap.java
+2
-2
MagiskDatabaseHelper.java
...a/com/topjohnwu/magisk/database/MagiskDatabaseHelper.java
+2
-1
LogFragment.java
...full/java/com/topjohnwu/magisk/fragments/LogFragment.java
+2
-2
MagiskFragment.java
...l/java/com/topjohnwu/magisk/fragments/MagiskFragment.java
+5
-5
MagiskHideFragment.java
...va/com/topjohnwu/magisk/fragments/MagiskHideFragment.java
+4
-4
MagiskLogFragment.java
...ava/com/topjohnwu/magisk/fragments/MagiskLogFragment.java
+2
-2
ModulesFragment.java
.../java/com/topjohnwu/magisk/fragments/ModulesFragment.java
+4
-4
ReposFragment.java
...ll/java/com/topjohnwu/magisk/fragments/ReposFragment.java
+4
-4
SettingsFragment.java
...java/com/topjohnwu/magisk/fragments/SettingsFragment.java
+8
-7
SuLogFragment.java
...ll/java/com/topjohnwu/magisk/fragments/SuLogFragment.java
+2
-2
SuperuserFragment.java
...ava/com/topjohnwu/magisk/fragments/SuperuserFragment.java
+2
-2
ShortcutReceiver.java
...java/com/topjohnwu/magisk/receivers/ShortcutReceiver.java
+2
-1
OnBootService.java
...ull/java/com/topjohnwu/magisk/services/OnBootService.java
+3
-2
BootSigner.java
app/src/full/java/com/topjohnwu/magisk/utils/BootSigner.java
+2
-2
ISafetyNetHelper.java
...ull/java/com/topjohnwu/magisk/utils/ISafetyNetHelper.java
+1
-1
LocaleManager.java
...c/full/java/com/topjohnwu/magisk/utils/LocaleManager.java
+2
-1
NotificationMgr.java
...full/java/com/topjohnwu/magisk/utils/NotificationMgr.java
+3
-2
RootUtils.java
app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java
+2
-1
Topic.java
app/src/full/java/com/topjohnwu/magisk/utils/Topic.java
+2
-2
activity_about.xml
app/src/full/res/layout/activity_about.xml
+2
-2
activity_donation.xml
app/src/full/res/layout/activity_donation.xml
+2
-2
activity_main.xml
app/src/full/res/layout/activity_main.xml
+3
-3
fragment_log.xml
app/src/full/res/layout/fragment_log.xml
+3
-3
fragment_magisk.xml
app/src/full/res/layout/fragment_magisk.xml
+14
-14
fragment_magisk_hide.xml
app/src/full/res/layout/fragment_magisk_hide.xml
+4
-4
fragment_modules.xml
app/src/full/res/layout/fragment_modules.xml
+7
-7
fragment_repos.xml
app/src/full/res/layout/fragment_repos.xml
+4
-4
fragment_su_log.xml
app/src/full/res/layout/fragment_su_log.xml
+2
-2
fragment_superuser.xml
app/src/full/res/layout/fragment_superuser.xml
+2
-2
list_item_app.xml
app/src/full/res/layout/list_item_app.xml
+2
-2
list_item_module.xml
app/src/full/res/layout/list_item_module.xml
+2
-2
list_item_policy.xml
app/src/full/res/layout/list_item_policy.xml
+2
-2
list_item_repo.xml
app/src/full/res/layout/list_item_repo.xml
+2
-2
list_item_sulog.xml
app/src/full/res/layout/list_item_sulog.xml
+2
-2
toolbar.xml
app/src/full/res/layout/toolbar.xml
+1
-1
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-1
BaseActivity.java
...in/java/com/topjohnwu/magisk/components/BaseActivity.java
+5
-4
ManagerInstall.java
...n/java/com/topjohnwu/magisk/receivers/ManagerInstall.java
+2
-1
build.gradle
build.gradle
+1
-1
gradle.properties
gradle.properties
+4
-0
SafetyNetHelper.java
snet/src/main/java/com/topjohnwu/snet/SafetyNetHelper.java
+1
-1
No files found.
app/build.gradle
View file @
06594949
...
...
@@ -68,17 +68,21 @@ android {
}
}
repositories
{
maven
{
url
"https://oss.sonatype.org/content/repositories/snapshots"
}
}
dependencies
{
implementation
fileTree
(
include:
[
'*.jar'
],
dir:
'libs'
)
fullImplementation
project
(
':utils'
)
implementation
"
com.android.support:support-core-utils:${rootProject.ext.supportLib
Version}"
fullImplementation
"
com.android.support:preference-v7:${rootProject.ext.supportLib
Version}"
fullImplementation
"
com.android.support:recyclerview-v7:${rootProject.ext.supportLib
Version}"
fullImplementation
"
com.android.support:cardview-v7:${rootProject.ext.supportLib
Version}"
fullImplementation
"com.
android.support:design:${rootProject.ext.supportLib
Version}"
fullImplementation
'com.github.topjohnwu:libsu:2.0.
1
'
implementation
"
androidx.core:core:${rootProject.ext.androidX
Version}"
fullImplementation
"
androidx.preference:preference:${rootProject.ext.androidX
Version}"
fullImplementation
"
androidx.recyclerview:recyclerview:${rootProject.ext.androidX
Version}"
fullImplementation
"
androidx.cardview:cardview:${rootProject.ext.androidX
Version}"
fullImplementation
"com.
google.android.material:material:${rootProject.ext.androidX
Version}"
fullImplementation
'com.github.topjohnwu:libsu:2.0.
2
'
fullImplementation
'com.atlassian.commonmark:commonmark:0.11.0'
fullImplementation
'org.kamranzafar:jtar:2.3'
fullImplementation
'com.jakewharton:butterknife:
8.8.1
'
fullAnnotationProcessor
'com.jakewharton:butterknife-compiler:
8.8.1
'
fullImplementation
'com.jakewharton:butterknife:
9.0.0-SNAPSHOT
'
fullAnnotationProcessor
'com.jakewharton:butterknife-compiler:
9.0.0-SNAPSHOT
'
}
app/src/full/java/com/topjohnwu/magisk/AboutActivity.java
View file @
06594949
...
...
@@ -2,9 +2,6 @@ package com.topjohnwu.magisk;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.support.annotation.Nullable
;
import
android.support.v7.app.ActionBar
;
import
android.support.v7.widget.Toolbar
;
import
android.text.TextUtils
;
import
android.view.View
;
...
...
@@ -15,6 +12,9 @@ import com.topjohnwu.magisk.utils.Utils;
import
java.util.Locale
;
import
androidx.annotation.Nullable
;
import
androidx.appcompat.app.ActionBar
;
import
androidx.appcompat.widget.Toolbar
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
...
...
app/src/full/java/com/topjohnwu/magisk/DonationActivity.java
View file @
06594949
...
...
@@ -2,14 +2,14 @@ package com.topjohnwu.magisk;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.support.annotation.Nullable
;
import
android.support.v7.app.ActionBar
;
import
android.support.v7.widget.Toolbar
;
import
com.topjohnwu.magisk.components.AboutCardRow
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.utils.Utils
;
import
androidx.annotation.Nullable
;
import
androidx.appcompat.app.ActionBar
;
import
androidx.appcompat.widget.Toolbar
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
...
...
app/src/full/java/com/topjohnwu/magisk/FlashActivity.java
View file @
06594949
...
...
@@ -4,8 +4,6 @@ import android.Manifest;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.support.v7.app.ActionBar
;
import
android.support.v7.widget.Toolbar
;
import
android.text.TextUtils
;
import
android.view.View
;
import
android.widget.Button
;
...
...
@@ -31,6 +29,8 @@ import java.util.Calendar;
import
java.util.List
;
import
java.util.Locale
;
import
androidx.appcompat.app.ActionBar
;
import
androidx.appcompat.widget.Toolbar
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
butterknife.OnClick
;
...
...
app/src/full/java/com/topjohnwu/magisk/MainActivity.java
View file @
06594949
...
...
@@ -3,17 +3,11 @@ package com.topjohnwu.magisk;
import
android.content.Intent
;
import
android.os.Bundle
;
import
android.os.Handler
;
import
android.support.annotation.NonNull
;
import
android.support.design.widget.NavigationView
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.FragmentTransaction
;
import
android.support.v4.widget.DrawerLayout
;
import
android.support.v7.app.ActionBarDrawerToggle
;
import
android.support.v7.widget.Toolbar
;
import
android.view.Menu
;
import
android.view.MenuItem
;
import
android.view.View
;
import
com.google.android.material.navigation.NavigationView
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.fragments.LogFragment
;
import
com.topjohnwu.magisk.fragments.MagiskFragment
;
...
...
@@ -26,6 +20,12 @@ import com.topjohnwu.magisk.utils.Download;
import
com.topjohnwu.magisk.utils.Topic
;
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.ButterKnife
;
...
...
app/src/full/java/com/topjohnwu/magisk/NoUIActivity.java
View file @
06594949
package
com
.
topjohnwu
.
magisk
;
import
android.support.annotation.NonNull
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
androidx.annotation.NonNull
;
public
class
NoUIActivity
extends
BaseActivity
{
@Override
public
void
onRequestPermissionsResult
(
int
requestCode
,
@NonNull
String
[]
permissions
,
@NonNull
int
[]
grantResults
)
{
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java
View file @
06594949
...
...
@@ -6,8 +6,6 @@ import android.content.pm.PackageManager;
import
android.content.res.Configuration
;
import
android.content.res.Resources
;
import
android.os.AsyncTask
;
import
android.support.annotation.NonNull
;
import
android.support.v7.widget.RecyclerView
;
import
android.text.TextUtils
;
import
android.view.LayoutInflater
;
import
android.view.View
;
...
...
@@ -28,6 +26,8 @@ import java.util.Collections;
import
java.util.Iterator
;
import
java.util.List
;
import
androidx.annotation.NonNull
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java
View file @
06594949
package
com
.
topjohnwu
.
magisk
.
adapters
;
import
android.content.Context
;
import
android.support.design.widget.Snackbar
;
import
android.support.v7.widget.RecyclerView
;
import
android.text.TextUtils
;
import
android.view.LayoutInflater
;
import
android.view.View
;
...
...
@@ -11,6 +9,7 @@ import android.widget.CheckBox;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.components.SnackbarMaker
;
import
com.topjohnwu.magisk.container.Module
;
...
...
@@ -18,6 +17,7 @@ import com.topjohnwu.superuser.Shell;
import
java.util.List
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java
View file @
06594949
...
...
@@ -2,8 +2,6 @@ package com.topjohnwu.magisk.adapters;
import
android.app.Activity
;
import
android.content.pm.PackageManager
;
import
android.support.design.widget.Snackbar
;
import
android.support.v7.widget.RecyclerView
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -11,6 +9,7 @@ import android.widget.ImageView;
import
android.widget.Switch
;
import
android.widget.TextView
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.components.CustomAlertDialog
;
import
com.topjohnwu.magisk.components.ExpandableView
;
...
...
@@ -22,6 +21,7 @@ import java.util.HashSet;
import
java.util.List
;
import
java.util.Set
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/ReposAdapter.java
View file @
06594949
...
...
@@ -2,7 +2,6 @@ package com.topjohnwu.magisk.adapters;
import
android.content.Context
;
import
android.database.Cursor
;
import
android.support.v7.widget.RecyclerView
;
import
android.text.TextUtils
;
import
android.util.Pair
;
import
android.view.LayoutInflater
;
...
...
@@ -25,6 +24,7 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.Map
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/SectionedAdapter.java
View file @
06594949
package
com
.
topjohnwu
.
magisk
.
adapters
;
import
android.support.v7.widget.RecyclerView
;
import
android.view.ViewGroup
;
import
androidx.recyclerview.widget.RecyclerView
;
public
abstract
class
SectionedAdapter
<
S
extends
RecyclerView
.
ViewHolder
,
C
extends
RecyclerView
.
ViewHolder
>
extends
RecyclerView
.
Adapter
<
RecyclerView
.
ViewHolder
>
{
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java
View file @
06594949
package
com
.
topjohnwu
.
magisk
.
adapters
;
import
android.database.Cursor
;
import
android.support.v7.widget.RecyclerView
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -20,6 +19,7 @@ import java.util.HashSet;
import
java.util.List
;
import
java.util.Set
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/TabFragmentAdapter.java
View file @
06594949
package
com
.
topjohnwu
.
magisk
.
adapters
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.FragmentManager
;
import
android.support.v4.app.FragmentPagerAdapter
;
import
java.util.ArrayList
;
import
java.util.List
;
import
androidx.fragment.app.Fragment
;
import
androidx.fragment.app.FragmentManager
;
import
androidx.fragment.app.FragmentPagerAdapter
;
public
class
TabFragmentAdapter
extends
FragmentPagerAdapter
{
private
List
<
Fragment
>
fragmentList
;
...
...
app/src/full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
View file @
06594949
...
...
@@ -4,7 +4,6 @@ import android.app.Activity;
import
android.app.ProgressDialog
;
import
android.net.Uri
;
import
android.os.Build
;
import
android.support.annotation.NonNull
;
import
android.text.TextUtils
;
import
android.view.View
;
import
android.widget.Toast
;
...
...
@@ -44,6 +43,8 @@ import java.net.HttpURLConnection;
import
java.util.Arrays
;
import
java.util.List
;
import
androidx.annotation.NonNull
;
public
class
InstallMagisk
extends
ParallelTask
<
Void
,
Void
,
Boolean
>
{
private
static
final
int
PATCH_MODE
=
0
;
...
...
app/src/full/java/com/topjohnwu/magisk/asyncs/MarkDownWindow.java
View file @
06594949
package
com
.
topjohnwu
.
magisk
.
asyncs
;
import
android.app.Activity
;
import
android.support.v7.app.AlertDialog
;
import
android.webkit.WebView
;
import
com.topjohnwu.magisk.Data
;
...
...
@@ -18,6 +17,8 @@ import java.io.ByteArrayOutputStream;
import
java.io.IOException
;
import
java.io.InputStream
;
import
androidx.appcompat.app.AlertDialog
;
public
class
MarkDownWindow
extends
ParallelTask
<
Void
,
Void
,
String
>
{
private
String
mTitle
;
...
...
app/src/full/java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java
View file @
06594949
...
...
@@ -4,7 +4,6 @@ import android.Manifest;
import
android.app.ProgressDialog
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.support.annotation.NonNull
;
import
android.widget.Toast
;
import
com.topjohnwu.magisk.Const
;
...
...
@@ -35,6 +34,8 @@ import java.util.jar.JarEntry;
import
java.util.jar.JarInputStream
;
import
java.util.jar.JarOutputStream
;
import
androidx.annotation.NonNull
;
public
class
ProcessRepoZip
extends
ParallelTask
<
Void
,
Object
,
Boolean
>
{
private
ProgressDialog
progressDialog
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/BaseFragment.java
View file @
06594949
package
com
.
topjohnwu
.
magisk
.
components
;
import
android.content.Intent
;
import
android.support.v4.app.Fragment
;
import
com.topjohnwu.magisk.Data
;
import
com.topjohnwu.magisk.MagiskManager
;
import
com.topjohnwu.magisk.utils.Topic
;
import
androidx.fragment.app.Fragment
;
public
class
BaseFragment
extends
Fragment
implements
Topic
.
AutoSubscriber
{
public
MagiskManager
mm
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/CustomAlertDialog.java
View file @
06594949
...
...
@@ -2,11 +2,6 @@ package com.topjohnwu.magisk.components;
import
android.app.Activity
;
import
android.content.DialogInterface
;
import
android.support.annotation.NonNull
;
import
android.support.annotation.Nullable
;
import
android.support.annotation.StringRes
;
import
android.support.annotation.StyleRes
;
import
android.support.v7.app.AlertDialog
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.widget.Button
;
...
...
@@ -15,6 +10,11 @@ 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
butterknife.BindView
;
import
butterknife.ButterKnife
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/EnvFixDialog.java
View file @
06594949
package
com
.
topjohnwu
.
magisk
.
components
;
import
android.app.Activity
;
import
android.support.annotation.NonNull
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.asyncs.InstallMagisk
;
import
androidx.annotation.NonNull
;
public
class
EnvFixDialog
extends
CustomAlertDialog
{
public
EnvFixDialog
(
@NonNull
Activity
activity
)
{
...
...
app/src/full/java/com/topjohnwu/magisk/components/FlavorActivity.java
View file @
06594949
...
...
@@ -4,9 +4,6 @@ import android.content.Context;
import
android.content.Intent
;
import
android.content.res.Configuration
;
import
android.os.Bundle
;
import
android.support.annotation.Nullable
;
import
android.support.annotation.StyleRes
;
import
android.support.v7.app.AppCompatActivity
;
import
android.view.WindowManager
;
import
com.topjohnwu.magisk.Data
;
...
...
@@ -15,6 +12,10 @@ import com.topjohnwu.magisk.R;
import
com.topjohnwu.magisk.utils.LocaleManager
;
import
com.topjohnwu.magisk.utils.Topic
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.StyleRes
;
import
androidx.appcompat.app.AppCompatActivity
;
public
abstract
class
FlavorActivity
extends
AppCompatActivity
implements
Topic
.
AutoSubscriber
{
private
ActivityResultListener
activityResultListener
;
...
...
app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java
View file @
06594949
...
...
@@ -3,10 +3,9 @@ package com.topjohnwu.magisk.components;
import
android.content.Context
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.support.design.widget.Snackbar
;
import
android.support.v7.app.AlertDialog
;
import
android.widget.Toast
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Data
;
import
com.topjohnwu.magisk.FlashActivity
;
...
...
@@ -17,6 +16,8 @@ import com.topjohnwu.magisk.utils.Utils;
import
java.util.List
;
import
androidx.appcompat.app.AlertDialog
;
class
InstallMethodDialog
extends
AlertDialog
.
Builder
{
InstallMethodDialog
(
BaseActivity
activity
,
List
<
String
>
options
)
{
...
...
app/src/full/java/com/topjohnwu/magisk/components/ManagerInstallDialog.java
View file @
06594949
...
...
@@ -2,7 +2,6 @@ package com.topjohnwu.magisk.components;
import
android.Manifest
;
import
android.content.Intent
;
import
android.support.annotation.NonNull
;
import
android.text.TextUtils
;
import
com.topjohnwu.magisk.Const
;
...
...
@@ -13,6 +12,8 @@ import com.topjohnwu.magisk.asyncs.MarkDownWindow;
import
com.topjohnwu.magisk.receivers.ManagerUpdate
;
import
com.topjohnwu.magisk.utils.Utils
;
import
androidx.annotation.NonNull
;
public
class
ManagerInstallDialog
extends
CustomAlertDialog
{
public
ManagerInstallDialog
(
@NonNull
BaseActivity
activity
)
{
...
...
app/src/full/java/com/topjohnwu/magisk/components/SnackbarMaker.java
View file @
06594949
...
...
@@ -2,14 +2,15 @@ package com.topjohnwu.magisk.components;
import
android.app.Activity
;
import
android.net.Uri
;
import
android.support.annotation.StringRes
;
import
android.support.design.widget.Snackbar
;
import
android.view.View
;
import
android.widget.TextView
;
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
)
{
...
...
@@ -34,7 +35,7 @@ public class SnackbarMaker {
}
private
static
void
setup
(
Snackbar
snack
)
{
TextView
text
=
snack
.
getView
().
findViewById
(
android
.
support
.
design
.
R
.
id
.
snackbar_text
);
TextView
text
=
snack
.
getView
().
findViewById
(
com
.
google
.
android
.
material
.
R
.
id
.
snackbar_text
);
text
.
setMaxLines
(
Integer
.
MAX_VALUE
);
}
...
...
app/src/full/java/com/topjohnwu/magisk/components/UninstallDialog.java
View file @
06594949
...
...
@@ -5,7 +5,6 @@ import android.app.ProgressDialog;
import
android.content.Context
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.support.annotation.NonNull
;
import
android.text.TextUtils
;
import
android.widget.Toast
;
...
...
@@ -19,6 +18,8 @@ import com.topjohnwu.magisk.utils.Download;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.superuser.Shell
;
import
androidx.annotation.NonNull
;
public
class
UninstallDialog
extends
CustomAlertDialog
{
public
UninstallDialog
(
@NonNull
Activity
activity
)
{
...
...
app/src/full/java/com/topjohnwu/magisk/container/BaseModule.java
View file @
06594949
...
...
@@ -3,10 +3,11 @@ package com.topjohnwu.magisk.container;
import
android.content.ContentValues
;
import
android.database.Cursor
;
import
android.support.annotation.NonNull
;
import
java.util.List
;
import
androidx.annotation.NonNull
;
public
abstract
class
BaseModule
implements
Comparable
<
BaseModule
>
{
private
String
mId
=
null
,
mName
,
mVersion
,
mAuthor
,
mDescription
;
...
...
app/src/full/java/com/topjohnwu/magisk/container/Policy.java
View file @
06594949
...
...
@@ -4,7 +4,8 @@ import android.content.ContentValues;
import
android.content.pm.ApplicationInfo
;
import
android.content.pm.PackageManager
;
import
android.database.Cursor
;
import
android.support.annotation.NonNull
;
import
androidx.annotation.NonNull
;
public
class
Policy
implements
Comparable
<
Policy
>{
...
...
app/src/full/java/com/topjohnwu/magisk/container/ValueSortedMap.java
View file @
06594949
package
com
.
topjohnwu
.
magisk
.
container
;
import
android.support.annotation.NonNull
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.Collections
;
...
...
@@ -9,6 +7,8 @@ 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/full/java/com/topjohnwu/magisk/database/MagiskDatabaseHelper.java
View file @
06594949
...
...
@@ -7,7 +7,6 @@ import android.database.Cursor;
import
android.database.sqlite.SQLiteDatabase
;
import
android.os.Build
;
import
android.os.Process
;
import
android.support.annotation.NonNull
;
import
android.text.TextUtils
;
import
android.widget.Toast
;
...
...
@@ -29,6 +28,8 @@ import java.util.Collections;
import
java.util.Date
;
import
java.util.List
;
import
androidx.annotation.NonNull
;
public
class
MagiskDatabaseHelper
{
private
static
final
int
DATABASE_VER
=
6
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/LogFragment.java
View file @
06594949
...
...
@@ -2,12 +2,11 @@ package com.topjohnwu.magisk.fragments;
import
android.os.Bundle
;
import
android.support.design.widget.TabLayout
;
import
android.support.v4.view.ViewPager
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
com.google.android.material.tabs.TabLayout
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Data
;
import
com.topjohnwu.magisk.MainActivity
;
...
...
@@ -15,6 +14,7 @@ import com.topjohnwu.magisk.R;
import
com.topjohnwu.magisk.adapters.TabFragmentAdapter
;
import
com.topjohnwu.magisk.components.BaseFragment
;
import
androidx.viewpager.widget.ViewPager
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
butterknife.Unbinder
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/MagiskFragment.java
View file @
06594949
...
...
@@ -5,11 +5,6 @@ import android.content.Context;
import
android.content.pm.PackageInfo
;
import
android.content.pm.PackageManager
;
import
android.os.Bundle
;
import
android.support.annotation.NonNull
;
import
android.support.annotation.Nullable
;
import
android.support.annotation.StringRes
;
import
android.support.v4.widget.SwipeRefreshLayout
;
import
android.support.v7.widget.CardView
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -41,6 +36,11 @@ import com.topjohnwu.magisk.utils.Topic;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.ShellUtils
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.StringRes
;
import
androidx.cardview.widget.CardView
;
import
androidx.swiperefreshlayout.widget.SwipeRefreshLayout
;
import
butterknife.BindColor
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/MagiskHideFragment.java
View file @
06594949
package
com
.
topjohnwu
.
magisk
.
fragments
;
import
android.os.Bundle
;
import
android.support.annotation.NonNull
;
import
android.support.annotation.Nullable
;
import
android.support.v4.widget.SwipeRefreshLayout
;
import
android.support.v7.widget.RecyclerView
;
import
android.view.LayoutInflater
;
import
android.view.Menu
;
import
android.view.MenuInflater
;
...
...
@@ -17,6 +13,10 @@ import com.topjohnwu.magisk.adapters.ApplicationAdapter;
import
com.topjohnwu.magisk.components.BaseFragment
;
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.ButterKnife
;
import
butterknife.Unbinder
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/MagiskLogFragment.java
View file @
06594949
...
...
@@ -2,8 +2,6 @@ package com.topjohnwu.magisk.fragments;
import
android.Manifest
;
import
android.os.Bundle
;
import
android.support.annotation.Nullable
;
import
android.support.design.widget.Snackbar
;
import
android.text.TextUtils
;
import
android.view.LayoutInflater
;
import
android.view.Menu
;
...
...
@@ -16,6 +14,7 @@ import android.widget.ProgressBar;
import
android.widget.ScrollView
;
import
android.widget.TextView
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.components.BaseFragment
;
...
...
@@ -28,6 +27,7 @@ import java.io.File;
import
java.io.IOException
;
import
java.util.Calendar
;
import
androidx.annotation.Nullable
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
butterknife.Unbinder
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/ModulesFragment.java
View file @
06594949
...
...
@@ -4,10 +4,6 @@ import android.Manifest;
import
android.app.Activity
;
import
android.content.Intent
;
import
android.os.Bundle
;
import
android.support.annotation.NonNull
;
import
android.support.annotation.Nullable
;
import
android.support.v4.widget.SwipeRefreshLayout
;
import
android.support.v7.widget.RecyclerView
;
import
android.view.LayoutInflater
;
import
android.view.Menu
;
import
android.view.MenuInflater
;
...
...
@@ -30,6 +26,10 @@ 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.ButterKnife
;
import
butterknife.OnClick
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/ReposFragment.java
View file @
06594949
...
...
@@ -2,10 +2,6 @@ package com.topjohnwu.magisk.fragments;
import
android.app.AlertDialog
;
import
android.os.Bundle
;
import
android.support.annotation.NonNull
;
import
android.support.annotation.Nullable
;
import
android.support.v4.widget.SwipeRefreshLayout
;
import
android.support.v7.widget.RecyclerView
;
import
android.view.LayoutInflater
;
import
android.view.Menu
;
import
android.view.MenuInflater
;
...
...
@@ -26,6 +22,10 @@ import com.topjohnwu.magisk.utils.Topic;
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.ButterKnife
;
import
butterknife.Unbinder
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
View file @
06594949
...
...
@@ -10,13 +10,6 @@ import android.hardware.fingerprint.FingerprintManager;
import
android.net.Uri
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.support.v14.preference.SwitchPreference
;
import
android.support.v7.app.AlertDialog
;
import
android.support.v7.preference.ListPreference
;
import
android.support.v7.preference.Preference
;
import
android.support.v7.preference.PreferenceCategory
;
import
android.support.v7.preference.PreferenceFragmentCompat
;
import
android.support.v7.preference.PreferenceScreen
;
import
android.view.Gravity
;
import
android.view.LayoutInflater
;
import
android.view.View
;
...
...
@@ -44,6 +37,14 @@ import com.topjohnwu.superuser.ShellUtils;
import
java.io.IOException
;
import
java.util.Locale
;
import
androidx.appcompat.app.AlertDialog
;
import
androidx.preference.ListPreference
;
import
androidx.preference.Preference
;
import
androidx.preference.PreferenceCategory
;
import
androidx.preference.PreferenceFragmentCompat
;
import
androidx.preference.PreferenceScreen
;
import
androidx.preference.SwitchPreference
;
public
class
SettingsFragment
extends
PreferenceFragmentCompat
implements
SharedPreferences
.
OnSharedPreferenceChangeListener
,
Topic
.
Subscriber
,
Topic
.
AutoSubscriber
{
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/SuLogFragment.java
View file @
06594949
package
com
.
topjohnwu
.
magisk
.
fragments
;
import
android.os.Bundle
;
import
android.support.annotation.Nullable
;
import
android.support.v7.widget.RecyclerView
;
import
android.view.LayoutInflater
;
import
android.view.Menu
;
import
android.view.MenuInflater
;
...
...
@@ -15,6 +13,8 @@ import com.topjohnwu.magisk.R;
import
com.topjohnwu.magisk.adapters.SuLogAdapter
;
import
com.topjohnwu.magisk.components.BaseFragment
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
butterknife.Unbinder
;
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/SuperuserFragment.java
View file @
06594949
...
...
@@ -2,8 +2,6 @@ package com.topjohnwu.magisk.fragments;
import
android.content.pm.PackageManager
;
import
android.os.Bundle
;
import
android.support.annotation.Nullable
;
import
android.support.v7.widget.RecyclerView
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -16,6 +14,8 @@ import com.topjohnwu.magisk.container.Policy;
import
java.util.List
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
butterknife.Unbinder
;
...
...
app/src/full/java/com/topjohnwu/magisk/receivers/ShortcutReceiver.java
View file @
06594949
...
...
@@ -7,7 +7,6 @@ import android.content.pm.ShortcutInfo;
import
android.content.pm.ShortcutManager
;
import
android.graphics.drawable.Icon
;
import
android.os.Build
;
import
android.support.annotation.RequiresApi
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Data
;
...
...
@@ -18,6 +17,8 @@ import com.topjohnwu.superuser.Shell;
import
java.util.ArrayList
;
import
androidx.annotation.RequiresApi
;
public
class
ShortcutReceiver
extends
BroadcastReceiver
{
@Override
public
void
onReceive
(
Context
context
,
Intent
intent
)
{
...
...
app/src/full/java/com/topjohnwu/magisk/services/OnBootService.java
View file @
06594949
...
...
@@ -2,14 +2,15 @@ package com.topjohnwu.magisk.services;
import
android.content.Context
;
import
android.content.Intent
;
import
android.support.annotation.NonNull
;
import
android.support.v4.app.JobIntentService
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.utils.NotificationMgr
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.ShellUtils
;
import
androidx.annotation.NonNull
;
import
androidx.core.app.JobIntentService
;
public
class
OnBootService
extends
JobIntentService
{
public
static
void
enqueueWork
(
Context
context
)
{
...
...
app/src/full/java/com/topjohnwu/magisk/utils/BootSigner.java
View file @
06594949
package
com
.
topjohnwu
.
magisk
.
utils
;
import
android.support.annotation.Keep
;
import
com.topjohnwu.utils.SignBoot
;
import
java.io.FileInputStream
;
import
java.io.InputStream
;
import
androidx.annotation.Keep
;
public
class
BootSigner
{
@Keep
...
...
app/src/full/java/com/topjohnwu/magisk/utils/ISafetyNetHelper.java
View file @
06594949
package
com
.
topjohnwu
.
magisk
.
utils
;
import
android
.support
.annotation.Keep
;
import
android
x
.annotation.Keep
;
public
interface
ISafetyNetHelper
{
...
...
app/src/full/java/com/topjohnwu/magisk/utils/LocaleManager.java
View file @
06594949
...
...
@@ -3,7 +3,6 @@ package com.topjohnwu.magisk.utils;
import
android.content.res.Configuration
;
import
android.content.res.Resources
;
import
android.os.AsyncTask
;
import
android.support.annotation.StringRes
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Data
;
...
...
@@ -16,6 +15,8 @@ import java.util.HashSet;
import
java.util.List
;
import
java.util.Locale
;
import
androidx.annotation.StringRes
;
public
class
LocaleManager
{
public
static
Locale
locale
=
Locale
.
getDefault
();
public
final
static
Locale
defaultLocale
=
Locale
.
getDefault
();
...
...
app/src/full/java/com/topjohnwu/magisk/utils/NotificationMgr.java
View file @
06594949
...
...
@@ -4,8 +4,6 @@ import android.app.NotificationManager;
import
android.app.PendingIntent
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.support.v4.app.NotificationCompat
;
import
android.support.v4.app.TaskStackBuilder
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Data
;
...
...
@@ -15,6 +13,9 @@ import com.topjohnwu.magisk.SplashActivity;
import
com.topjohnwu.magisk.receivers.ManagerUpdate
;
import
com.topjohnwu.magisk.receivers.RebootReceiver
;
import
androidx.core.app.NotificationCompat
;
import
androidx.core.app.TaskStackBuilder
;
public
class
NotificationMgr
{
public
static
void
magiskUpdate
()
{
...
...
app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java
View file @
06594949
package
com
.
topjohnwu
.
magisk
.
utils
;
import
android.content.Context
;
import
android.support.annotation.NonNull
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Data
;
...
...
@@ -14,6 +13,8 @@ import com.topjohnwu.superuser.io.SuFile;
import
java.io.File
;
import
java.io.InputStream
;
import
androidx.annotation.NonNull
;
public
class
RootUtils
extends
Shell
.
Initializer
{
static
{
...
...
app/src/full/java/com/topjohnwu/magisk/utils/Topic.java
View file @
06594949
package
com
.
topjohnwu
.
magisk
.
utils
;
import
android.support.annotation.IntDef
;
import
com.topjohnwu.magisk.Data
;
import
java.lang.annotation.Retention
;
...
...
@@ -9,6 +7,8 @@ import java.lang.annotation.RetentionPolicy;
import
java.util.HashSet
;
import
java.util.Set
;
import
androidx.annotation.IntDef
;
public
class
Topic
{
public
static
final
int
MAGISK_HIDE_DONE
=
0
;
...
...
app/src/full/res/layout/activity_about.xml
View file @
06594949
...
...
@@ -20,7 +20,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<android
.support.v7
.widget.CardView
<android
x.cardview
.widget.CardView
android:layout_width=
"fill_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
...
...
@@ -98,7 +98,7 @@
</LinearLayout>
</android
.support.v7
.widget.CardView>
</android
x.cardview
.widget.CardView>
</LinearLayout>
...
...
app/src/full/res/layout/activity_donation.xml
View file @
06594949
...
...
@@ -20,7 +20,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<android
.support.v7
.widget.CardView
<android
x.cardview
.widget.CardView
android:layout_width=
"fill_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
...
...
@@ -56,7 +56,7 @@
</LinearLayout>
</android
.support.v7
.widget.CardView>
</android
x.cardview
.widget.CardView>
</LinearLayout>
...
...
app/src/full/res/layout/activity_main.xml
View file @
06594949
<?xml version="1.0" encoding="utf-8"?>
<android
.support.v4
.widget.DrawerLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.drawerlayout
.widget.DrawerLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/drawer_layout"
...
...
@@ -24,7 +24,7 @@
</FrameLayout>
<
android.support.design.widget
.NavigationView
<
com.google.android.material.navigation
.NavigationView
android:id=
"@+id/nav_view"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -32,4 +32,4 @@
android:fitsSystemWindows=
"true"
app:menu=
"@menu/drawer"
/>
</android
.support.v4
.widget.DrawerLayout>
</android
x.drawerlayout
.widget.DrawerLayout>
app/src/full/res/layout/fragment_log.xml
View file @
06594949
...
...
@@ -7,7 +7,7 @@
android:orientation=
"vertical"
tools:context=
"com.topjohnwu.magisk.fragments.LogFragment"
>
<
android.support.design.widget
.TabLayout
<
com.google.android.material.tabs
.TabLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"?attr/colorPrimary"
...
...
@@ -17,10 +17,10 @@
android:elevation=
"4dp"
android:visibility=
"gone"
>
</
android.support.design.widget
.TabLayout>
</
com.google.android.material.tabs
.TabLayout>
<android
.support.v4.view
.ViewPager
<android
x.viewpager.widget
.ViewPager
android:layout_height=
"match_parent"
android:layout_width=
"match_parent"
android:id=
"@+id/container"
/>
...
...
app/src/full/res/layout/fragment_magisk.xml
View file @
06594949
<?xml version="1.0" encoding="utf-8"?>
<android
.support.v4
.widget.SwipeRefreshLayout
<android
x.swiperefreshlayout
.widget.SwipeRefreshLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:id=
"@+id/swipeRefreshLayout"
...
...
@@ -18,7 +18,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<android
.support.v7
.widget.CardView
<android
x.cardview
.widget.CardView
android:id=
"@+id/core_only_notice"
style=
"?attr/cardStyle"
android:layout_width=
"match_parent"
...
...
@@ -55,9 +55,9 @@
android:text=
"@string/settings_core_only_title"
android:textStyle=
"bold"
/>
</RelativeLayout>
</android
.support.v7
.widget.CardView>
</android
x.cardview
.widget.CardView>
<android
.support.v7
.widget.CardView
<android
x.cardview
.widget.CardView
style=
"?attr/cardStyle"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -141,9 +141,9 @@
</LinearLayout>
</android
.support.v7
.widget.CardView>
</android
x.cardview
.widget.CardView>
<android
.support.v7
.widget.CardView
<android
x.cardview
.widget.CardView
android:id=
"@+id/safetyNet_card"
style=
"?attr/cardStyle"
android:layout_width=
"match_parent"
...
...
@@ -259,9 +259,9 @@
</LinearLayout>
</android
.support.v7
.widget.CardView>
</android
x.cardview
.widget.CardView>
<android
.support.v7
.widget.CardView
<android
x.cardview
.widget.CardView
android:id=
"@+id/install_option_card"
style=
"?attr/cardStyle"
android:layout_width=
"match_parent"
...
...
@@ -308,9 +308,9 @@
android:text=
"@string/keep_dm_verity"
/>
</LinearLayout>
</android
.support.v7
.widget.CardView>
</android
x.cardview
.widget.CardView>
<android
.support.v7
.widget.CardView
<android
x.cardview
.widget.CardView
android:id=
"@+id/install_button"
style=
"?attr/cardStyle"
android:layout_width=
"match_parent"
...
...
@@ -361,9 +361,9 @@
</RelativeLayout>
</android
.support.v7
.widget.CardView>
</android
x.cardview
.widget.CardView>
<android
.support.v7
.widget.CardView
<android
x.cardview
.widget.CardView
android:id=
"@+id/uninstall_button"
style=
"?attr/cardStyle"
android:layout_width=
"match_parent"
...
...
@@ -392,10 +392,10 @@
android:textSize=
"20sp"
android:textStyle=
"bold"
/>
</android
.support.v7
.widget.CardView>
</android
x.cardview
.widget.CardView>
</LinearLayout>
</ScrollView>
</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
app/src/full/res/layout/fragment_magisk_hide.xml
View file @
06594949
<?xml version="1.0" encoding="utf-8"?>
<android
.support.v4
.widget.SwipeRefreshLayout
<android
x.swiperefreshlayout
.widget.SwipeRefreshLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:id=
"@+id/swipeRefreshLayout"
...
...
@@ -12,15 +12,15 @@ android:orientation="vertical">
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
<android
.support.v7
.widget.RecyclerView
<android
x.recyclerview
.widget.RecyclerView
android:id=
"@+id/recyclerView"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:clipToPadding=
"false"
android:dividerHeight=
"@dimen/card_divider_space"
app:layoutManager=
"android
.support.v7
.widget.LinearLayoutManager"
/>
app:layoutManager=
"android
x.recyclerview
.widget.LinearLayoutManager"
/>
</LinearLayout>
</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
app/src/full/res/layout/fragment_modules.xml
View file @
06594949
<?xml version="1.0" encoding="utf-8"?>
<android
.support.v4
.widget.SwipeRefreshLayout
<android
x.swiperefreshlayout
.widget.SwipeRefreshLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
...
...
@@ -9,20 +9,20 @@
android:orientation=
"vertical"
>
<android
.support.design
.widget.CoordinatorLayout
<android
x.coordinatorlayout
.widget.CoordinatorLayout
android:id=
"@+id/coordinator"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<android
.support.v7
.widget.RecyclerView
<android
x.recyclerview
.widget.RecyclerView
android:id=
"@+id/recyclerView"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:clipToPadding=
"false"
android:dividerHeight=
"@dimen/card_divider_space"
app:layout_behavior=
"@string/appbar_scrolling_view_behavior"
app:layoutManager=
"android
.support.v7
.widget.LinearLayoutManager"
/>
app:layoutManager=
"android
x.recyclerview
.widget.LinearLayoutManager"
/>
<TextView
android:id=
"@+id/empty_rv"
...
...
@@ -36,7 +36,7 @@
android:textStyle=
"italic"
android:visibility=
"gone"
/>
<
android.support.design.widget
.FloatingActionButton
<
com.google.android.material.floatingactionbutton
.FloatingActionButton
android:id=
"@+id/fab"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -47,6 +47,6 @@
tools:fabSize=
"normal"
tools:pressedTranslationZ=
"12dp"
/>
</android
.support.design
.widget.CoordinatorLayout>
</android
x.coordinatorlayout
.widget.CoordinatorLayout>
</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
app/src/full/res/layout/fragment_repos.xml
View file @
06594949
<?xml version="1.0" encoding="utf-8"?>
<android
.support.v4
.widget.SwipeRefreshLayout
android:id=
"@+id/swipeRefreshLayout"
<android
x.swiperefreshlayout
.widget.SwipeRefreshLayout
android:id=
"@+id/swipeRefreshLayout"
android:layout_width=
"match_parent"
android:layout_height=
"fill_parent"
android:orientation=
"vertical"
...
...
@@ -23,13 +23,13 @@
android:textStyle=
"italic"
android:visibility=
"gone"
/>
<android
.support.v7
.widget.RecyclerView
<android
x.recyclerview
.widget.RecyclerView
android:id=
"@+id/recyclerView"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:dividerHeight=
"@dimen/card_divider_space"
app:layoutManager=
"android
.support.v7
.widget.LinearLayoutManager"
/>
app:layoutManager=
"android
x.recyclerview
.widget.LinearLayoutManager"
/>
</LinearLayout>
</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
app/src/full/res/layout/fragment_su_log.xml
View file @
06594949
...
...
@@ -18,11 +18,11 @@
android:textStyle=
"italic"
android:visibility=
"gone"
/>
<android
.support.v7
.widget.RecyclerView
<android
x.recyclerview
.widget.RecyclerView
android:id=
"@+id/recyclerView"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:dividerHeight=
"@dimen/card_divider_space"
app:layoutManager=
"android
.support.v7
.widget.LinearLayoutManager"
/>
app:layoutManager=
"android
x.recyclerview
.widget.LinearLayoutManager"
/>
</LinearLayout>
app/src/full/res/layout/fragment_superuser.xml
View file @
06594949
...
...
@@ -17,11 +17,11 @@
android:textStyle=
"italic"
android:visibility=
"gone"
/>
<android
.support.v7
.widget.RecyclerView
<android
x.recyclerview
.widget.RecyclerView
android:id=
"@+id/recyclerView"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:dividerHeight=
"@dimen/card_divider_space"
app:layoutManager=
"android
.support.v7
.widget.LinearLayoutManager"
/>
app:layoutManager=
"android
x.recyclerview
.widget.LinearLayoutManager"
/>
</LinearLayout>
app/src/full/res/layout/list_item_app.xml
View file @
06594949
<?xml version="1.0" encoding="utf-8"?>
<android
.support.v7
.widget.CardView
<android
x.cardview
.widget.CardView
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:card_view=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"fill_parent"
...
...
@@ -73,6 +73,6 @@
</LinearLayout>
</android
.support.v7
.widget.CardView>
</android
x.cardview
.widget.CardView>
app/src/full/res/layout/list_item_module.xml
View file @
06594949
<?xml version="1.0" encoding="utf-8"?>
<android
.support.v7
.widget.CardView
<android
x.cardview
.widget.CardView
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:card_view=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
...
...
@@ -110,4 +110,4 @@
</RelativeLayout>
</android.support.v7.widget.CardView>
\ No newline at end of file
</androidx.cardview.widget.CardView>
\ No newline at end of file
app/src/full/res/layout/list_item_policy.xml
View file @
06594949
<?xml version="1.0" encoding="utf-8"?>
<android
.support.v7
.widget.CardView
<android
x.cardview
.widget.CardView
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:card_view=
"http://schemas.android.com/apk/res-auto"
style=
"?attr/cardStyle"
...
...
@@ -167,6 +167,6 @@
</LinearLayout>
</android
.support.v7
.widget.CardView>
</android
x.cardview
.widget.CardView>
app/src/full/res/layout/list_item_repo.xml
View file @
06594949
<?xml version="1.0" encoding="utf-8"?>
<android
.support.v7
.widget.CardView
<android
x.cardview
.widget.CardView
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:card_view=
"http://schemas.android.com/apk/res-auto"
style=
"?attr/cardStyle"
...
...
@@ -93,6 +93,6 @@
</LinearLayout>
</android
.support.v7
.widget.CardView>
</android
x.cardview
.widget.CardView>
app/src/full/res/layout/list_item_sulog.xml
View file @
06594949
<?xml version="1.0" encoding="utf-8"?>
<android
.support.v7
.widget.CardView
<android
x.cardview
.widget.CardView
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:card_view=
"http://schemas.android.com/apk/res-auto"
style=
"?attr/cardStyle"
...
...
@@ -140,6 +140,6 @@
</LinearLayout>
</android
.support.v7
.widget.CardView>
</android
x.cardview
.widget.CardView>
app/src/full/res/layout/toolbar.xml
View file @
06594949
<?xml version="1.0" encoding="utf-8"?>
<android
.support.v7
.widget.Toolbar
android:id=
"@+id/toolbar"
<android
x.appcompat
.widget.Toolbar
android:id=
"@+id/toolbar"
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"?attr/actionBarSize"
...
...
app/src/main/AndroidManifest.xml
View file @
06594949
...
...
@@ -18,7 +18,7 @@
tools:ignore=
"UnusedAttribute"
>
<provider
android:name=
"android
.support.v4
.content.FileProvider"
android:name=
"android
x.core
.content.FileProvider"
android:authorities=
"com.topjohnwu.magisk.provider"
android:exported=
"false"
android:grantUriPermissions=
"true"
>
...
...
app/src/main/java/com/topjohnwu/magisk/components/BaseActivity.java
View file @
06594949
...
...
@@ -4,16 +4,17 @@ import android.content.Context;
import
android.content.Intent
;
import
android.content.pm.PackageManager
;
import
android.os.Bundle
;
import
android.support.annotation.NonNull
;
import
android.support.annotation.Nullable
;
import
android.support.v4.app.ActivityCompat
;
import
android.support.v4.content.ContextCompat
;
import
android.widget.Toast
;
import
com.topjohnwu.magisk.NoUIActivity
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Download
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.core.app.ActivityCompat
;
import
androidx.core.content.ContextCompat
;
public
abstract
class
BaseActivity
extends
FlavorActivity
{
public
static
final
String
INTENT_PERM
=
"perm_dialog"
;
...
...
app/src/main/java/com/topjohnwu/magisk/receivers/ManagerInstall.java
View file @
06594949
...
...
@@ -4,10 +4,11 @@ import android.content.Context;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.os.Build
;
import
android.support.v4.content.FileProvider
;
import
java.io.File
;
import
androidx.core.content.FileProvider
;
public
class
ManagerInstall
extends
DownloadReceiver
{
@Override
public
void
onDownloadDone
(
Context
context
,
Uri
uri
)
{
...
...
build.gradle
View file @
06594949
...
...
@@ -26,7 +26,7 @@ allprojects {
ext
{
compileSdkVersion
=
28
buildToolsVersion
=
"28.0.2"
supportLibVersion
=
"27.1.1
"
androidXVersion
=
"1.0.0-rc02
"
}
task
clean
(
type:
Delete
)
{
...
...
gradle.properties
View file @
06594949
...
...
@@ -20,3 +20,7 @@ org.gradle.parallel=true
# When set to true the Gradle daemon is used to run the build. For local developer builds this is our favorite property.
# The developer environment is optimized for speed and feedback so we nearly always run Gradle jobs with the daemon.
org.gradle.daemon
=
true
#AndroidX
android.useAndroidX
=
true
android.enableJetifier
=
true
snet/src/main/java/com/topjohnwu/snet/SafetyNetHelper.java
View file @
06594949
...
...
@@ -5,7 +5,7 @@ import android.app.AlertDialog;
import
android.app.Dialog
;
import
android.content.Context
;
import
android.content.Intent
;
import
android
.support
.annotation.NonNull
;
import
android
x
.annotation.NonNull
;
import
android.util.Base64
;
import
android.util.Log
;
...
...
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