WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix manager blackwhite list logic

This commit is contained in:
tehcneko 2021-01-29 11:30:01 +08:00
parent 3bdfbe8c4d
commit b16d0f96ec
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/io/github/lsposed/manager/adapters/AppHelper.java
View File

@ -12,11 +12,6 @@ import androidx.annotation.NonNull;
import androidx.appcompat.widget.PopupMenu; import androidx.appcompat.widget.PopupMenu;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import io.github.lsposed.manager.App;
import io.github.lsposed.manager.Constants;
import io.github.lsposed.manager.R;
import io.github.lsposed.manager.util.CompileUtil;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
@ -26,6 +21,11 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import io.github.lsposed.manager.App;
import io.github.lsposed.manager.Constants;
import io.github.lsposed.manager.R;
import io.github.lsposed.manager.util.CompileUtil;
import static android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS; import static android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS;
public class AppHelper { public class AppHelper {
@ -51,20 +51,28 @@ public class AppHelper {
public static List<String> getAppList(boolean white) { public static List<String> getAppList(boolean white) {
Path dir = Paths.get(BASE_PATH + (white ? WHITE_LIST_PATH : BLACK_LIST_PATH)); Path dir = Paths.get(BASE_PATH + (white ? WHITE_LIST_PATH : BLACK_LIST_PATH));
List<String> s = new ArrayList<>(); List<String> list = new ArrayList<>();
try { try {
Files.list(dir).forEach(path -> { Files.list(dir).forEach(path -> {
if (!Files.isDirectory(path)) { if (!Files.isDirectory(path)) {
String packageName = path.getFileName().toString(); list.add(path.getFileName().toString());
if (forceWhiteList.contains(packageName)) {
createAppListFile(packageName, white, white);
}
if (white) s.add(packageName);
} }
}); });
return s; forceWhiteList.forEach(s -> {
if (list.contains(s)) {
if (!white) {
createAppListFile(s, false, false);
list.remove(s);
}
} else if (white) {
createAppListFile(s, true, true);
list.add(s);
}
});
return list;
} catch (IOException e) { } catch (IOException e) {
return s; e.printStackTrace();
return list;
} }
} }