tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.6.3 - Alpha5 - 脚本项目配置 permissions 选项支持宽松匹配及别名兼容

Browse Source
This commit is contained in:
SuperMonster003
2025-05-26 00:47:30 +08:00
parent 68e19da35b
commit 8359429868
3 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
View File

@@ -72,7 +72,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.TreeMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Function;
@@ -126,6 +128,11 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
add(new Pair<>("V3", "Android 9.0+"));
}};
private final Map<String, String> PERMISSION_ALIAS = new HashMap<>() {{
put("shizuku", "moe.shizuku.manager.permission.API_V23");
put("termux", "com.termux.permission.RUN_COMMAND");
}};
private final Map<String, Integer> SUPPORTED_PERMISSIONS = new TreeMap<>() {{
put("android.permission.ACCESS_COARSE_LOCATION", R.string.text_permission_desc_access_coarse_location);
put("android.permission.ACCESS_FINE_LOCATION", R.string.text_permission_desc_access_fine_location);
@@ -193,8 +200,8 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
put("com.android.launcher.permission.INSTALL_SHORTCUT", R.string.text_permission_desc_install_shortcut);
put("com.android.launcher.permission.UNINSTALL_SHORTCUT", R.string.text_permission_desc_uninstall_shortcut);
put("com.android.vending.BILLING", R.string.text_permission_desc_billing);
put("com.termux.permission.RUN_COMMAND", R.string.text_permission_desc_termux_run_command);
put("moe.shizuku.manager.permission.API_V23", R.string.text_permission_desc_shizuku);
put(PERMISSION_ALIAS.get("termux"), R.string.text_permission_desc_termux_run_command);
put(PERMISSION_ALIAS.get("shizuku"), R.string.text_permission_desc_shizuku);
}};
EditText mSourcePathView;
@@ -547,7 +554,21 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
int marginInPixels = (int) (8 * getResources().getDisplayMetrics().density);
checkBox.setPadding(marginInPixels, 0, 0, 0);
if (mProjectConfig != null) {
boolean checked = mProjectConfig.getPermissions().stream().anyMatch(p -> ("android.permission." + p.toUpperCase()).equals(permission));
boolean checked = mProjectConfig.getPermissions().stream().anyMatch(p -> {
var lc = p.toLowerCase(Locale.ROOT);
var uc = p.toUpperCase(Locale.ROOT);
if (p.equalsIgnoreCase(permission)) {
return true;
}
if (permission.contains("android")) {
String refined = uc.substring(uc.lastIndexOf(".") + 1).replaceAll("\\W", "_");
return Objects.equals(refined, permission.substring(permission.lastIndexOf(".") + 1));
}
if (PERMISSION_ALIAS.containsKey(lc)) {
return Objects.equals(permission, PERMISSION_ALIAS.get(lc));
}
return false;
});
checkBox.setChecked(checked);
} else {
checkBox.setChecked(false);