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
79326973
Commit
79326973
authored
Nov 07, 2016
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix and tweaks for MagiskHide
parent
b69a4fe8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
132 additions
and
245 deletions
+132
-245
ApplicationAdapter.java
...rc/main/java/com/topjohnwu/magisk/ApplicationAdapter.java
+12
-7
LogFragment.java
app/src/main/java/com/topjohnwu/magisk/LogFragment.java
+107
-117
MainActivity.java
app/src/main/java/com/topjohnwu/magisk/MainActivity.java
+1
-2
SettingsActivity.java
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+5
-8
SplashActivity.java
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
+4
-70
Async.java
app/src/main/java/com/topjohnwu/magisk/utils/Async.java
+3
-3
Utils.java
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
+0
-38
No files found.
app/src/main/java/com/topjohnwu/magisk/ApplicationAdapter.java
View file @
79326973
...
...
@@ -5,7 +5,6 @@ import android.content.pm.ApplicationInfo;
import
android.content.pm.PackageManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.util.DisplayMetrics
;
import
android.util.Log
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -56,22 +55,28 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
@Override
public
void
onBindViewHolder
(
final
ViewHolder
holder
,
int
position
)
{
ApplicationInfo
info
=
mList
.
get
(
position
);
holder
.
appIcon
.
setImageDrawable
(
info
.
loadIcon
(
packageManager
));
holder
.
appName
.
setText
(
info
.
loadLabel
(
packageManager
));
holder
.
appPackage
.
setText
(
info
.
packageName
);
holder
.
checkBox
.
setChecked
(
false
);
for
(
String
hidePackage
:
mHideList
)
{
if
(
info
.
packageName
.
contains
(
hidePackage
))
{
holder
.
checkBox
.
setChecked
(
true
);
break
;
}
}
holder
.
checkBox
.
setOnCheckedChangeListener
((
compoundButton
,
b
)
->
{
Async
.
MagiskHide
mh
=
new
Async
.
MagiskHide
();
if
(
b
)
{
mh
.
add
(
info
.
packageName
);
}
else
{
mh
.
rm
(
info
.
packageName
);
holder
.
checkBox
.
setOnClickListener
(
v
->
{
CheckBox
chkbox
=
(
CheckBox
)
v
;
if
(
chkbox
.
isChecked
())
{
new
Async
.
MagiskHide
().
add
(
info
.
packageName
);
mHideList
.
add
(
info
.
packageName
);
}
else
{
new
Async
.
MagiskHide
().
rm
(
info
.
packageName
);
mHideList
.
remove
(
info
.
packageName
);
}
});
}
...
...
app/src/main/java/com/topjohnwu/magisk/LogFragment.java
View file @
79326973
This diff is collapsed.
Click to expand it.
app/src/main/java/com/topjohnwu/magisk/MainActivity.java
View file @
79326973
...
...
@@ -25,7 +25,6 @@ import android.view.View;
import
com.topjohnwu.magisk.utils.Logger
;
import
com.topjohnwu.magisk.utils.Shell
;
import
com.topjohnwu.magisk.utils.Utils
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
...
...
@@ -131,7 +130,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
private
void
checkHideSection
()
{
Menu
menu
=
navigationView
.
getMenu
();
if
(
PreferenceManager
.
getDefaultSharedPreferences
(
getApplication
()).
getBoolean
(
"magiskhide"
,
false
)
|
(
Utils
.
itemExist
(
"/data/su/suhide"
)
))
{
if
(
PreferenceManager
.
getDefaultSharedPreferences
(
getApplication
()).
getBoolean
(
"magiskhide"
,
false
))
{
menu
.
findItem
(
R
.
id
.
magiskhide
).
setVisible
(
true
);
}
else
{
...
...
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View file @
79326973
...
...
@@ -2,7 +2,6 @@ package com.topjohnwu.magisk;
import
android.content.Intent
;
import
android.content.SharedPreferences
;
import
android.os.AsyncTask
;
import
android.os.Bundle
;
import
android.preference.CheckBoxPreference
;
import
android.preference.ListPreference
;
...
...
@@ -81,8 +80,6 @@ public class SettingsActivity extends AppCompatActivity {
themePreference
=
(
ListPreference
)
findPreference
(
"theme"
);
CheckBoxPreference
busyboxPreference
=
(
CheckBoxPreference
)
findPreference
(
"busybox"
);
CheckBoxPreference
magiskhidePreference
=
(
CheckBoxPreference
)
findPreference
(
"magiskhide"
);
magiskhidePreference
.
setChecked
(
Utils
.
itemExist
(
false
,
"/magisk/.core/magiskhide/enable"
));
busyboxPreference
.
setChecked
(
Utils
.
commandExists
(
"unzip"
));
PreferenceManager
.
getDefaultSharedPreferences
(
getActivity
()).
registerOnSharedPreferenceChangeListener
(
this
);
...
...
@@ -132,26 +129,26 @@ public class SettingsActivity extends AppCompatActivity {
case
"magiskhide"
:
boolean
checked
=
sharedPreferences
.
getBoolean
(
"magiskhide"
,
false
);
if
(
checked
)
{
new
AsyncTask
<
Void
,
Void
,
Void
>()
{
new
Async
.
Root
Task
<
Void
,
Void
,
Void
>()
{
@Override
protected
Void
doInBackground
(
Void
...
params
)
{
Utils
.
createFile
(
"/magisk/.core/magiskhide/enable"
);
return
null
;
}
}.
exec
uteOnExecutor
(
AsyncTask
.
SERIAL_EXECUTOR
);
}.
exec
(
);
}
else
{
new
AsyncTask
<
Void
,
Void
,
Void
>()
{
new
Async
.
Root
Task
<
Void
,
Void
,
Void
>()
{
@Override
protected
Void
doInBackground
(
Void
...
params
)
{
Utils
.
removeItem
(
"/magisk/.core/magiskhide/enable"
);
return
null
;
}
}.
exec
uteOnExecutor
(
AsyncTask
.
SERIAL_EXECUTOR
);
}.
exec
(
);
}
break
;
case
"busybox"
:
checked
=
sharedPreferences
.
getBoolean
(
"busybox"
,
false
);
new
Async
.
LinkBusyBox
(
checked
).
exec
uteOnExecutor
(
AsyncTask
.
SERIAL_EXECUTOR
);
new
Async
.
LinkBusyBox
(
checked
).
exec
(
);
break
;
case
"developer_logging"
:
Logger
.
devLog
=
sharedPreferences
.
getBoolean
(
"developer_logging"
,
false
);
...
...
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
View file @
79326973
...
...
@@ -8,13 +8,8 @@ import android.support.v7.app.AppCompatActivity;
import
com.topjohnwu.magisk.utils.Async
;
import
com.topjohnwu.magisk.utils.Logger
;
import
com.topjohnwu.magisk.utils.Shell
;
import
com.topjohnwu.magisk.utils.Utils
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Set
;
public
class
SplashActivity
extends
AppCompatActivity
{
private
SharedPreferences
prefs
;
...
...
@@ -31,18 +26,17 @@ public class SplashActivity extends AppCompatActivity {
Logger
.
devLog
=
prefs
.
getBoolean
(
"developer_logging"
,
false
);
Logger
.
logShell
=
prefs
.
getBoolean
(
"shell_logging"
,
false
);
// Check and set preferences/hides
setupHideLists
();
// Initialize
// Initialize prefs
prefs
.
edit
()
.
putBoolean
(
"module_done"
,
false
)
.
putBoolean
(
"repo_done"
,
false
)
.
putBoolean
(
"update_check_done"
,
false
)
.
putBoolean
(
"magiskhide"
,
Utils
.
itemExist
(
false
,
"/magisk/.core/magiskhide/enable"
))
.
putBoolean
(
"busybox"
,
Utils
.
commandExists
(
"unzip"
))
.
apply
();
new
Async
.
CheckUpdates
(
prefs
).
exec
();
new
Async
.
c
onstructEnv
(
getApplicationInfo
()).
exec
();
new
Async
.
C
onstructEnv
(
getApplicationInfo
()).
exec
();
new
Async
.
LoadModules
(
prefs
)
{
@Override
...
...
@@ -57,64 +51,4 @@ public class SplashActivity extends AppCompatActivity {
}.
exec
();
}
private
void
setupHideLists
()
{
Set
<
String
>
set
=
new
HashSet
<>();
Set
<
String
>
setOriginal
=
null
;
List
<
String
>
hideList
=
null
;
// List<String> addList = null;
String
listCmd
,
addCmd
,
addCmd2
,
rmCmd
,
rmCmd2
;
// Build list of apps currently listed, add to preferences
int
hideVersion
=
Utils
.
WhichHide
(
getApplication
());
switch
(
hideVersion
)
{
case
1
:
listCmd
=
"/magisk/.core/magiskhide/list"
;
break
;
case
2
:
listCmd
=
"/su/suhide/list"
;
break
;
case
3
:
listCmd
=
"/magisk/.core/magiskhide/list && /su/suhide/list"
;
break
;
default
:
listCmd
=
""
;
}
if
(
Shell
.
rootAccess
())
{
hideList
=
Shell
.
su
(
listCmd
);
}
// Set up default preferences,make sure we add "extra" blacklist entries.
if
(!
prefs
.
contains
(
"auto_blacklist"
))
{
Logger
.
dev
(
"SplashActivity: Setting default preferences for application"
);
set
.
add
(
"com.google.android.apps.walletnfcrel"
);
set
.
add
(
"com.google.android.gms"
);
set
.
add
(
"com.google.commerce.tapandpay"
);
// Add current items to hide list
if
(
hideList
!=
null
)
set
.
addAll
(
hideList
);
SharedPreferences
.
Editor
editor
=
prefs
.
edit
();
editor
.
putStringSet
(
"auto_blacklist"
,
set
);
Logger
.
dev
(
"SplashActivity: Adding entries "
+
set
.
toString
());
editor
.
apply
();
}
setOriginal
=
prefs
.
getStringSet
(
"auto_blacklist"
,
set
);
// if (hideList != null) {
// for (String item : hideList) {
// if (!(setOriginal.contains(item))) {
// addList.add(item);
// }
// }
// }
SharedPreferences
.
Editor
editor
=
prefs
.
edit
();
editor
.
putStringSet
(
"auto_blacklist"
,
set
);
editor
.
apply
();
}
}
app/src/main/java/com/topjohnwu/magisk/utils/Async.java
View file @
79326973
...
...
@@ -48,11 +48,11 @@ public class Async {
public
static
final
String
UPDATE_JSON
=
"https://raw.githubusercontent.com/topjohnwu/MagiskManager/updates/magisk_update.json"
;
public
static
final
String
MAGISK_HIDE_PATH
=
"/magisk/.core/magiskhide/"
;
public
static
class
c
onstructEnv
extends
NormalTask
<
Void
,
Void
,
Void
>
{
public
static
class
C
onstructEnv
extends
NormalTask
<
Void
,
Void
,
Void
>
{
ApplicationInfo
mInfo
;
public
c
onstructEnv
(
ApplicationInfo
info
)
{
public
C
onstructEnv
(
ApplicationInfo
info
)
{
mInfo
=
info
;
}
...
...
@@ -350,7 +350,7 @@ public class Async {
}
}
public
static
class
LinkBusyBox
extends
Async
Task
<
Void
,
Void
,
Void
>
{
public
static
class
LinkBusyBox
extends
Root
Task
<
Void
,
Void
,
Void
>
{
private
boolean
link
;
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
View file @
79326973
...
...
@@ -4,11 +4,9 @@ import android.Manifest;
import
android.app.DownloadManager
;
import
android.content.Context
;
import
android.content.IntentFilter
;
import
android.content.SharedPreferences
;
import
android.content.pm.PackageManager
;
import
android.net.Uri
;
import
android.os.Environment
;
import
android.preference.PreferenceManager
;
import
android.support.v4.app.ActivityCompat
;
import
android.util.Base64
;
import
android.widget.Toast
;
...
...
@@ -33,8 +31,6 @@ import javax.crypto.spec.DESKeySpec;
public
class
Utils
{
private
static
final
String
TAG
=
"Magisk"
;
private
static
final
String
cryptoPass
=
"MagiskRox666"
;
private
static
final
String
secret
=
"GTYybRBTYf5his9kQ16ZNO7qgkBJ/5MyVe4CGceAOIoXgSnnk8FTd4F1dE9p5Eus"
;
...
...
@@ -51,29 +47,6 @@ public class Utils {
}
}
public
static
String
getAppUID
(
String
packageName
)
{
List
<
String
>
retString
=
Shell
.
su
(
"ls -nld /data/data/"
+
packageName
);
String
splitMe
=
retString
.
get
(
0
);
String
[]
splitString
=
retString
.
get
(
0
).
split
(
" "
);
return
splitString
[
5
];
}
public
static
int
WhichHide
(
Context
context
)
{
Boolean
mh
=
PreferenceManager
.
getDefaultSharedPreferences
(
context
).
getBoolean
(
"magiskhide"
,
false
);
Boolean
sh
=
Utils
.
itemExist
(
"/su/suhide/add"
);
if
(
mh
&&
!
sh
)
{
return
1
;
}
if
(
sh
&&
!
mh
)
{
return
2
;
}
if
(
sh
&&
mh
)
{
return
3
;
}
return
0
;
}
public
static
boolean
commandExists
(
String
s
)
{
List
<
String
>
ret
;
String
command
=
"if [ -z $(which "
+
s
+
") ]; then echo false; else echo true; fi"
;
...
...
@@ -81,17 +54,6 @@ public class Utils {
return
Boolean
.
parseBoolean
(
ret
.
get
(
0
));
}
public
static
boolean
rootEnabled
()
{
return
commandExists
(
"su"
);
}
public
static
boolean
autoToggleEnabled
(
Context
context
)
{
SharedPreferences
preferences
=
PreferenceManager
.
getDefaultSharedPreferences
(
context
);
Logger
.
dev
(
"Utils: AutoRootEnableCheck is "
+
preferences
.
getBoolean
(
"autoRootEnable"
,
false
));
return
PreferenceManager
.
getDefaultSharedPreferences
(
context
).
getBoolean
(
"autoRootEnable"
,
false
);
}
public
static
boolean
createFile
(
String
path
)
{
String
command
=
"touch "
+
path
+
" 2>/dev/null; if [ -f "
+
path
+
" ]; then echo true; else echo false; fi"
;
return
Shell
.
rootAccess
()
&&
Boolean
.
parseBoolean
(
Shell
.
su
(
command
).
get
(
0
));
...
...
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