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
1bfafdb4
Commit
1bfafdb4
authored
Feb 12, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't reload ApplicationInfo list
Fix #94
parent
1ef5bd70
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
18 deletions
+44
-18
MagiskHideFragment.java
...rc/main/java/com/topjohnwu/magisk/MagiskHideFragment.java
+6
-6
MagiskManager.java
app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
+1
-1
ApplicationAdapter.java
...ava/com/topjohnwu/magisk/adapters/ApplicationAdapter.java
+2
-2
LoadApps.java
app/src/main/java/com/topjohnwu/magisk/asyncs/LoadApps.java
+7
-8
MagiskHide.java
...src/main/java/com/topjohnwu/magisk/asyncs/MagiskHide.java
+28
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/MagiskHideFragment.java
View file @
1bfafdb4
...
@@ -15,7 +15,7 @@ import android.view.ViewGroup;
...
@@ -15,7 +15,7 @@ import android.view.ViewGroup;
import
android.widget.SearchView
;
import
android.widget.SearchView
;
import
com.topjohnwu.magisk.adapters.ApplicationAdapter
;
import
com.topjohnwu.magisk.adapters.ApplicationAdapter
;
import
com.topjohnwu.magisk.asyncs.
LoadApps
;
import
com.topjohnwu.magisk.asyncs.
MagiskHide
;
import
com.topjohnwu.magisk.components.Fragment
;
import
com.topjohnwu.magisk.components.Fragment
;
import
com.topjohnwu.magisk.utils.CallbackEvent
;
import
com.topjohnwu.magisk.utils.CallbackEvent
;
import
com.topjohnwu.magisk.utils.Logger
;
import
com.topjohnwu.magisk.utils.Logger
;
...
@@ -50,7 +50,7 @@ public class MagiskHideFragment extends Fragment implements CallbackEvent.Listen
...
@@ -50,7 +50,7 @@ public class MagiskHideFragment extends Fragment implements CallbackEvent.Listen
PackageManager
packageManager
=
getActivity
().
getPackageManager
();
PackageManager
packageManager
=
getActivity
().
getPackageManager
();
mSwipeRefreshLayout
.
setRefreshing
(
true
);
mSwipeRefreshLayout
.
setRefreshing
(
true
);
mSwipeRefreshLayout
.
setOnRefreshListener
(()
->
new
LoadApps
(
getActivity
()).
exec
());
mSwipeRefreshLayout
.
setOnRefreshListener
(()
->
new
MagiskHide
(
getActivity
()).
list
());
appAdapter
=
new
ApplicationAdapter
(
packageManager
);
appAdapter
=
new
ApplicationAdapter
(
packageManager
);
recyclerView
.
setAdapter
(
appAdapter
);
recyclerView
.
setAdapter
(
appAdapter
);
...
@@ -71,8 +71,8 @@ public class MagiskHideFragment extends Fragment implements CallbackEvent.Listen
...
@@ -71,8 +71,8 @@ public class MagiskHideFragment extends Fragment implements CallbackEvent.Listen
}
}
};
};
if
(
getApplication
().
packageLoad
Done
.
isTriggered
)
if
(
getApplication
().
magiskHide
Done
.
isTriggered
)
onTrigger
(
getApplication
().
packageLoad
Done
);
onTrigger
(
getApplication
().
magiskHide
Done
);
return
view
;
return
view
;
}
}
...
@@ -88,12 +88,12 @@ public class MagiskHideFragment extends Fragment implements CallbackEvent.Listen
...
@@ -88,12 +88,12 @@ public class MagiskHideFragment extends Fragment implements CallbackEvent.Listen
public
void
onStart
()
{
public
void
onStart
()
{
super
.
onStart
();
super
.
onStart
();
getActivity
().
setTitle
(
R
.
string
.
magiskhide
);
getActivity
().
setTitle
(
R
.
string
.
magiskhide
);
getApplication
().
packageLoad
Done
.
register
(
this
);
getApplication
().
magiskHide
Done
.
register
(
this
);
}
}
@Override
@Override
public
void
onStop
()
{
public
void
onStop
()
{
getApplication
().
packageLoad
Done
.
unRegister
(
this
);
getApplication
().
magiskHide
Done
.
unRegister
(
this
);
super
.
onStop
();
super
.
onStop
();
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
View file @
1bfafdb4
...
@@ -28,7 +28,7 @@ public class MagiskManager extends Application {
...
@@ -28,7 +28,7 @@ public class MagiskManager extends Application {
// Events
// Events
public
final
CallbackEvent
<
Void
>
blockDetectionDone
=
new
CallbackEvent
<>();
public
final
CallbackEvent
<
Void
>
blockDetectionDone
=
new
CallbackEvent
<>();
public
final
CallbackEvent
<
Void
>
packageLoad
Done
=
new
CallbackEvent
<>();
public
final
CallbackEvent
<
Void
>
magiskHide
Done
=
new
CallbackEvent
<>();
public
final
CallbackEvent
<
Void
>
reloadMainActivity
=
new
CallbackEvent
<>();
public
final
CallbackEvent
<
Void
>
reloadMainActivity
=
new
CallbackEvent
<>();
public
final
CallbackEvent
<
Void
>
moduleLoadDone
=
new
CallbackEvent
<>();
public
final
CallbackEvent
<
Void
>
moduleLoadDone
=
new
CallbackEvent
<>();
public
final
CallbackEvent
<
Void
>
repoLoadDone
=
new
CallbackEvent
<>();
public
final
CallbackEvent
<
Void
>
repoLoadDone
=
new
CallbackEvent
<>();
...
...
app/src/main/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java
View file @
1bfafdb4
...
@@ -50,8 +50,8 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
...
@@ -50,8 +50,8 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
}
}
public
void
setLists
(
List
<
ApplicationInfo
>
listApps
,
List
<
String
>
hideList
)
{
public
void
setLists
(
List
<
ApplicationInfo
>
listApps
,
List
<
String
>
hideList
)
{
mOriginalList
=
mList
=
Collections
.
unmodifiableList
(
listApps
)
;
mOriginalList
=
mList
=
listApps
;
mHideList
=
new
ArrayList
<>(
hideList
)
;
mHideList
=
hideList
;
notifyDataSetChanged
();
notifyDataSetChanged
();
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/asyncs/LoadApps.java
View file @
1bfafdb4
...
@@ -4,14 +4,13 @@ import android.app.Activity;
...
@@ -4,14 +4,13 @@ import android.app.Activity;
import
android.content.pm.ApplicationInfo
;
import
android.content.pm.ApplicationInfo
;
import
android.content.pm.PackageManager
;
import
android.content.pm.PackageManager
;
import
com.topjohnwu.magisk.MagiskManager
;
import
com.topjohnwu.magisk.adapters.ApplicationAdapter
;
import
com.topjohnwu.magisk.adapters.ApplicationAdapter
;
import
com.topjohnwu.magisk.utils.Shell
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.Iterator
;
import
java.util.Iterator
;
import
java.util.List
;
public
class
LoadApps
extends
Seria
lTask
<
Void
,
Void
,
Void
>
{
public
class
LoadApps
extends
Paralle
lTask
<
Void
,
Void
,
Void
>
{
public
LoadApps
(
Activity
context
)
{
public
LoadApps
(
Activity
context
)
{
super
(
context
);
super
(
context
);
...
@@ -20,20 +19,20 @@ public class LoadApps extends SerialTask<Void, Void, Void> {
...
@@ -20,20 +19,20 @@ public class LoadApps extends SerialTask<Void, Void, Void> {
@Override
@Override
protected
Void
doInBackground
(
Void
...
voids
)
{
protected
Void
doInBackground
(
Void
...
voids
)
{
PackageManager
pm
=
magiskManager
.
getPackageManager
();
PackageManager
pm
=
magiskManager
.
getPackageManager
();
magiskManager
.
appL
ist
=
pm
.
getInstalledApplications
(
0
);
List
<
ApplicationInfo
>
l
ist
=
pm
.
getInstalledApplications
(
0
);
for
(
Iterator
<
ApplicationInfo
>
i
=
magiskManager
.
appL
ist
.
iterator
();
i
.
hasNext
();
)
{
for
(
Iterator
<
ApplicationInfo
>
i
=
l
ist
.
iterator
();
i
.
hasNext
();
)
{
ApplicationInfo
info
=
i
.
next
();
ApplicationInfo
info
=
i
.
next
();
if
(
ApplicationAdapter
.
BLACKLIST
.
contains
(
info
.
packageName
)
||
!
info
.
enabled
)
if
(
ApplicationAdapter
.
BLACKLIST
.
contains
(
info
.
packageName
)
||
!
info
.
enabled
)
i
.
remove
();
i
.
remove
();
}
}
Collections
.
sort
(
magiskManager
.
appL
ist
,
(
a
,
b
)
->
a
.
loadLabel
(
pm
).
toString
().
toLowerCase
()
Collections
.
sort
(
l
ist
,
(
a
,
b
)
->
a
.
loadLabel
(
pm
).
toString
().
toLowerCase
()
.
compareTo
(
b
.
loadLabel
(
pm
).
toString
().
toLowerCase
()));
.
compareTo
(
b
.
loadLabel
(
pm
).
toString
().
toLowerCase
()));
magiskManager
.
magiskHideList
=
Shell
.
su
(
MagiskManager
.
MAGISK_HIDE_PATH
+
"list"
);
magiskManager
.
appList
=
Collections
.
unmodifiableList
(
list
);
return
null
;
return
null
;
}
}
@Override
@Override
protected
void
onPostExecute
(
Void
v
)
{
protected
void
onPostExecute
(
Void
v
)
{
magiskManager
.
packageLoadDone
.
trigger
();
new
MagiskHide
(
activity
).
list
();
}
}
}
}
app/src/main/java/com/topjohnwu/magisk/asyncs/MagiskHide.java
View file @
1bfafdb4
package
com
.
topjohnwu
.
magisk
.
asyncs
;
package
com
.
topjohnwu
.
magisk
.
asyncs
;
import
android.app.Activity
;
import
com.topjohnwu.magisk.MagiskManager
;
import
com.topjohnwu.magisk.MagiskManager
;
import
com.topjohnwu.magisk.utils.Shell
;
import
com.topjohnwu.magisk.utils.Shell
;
import
java.util.List
;
public
class
MagiskHide
extends
SerialTask
<
Object
,
Void
,
Void
>
{
public
class
MagiskHide
extends
SerialTask
<
Object
,
Void
,
Void
>
{
private
boolean
isList
=
false
;
public
MagiskHide
()
{}
public
MagiskHide
(
Activity
context
)
{
super
(
context
);
}
@Override
@Override
protected
Void
doInBackground
(
Object
...
params
)
{
protected
Void
doInBackground
(
Object
...
params
)
{
String
command
=
(
String
)
params
[
0
];
String
command
=
(
String
)
params
[
0
];
Shell
.
su
(
MagiskManager
.
MAGISK_HIDE_PATH
+
command
);
List
<
String
>
ret
=
Shell
.
su
(
MagiskManager
.
MAGISK_HIDE_PATH
+
command
);
if
(
isList
)
magiskManager
.
magiskHideList
=
ret
;
return
null
;
return
null
;
}
}
@Override
protected
void
onPostExecute
(
Void
v
)
{
if
(
isList
)
magiskManager
.
magiskHideDone
.
trigger
();
}
public
void
add
(
CharSequence
packageName
)
{
public
void
add
(
CharSequence
packageName
)
{
exec
(
"add "
+
packageName
);
exec
(
"add "
+
packageName
);
}
}
...
@@ -28,4 +48,11 @@ public class MagiskHide extends SerialTask<Object, Void, Void> {
...
@@ -28,4 +48,11 @@ public class MagiskHide extends SerialTask<Object, Void, Void> {
exec
(
"disable; setprop persist.magisk.hide 0"
);
exec
(
"disable; setprop persist.magisk.hide 0"
);
}
}
public
void
list
()
{
isList
=
true
;
if
(
magiskManager
==
null
)
return
;
exec
(
"list"
);
}
}
}
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