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
fb0923f3
Commit
fb0923f3
authored
Jan 06, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Magisk Hide fragment improvements
parent
5bb943f8
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
72 additions
and
32 deletions
+72
-32
MagiskHideFragment.java
...rc/main/java/com/topjohnwu/magisk/MagiskHideFragment.java
+33
-23
SplashActivity.java
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
+1
-0
ApplicationAdapter.java
...ava/com/topjohnwu/magisk/adapters/ApplicationAdapter.java
+1
-9
Async.java
app/src/main/java/com/topjohnwu/magisk/utils/Async.java
+37
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/MagiskHideFragment.java
View file @
fb0923f3
...
...
@@ -17,24 +17,38 @@ import android.widget.SearchView;
import
com.topjohnwu.magisk.adapters.ApplicationAdapter
;
import
com.topjohnwu.magisk.utils.Async
;
import
com.topjohnwu.magisk.utils.CallbackHandler
;
import
com.topjohnwu.magisk.utils.Logger
;
import
com.topjohnwu.magisk.utils.Shell
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.Iterator
;
import
java.util.List
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
public
class
MagiskHideFragment
extends
Fragment
{
public
class
MagiskHideFragment
extends
Fragment
implements
CallbackHandler
.
EventListener
{
@BindView
(
R
.
id
.
swipeRefreshLayout
)
SwipeRefreshLayout
mSwipeRefreshLayout
;
@BindView
(
R
.
id
.
recyclerView
)
RecyclerView
recyclerView
;
public
static
List
<
ApplicationInfo
>
listApps
,
fListApps
=
new
ArrayList
<>();
public
static
List
<
String
>
hideList
=
new
ArrayList
<>();
// Don't show in list...
public
static
final
List
<
String
>
blacklist
=
Arrays
.
asList
(
"android"
,
"com.topjohnwu.magisk"
,
"com.google.android.gms"
,
"com.google.android.apps.walletnfcrel"
,
"com.nianticlabs.pokemongo"
);
public
static
CallbackHandler
.
Event
packageLoadDone
=
new
CallbackHandler
.
Event
();
private
PackageManager
packageManager
;
private
View
mView
;
private
List
<
ApplicationInfo
>
listApps
=
new
ArrayList
<>(),
fListApps
=
new
ArrayList
<>();
private
List
<
String
>
hideList
=
new
ArrayList
<>();
private
ApplicationAdapter
appAdapter
=
new
ApplicationAdapter
(
fListApps
,
hideList
);
private
SearchView
.
OnQueryTextListener
searchListener
;
...
...
@@ -50,14 +64,15 @@ public class MagiskHideFragment extends Fragment {
mSwipeRefreshLayout
.
setRefreshing
(
true
);
mSwipeRefreshLayout
.
setOnRefreshListener
(()
->
{
recyclerView
.
setVisibility
(
View
.
GONE
);
new
LoadApps
(
).
exec
();
new
Async
.
LoadApps
(
packageManager
).
exec
();
});
recyclerView
.
s
wapAdapter
(
appAdapter
,
true
);
recyclerView
.
s
etAdapter
(
appAdapter
);
searchListener
=
new
SearchView
.
OnQueryTextListener
()
{
@Override
public
boolean
onQueryTextSubmit
(
String
query
)
{
new
FilterApps
().
exec
(
query
);
return
false
;
}
...
...
@@ -68,7 +83,6 @@ public class MagiskHideFragment extends Fragment {
}
};
new
LoadApps
().
exec
();
return
mView
;
}
...
...
@@ -85,27 +99,23 @@ public class MagiskHideFragment extends Fragment {
setHasOptionsMenu
(
true
);
mView
=
this
.
getView
();
getActivity
().
setTitle
(
R
.
string
.
magiskhide
);
CallbackHandler
.
register
(
packageLoadDone
,
this
);
if
(
packageLoadDone
.
isTriggered
)
{
onTrigger
(
packageLoadDone
);
}
}
private
class
LoadApps
extends
Async
.
RootTask
<
Void
,
Void
,
Void
>
{
@Override
protected
Void
doInBackground
(
Void
...
voids
)
{
listApps
.
clear
();
hideList
.
clear
();
fListApps
.
clear
();
listApps
.
addAll
(
packageManager
.
getInstalledApplications
(
PackageManager
.
GET_META_DATA
));
Collections
.
sort
(
listApps
,
(
a
,
b
)
->
a
.
loadLabel
(
packageManager
).
toString
().
toLowerCase
()
.
compareTo
(
b
.
loadLabel
(
packageManager
).
toString
().
toLowerCase
()));
hideList
.
addAll
(
Shell
.
su
(
Async
.
MAGISK_HIDE_PATH
+
"list"
));
fListApps
.
addAll
(
listApps
);
return
null
;
public
void
onPause
()
{
super
.
onPause
();
CallbackHandler
.
unRegister
(
packageLoadDone
,
this
);
}
@Override
protected
void
onPostExecute
(
Void
aVoid
)
{
public
void
onTrigger
(
CallbackHandler
.
Event
event
)
{
Logger
.
dev
(
"MagiskHideFragment: UI refresh"
);
updateUI
();
}
}
private
class
FilterApps
extends
Async
.
NormalTask
<
String
,
Void
,
Void
>
{
@Override
...
...
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
View file @
fb0923f3
...
...
@@ -42,6 +42,7 @@ public class SplashActivity extends AppCompatActivity {
new
Async
.
LoadRepos
(
getApplicationContext
()).
exec
();
}
}.
exec
();
new
Async
.
LoadApps
(
getPackageManager
()).
exec
();
// Start main activity
Intent
intent
=
new
Intent
(
getApplicationContext
(),
MainActivity
.
class
);
...
...
app/src/main/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java
View file @
fb0923f3
...
...
@@ -29,19 +29,11 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
private
Context
context
;
private
PackageManager
packageManager
;
// Don't show in list...
private
static
final
String
[]
blackList
=
{
"com.topjohnwu.magisk"
,
"com.google.android.gms"
};
public
ApplicationAdapter
(
List
<
ApplicationInfo
>
list
,
List
<
String
>
hideList
)
{
mList
=
list
;
mHideList
=
hideList
;
List
<
String
>
bl
=
Arrays
.
asList
(
blackList
);
for
(
int
i
=
0
;
i
<
mList
.
size
();
++
i
)
if
(
bl
.
contains
(
mList
.
get
(
i
).
packageName
))
mList
.
remove
(
i
);
}
@Override
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Async.java
View file @
fb0923f3
...
...
@@ -2,6 +2,8 @@ package com.topjohnwu.magisk.utils;
import
android.app.ProgressDialog
;
import
android.content.Context
;
import
android.content.pm.ApplicationInfo
;
import
android.content.pm.PackageManager
;
import
android.database.Cursor
;
import
android.net.Uri
;
import
android.os.AsyncTask
;
...
...
@@ -10,6 +12,7 @@ import android.util.Log;
import
android.widget.Toast
;
import
com.topjohnwu.magisk.InstallFragment
;
import
com.topjohnwu.magisk.MagiskHideFragment
;
import
com.topjohnwu.magisk.MainActivity
;
import
com.topjohnwu.magisk.ModulesFragment
;
import
com.topjohnwu.magisk.R
;
...
...
@@ -25,6 +28,8 @@ import java.io.FileOutputStream;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.OutputStream
;
import
java.util.Collections
;
import
java.util.Iterator
;
import
java.util.List
;
public
class
Async
{
...
...
@@ -114,6 +119,38 @@ public class Async {
}
}
public
static
class
LoadApps
extends
RootTask
<
Void
,
Void
,
Void
>
{
private
PackageManager
pm
;
public
LoadApps
(
PackageManager
packageManager
)
{
pm
=
packageManager
;
}
@Override
protected
Void
doInBackground
(
Void
...
voids
)
{
if
(!
Shell
.
rootAccess
())
return
null
;
MagiskHideFragment
.
hideList
.
clear
();
MagiskHideFragment
.
fListApps
.
clear
();
MagiskHideFragment
.
listApps
=
pm
.
getInstalledApplications
(
PackageManager
.
GET_META_DATA
);
for
(
Iterator
<
ApplicationInfo
>
i
=
MagiskHideFragment
.
listApps
.
iterator
();
i
.
hasNext
();
)
{
ApplicationInfo
info
=
i
.
next
();
if
(
MagiskHideFragment
.
blacklist
.
contains
(
info
.
packageName
)
||
!
info
.
enabled
)
i
.
remove
();
}
Collections
.
sort
(
MagiskHideFragment
.
listApps
,
(
a
,
b
)
->
a
.
loadLabel
(
pm
).
toString
().
toLowerCase
()
.
compareTo
(
b
.
loadLabel
(
pm
).
toString
().
toLowerCase
()));
MagiskHideFragment
.
hideList
.
addAll
(
Shell
.
su
(
Async
.
MAGISK_HIDE_PATH
+
"list"
));
MagiskHideFragment
.
fListApps
.
addAll
(
MagiskHideFragment
.
listApps
);
return
null
;
}
@Override
protected
void
onPostExecute
(
Void
aVoid
)
{
MagiskHideFragment
.
packageLoadDone
.
trigger
();
}
}
public
static
class
FlashZIP
extends
RootTask
<
Void
,
String
,
Integer
>
{
protected
Uri
mUri
;
...
...
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