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
d30397e9
Commit
d30397e9
authored
Jan 29, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Let users know why blacklist PoGO and AP...
parent
d9597549
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
23 deletions
+38
-23
MagiskHideFragment.java
...rc/main/java/com/topjohnwu/magisk/MagiskHideFragment.java
+0
-7
ApplicationAdapter.java
...ava/com/topjohnwu/magisk/adapters/ApplicationAdapter.java
+35
-13
Async.java
app/src/main/java/com/topjohnwu/magisk/utils/Async.java
+2
-1
strings.xml
app/src/main/res/values/strings.xml
+1
-2
No files found.
app/src/main/java/com/topjohnwu/magisk/MagiskHideFragment.java
View file @
d30397e9
...
@@ -29,13 +29,6 @@ import butterknife.Unbinder;
...
@@ -29,13 +29,6 @@ import butterknife.Unbinder;
public
class
MagiskHideFragment
extends
Fragment
implements
CallbackHandler
.
EventListener
{
public
class
MagiskHideFragment
extends
Fragment
implements
CallbackHandler
.
EventListener
{
public
static
final
List
<
String
>
HIDEBLACKLIST
=
Arrays
.
asList
(
"android"
,
"com.topjohnwu.magisk"
,
"com.google.android.gms"
,
"com.google.android.apps.walletnfcrel"
,
"com.nianticlabs.pokemongo"
);
private
Unbinder
unbinder
;
private
Unbinder
unbinder
;
@BindView
(
R
.
id
.
swipeRefreshLayout
)
SwipeRefreshLayout
mSwipeRefreshLayout
;
@BindView
(
R
.
id
.
swipeRefreshLayout
)
SwipeRefreshLayout
mSwipeRefreshLayout
;
@BindView
(
R
.
id
.
recyclerView
)
RecyclerView
recyclerView
;
@BindView
(
R
.
id
.
recyclerView
)
RecyclerView
recyclerView
;
...
...
app/src/main/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java
View file @
d30397e9
...
@@ -2,6 +2,7 @@ package com.topjohnwu.magisk.adapters;
...
@@ -2,6 +2,7 @@ package com.topjohnwu.magisk.adapters;
import
android.content.pm.ApplicationInfo
;
import
android.content.pm.ApplicationInfo
;
import
android.content.pm.PackageManager
;
import
android.content.pm.PackageManager
;
import
android.support.design.widget.Snackbar
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.RecyclerView
;
import
android.view.LayoutInflater
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.View
;
...
@@ -16,6 +17,7 @@ import com.topjohnwu.magisk.utils.Async;
...
@@ -16,6 +17,7 @@ import com.topjohnwu.magisk.utils.Async;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.magisk.utils.Utils
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
...
@@ -24,6 +26,17 @@ import butterknife.ButterKnife;
...
@@ -24,6 +26,17 @@ import butterknife.ButterKnife;
public
class
ApplicationAdapter
extends
RecyclerView
.
Adapter
<
ApplicationAdapter
.
ViewHolder
>
{
public
class
ApplicationAdapter
extends
RecyclerView
.
Adapter
<
ApplicationAdapter
.
ViewHolder
>
{
public
static
final
List
<
String
>
BLACKLIST
=
Arrays
.
asList
(
"android"
,
"com.topjohnwu.magisk"
,
"com.google.android.gms"
);
private
static
final
List
<
String
>
SNLIST
=
Arrays
.
asList
(
"com.google.android.apps.walletnfcrel"
,
"com.nianticlabs.pokemongo"
);
private
List
<
ApplicationInfo
>
mOriginalList
,
mList
;
private
List
<
ApplicationInfo
>
mOriginalList
,
mList
;
private
List
<
String
>
mHideList
;
private
List
<
String
>
mHideList
;
private
PackageManager
packageManager
;
private
PackageManager
packageManager
;
...
@@ -33,6 +46,7 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
...
@@ -33,6 +46,7 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
mOriginalList
=
mList
=
Collections
.
emptyList
();
mOriginalList
=
mList
=
Collections
.
emptyList
();
mHideList
=
Collections
.
emptyList
();
mHideList
=
Collections
.
emptyList
();
this
.
packageManager
=
packageManager
;
this
.
packageManager
=
packageManager
;
filter
=
new
ApplicationFilter
();
}
}
public
void
setLists
(
List
<
ApplicationInfo
>
listApps
,
List
<
String
>
hideList
)
{
public
void
setLists
(
List
<
ApplicationInfo
>
listApps
,
List
<
String
>
hideList
)
{
...
@@ -55,7 +69,17 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
...
@@ -55,7 +69,17 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
holder
.
appName
.
setText
(
info
.
loadLabel
(
packageManager
));
holder
.
appName
.
setText
(
info
.
loadLabel
(
packageManager
));
holder
.
appPackage
.
setText
(
info
.
packageName
);
holder
.
appPackage
.
setText
(
info
.
packageName
);
// Remove all listeners
holder
.
itemView
.
setOnClickListener
(
null
);
holder
.
checkBox
.
setOnCheckedChangeListener
(
null
);
holder
.
checkBox
.
setOnCheckedChangeListener
(
null
);
if
(
SNLIST
.
contains
(
info
.
packageName
))
{
holder
.
checkBox
.
setChecked
(
true
);
holder
.
checkBox
.
setEnabled
(
false
);
holder
.
itemView
.
setOnClickListener
(
v
->
Snackbar
.
make
(
holder
.
itemView
,
R
.
string
.
safetyNet_hide_notice
,
Snackbar
.
LENGTH_LONG
).
show
());
}
else
{
holder
.
checkBox
.
setEnabled
(
true
);
holder
.
checkBox
.
setChecked
(
mHideList
.
contains
(
info
.
packageName
));
holder
.
checkBox
.
setChecked
(
mHideList
.
contains
(
info
.
packageName
));
holder
.
checkBox
.
setOnCheckedChangeListener
((
v
,
isChecked
)
->
{
holder
.
checkBox
.
setOnCheckedChangeListener
((
v
,
isChecked
)
->
{
if
(
isChecked
)
{
if
(
isChecked
)
{
...
@@ -67,6 +91,7 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
...
@@ -67,6 +91,7 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
}
}
});
});
}
}
}
@Override
@Override
public
int
getItemCount
()
{
public
int
getItemCount
()
{
...
@@ -74,9 +99,6 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
...
@@ -74,9 +99,6 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
}
}
public
void
filter
(
String
constraint
)
{
public
void
filter
(
String
constraint
)
{
if
(
filter
==
null
)
{
filter
=
new
ApplicationFilter
();
}
filter
.
filter
(
constraint
);
filter
.
filter
(
constraint
);
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Async.java
View file @
d30397e9
...
@@ -13,6 +13,7 @@ import android.widget.Toast;
...
@@ -13,6 +13,7 @@ import android.widget.Toast;
import
com.topjohnwu.magisk.Global
;
import
com.topjohnwu.magisk.Global
;
import
com.topjohnwu.magisk.MagiskHideFragment
;
import
com.topjohnwu.magisk.MagiskHideFragment
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.adapters.ApplicationAdapter
;
import
com.topjohnwu.magisk.module.ModuleHelper
;
import
com.topjohnwu.magisk.module.ModuleHelper
;
import
org.json.JSONException
;
import
org.json.JSONException
;
...
@@ -127,7 +128,7 @@ public class Async {
...
@@ -127,7 +128,7 @@ public class Async {
List
<
ApplicationInfo
>
listApps
=
pm
.
getInstalledApplications
(
PackageManager
.
GET_META_DATA
);
List
<
ApplicationInfo
>
listApps
=
pm
.
getInstalledApplications
(
PackageManager
.
GET_META_DATA
);
for
(
Iterator
<
ApplicationInfo
>
i
=
listApps
.
iterator
();
i
.
hasNext
();
)
{
for
(
Iterator
<
ApplicationInfo
>
i
=
listApps
.
iterator
();
i
.
hasNext
();
)
{
ApplicationInfo
info
=
i
.
next
();
ApplicationInfo
info
=
i
.
next
();
if
(
MagiskHideFragment
.
HIDE
BLACKLIST
.
contains
(
info
.
packageName
)
||
!
info
.
enabled
)
if
(
ApplicationAdapter
.
BLACKLIST
.
contains
(
info
.
packageName
)
||
!
info
.
enabled
)
i
.
remove
();
i
.
remove
();
}
}
Collections
.
sort
(
listApps
,
(
a
,
b
)
->
a
.
loadLabel
(
pm
).
toString
().
toLowerCase
()
Collections
.
sort
(
listApps
,
(
a
,
b
)
->
a
.
loadLabel
(
pm
).
toString
().
toLowerCase
()
...
...
app/src/main/res/values/strings.xml
View file @
d30397e9
...
@@ -113,6 +113,7 @@
...
@@ -113,6 +113,7 @@
<string
name=
"settings_reboot_toast"
>
Reboot to apply settings
</string>
<string
name=
"settings_reboot_toast"
>
Reboot to apply settings
</string>
<string
name=
"check_release_notes"
>
Check release notes
</string>
<string
name=
"check_release_notes"
>
Check release notes
</string>
<string
name=
"repo_cache_cleared"
>
Repo cache cleared
</string>
<string
name=
"repo_cache_cleared"
>
Repo cache cleared
</string>
<string
name=
"safetyNet_hide_notice"
>
This app uses SafetyNet\nAlready handled by MagiskHide by default
</string>
<!--URL Templates-->
<!--URL Templates-->
<string
name=
"url_main"
translatable=
"false"
>
https://api.github.com/orgs/Magisk-Modules-Repo/repos
</string>
<string
name=
"url_main"
translatable=
"false"
>
https://api.github.com/orgs/Magisk-Modules-Repo/repos
</string>
...
@@ -153,8 +154,6 @@
...
@@ -153,8 +154,6 @@
<string
name=
"settings_shell_logging_title"
>
Enable shell command debug logging
</string>
<string
name=
"settings_shell_logging_title"
>
Enable shell command debug logging
</string>
<string
name=
"settings_shell_logging_summary"
>
Check this to enable logging all shell commands and its output
</string>
<string
name=
"settings_shell_logging_summary"
>
Check this to enable logging all shell commands and its output
</string>
<!-- Themes -->
<!--Superuser-->
<!--Superuser-->
<string
name=
"su_request_title"
>
Superuser Request
</string>
<string
name=
"su_request_title"
>
Superuser Request
</string>
<string
name=
"deny_with_str"
>
Deny%1$s
</string>
<string
name=
"deny_with_str"
>
Deny%1$s
</string>
...
...
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