TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-11-15 11:05:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve magisk hide app list's adapter, better thread safety

Browse Source
This commit is contained in:
tonymanou
2017-01-08 14:41:19 +01:00
committed by topjohnwu
parent b91919bffa
commit 2a70619577
5 changed files with 100 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/com/topjohnwu/magisk/utils/Async.java
View File

@@ -117,7 +117,7 @@ public class Async {
}
}
public static class LoadApps extends RootTask<Void, Void, Void> {
public static class LoadApps extends RootTask<Void, Void, LoadApps.Result> {
private PackageManager pm;
@@ -126,25 +126,33 @@ public class Async {
}
@Override
protected Void doInBackground(Void... voids) {
MagiskHideFragment.hideList.clear();
MagiskHideFragment.fListApps.clear();
MagiskHideFragment.listApps = pm.getInstalledApplications(PackageManager.GET_META_DATA);
for (Iterator<ApplicationInfo> i = MagiskHideFragment.listApps.iterator(); i.hasNext(); ) {
protected Result doInBackground(Void... voids) {
List<ApplicationInfo> listApps = pm.getInstalledApplications(PackageManager.GET_META_DATA);
for (Iterator<ApplicationInfo> i = listApps.iterator(); i.hasNext(); ) {
ApplicationInfo info = i.next();
if (MagiskHideFragment.blacklist.contains(info.packageName) || !info.enabled)
if (MagiskHideFragment.BLACKLIST.contains(info.packageName) || !info.enabled)
i.remove();
}
Collections.sort(MagiskHideFragment.listApps, (a, b) -> a.loadLabel(pm).toString().toLowerCase()
Collections.sort(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;
List<String> hideList = Shell.su(Async.MAGISK_HIDE_PATH + "list");
return new Result(listApps, hideList);
}
@Override
protected void onPostExecute(Void aVoid) {
MagiskHideFragment.packageLoadDone.trigger();
protected void onPostExecute(Result result) {
MagiskHideFragment.packageLoadDone.trigger(result);
}
public static class Result {
public final List<ApplicationInfo> listApps;
public final List<String> hideList;
Result(List<ApplicationInfo> listApps, List<String> hideList) {
this.listApps = listApps;
this.hideList = hideList;
}
}
}

12
app/src/main/java/com/topjohnwu/magisk/utils/CallbackHandler.java
View File

@@ -33,11 +33,23 @@ public class CallbackHandler {
}
public static class Event {
public boolean isTriggered = false;
private Object result;
public void trigger() {
trigger(null);
}
public void trigger(Object result) {
this.result = result;
isTriggered = true;
triggerCallback(this);
}
public Object getResult() {
return result;
}
}
public interface EventListener {

5
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
View File

@@ -9,6 +9,7 @@ import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Environment;
import android.support.v4.app.ActivityCompat;
import android.text.TextUtils;
import android.util.Base64;
import android.widget.Toast;
@@ -144,6 +145,10 @@ public class Utils {
}
}
public static boolean lowercaseContains(CharSequence string, CharSequence nonNullLowercaseSearch) {
return !TextUtils.isEmpty(string) && string.toString().toLowerCase().contains(nonNullLowercaseSearch);
}
public static class ByteArrayInOutStream extends ByteArrayOutputStream {
public ByteArrayInputStream getInputStream() {
ByteArrayInputStream in = new ByteArrayInputStream(buf, 0, count);