diff --git a/.cargo/config.toml b/.cargo/config.toml
index ac2b23f..115192e 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,2 +1,6 @@
[target.x86_64-pc-windows-msvc]
rustflags = ["-C", "target-feature=+crt-static"]
+
+[target.x86_64-unknown-linux-gnu]
+linker = "clang"
+rustflags = ["-C", "link-arg=-fuse-ld=mold"]
diff --git a/.deepsource.toml b/.deepsource.toml
new file mode 100644
index 0000000..21d4940
--- /dev/null
+++ b/.deepsource.toml
@@ -0,0 +1,13 @@
+version = 1
+
+[[analyzers]]
+name = "rust"
+
+ [analyzers.meta]
+ msrv = "stable"
+
+[[analyzers]]
+name = "test-coverage"
+
+[[transformers]]
+name = "rustfmt"
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yml b/.github/ISSUE_TEMPLATE/1-bug-report.yml
index d00294e..8246a4d 100644
--- a/.github/ISSUE_TEMPLATE/1-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/1-bug-report.yml
@@ -62,24 +62,15 @@ body:
label: Desktop Environment
description: If relevant, please fill it
placeholder: GNOME 46, KDE Plasma 4, etc...
-- type: input
- id: adb-v
- attributes:
- label: ADB version
- description: If relevant, please fill it
- placeholder: 1.0.41
- type: textarea
id: logfiles
attributes:
label: Provide logs
description: "Paste the relevant (notice the line timestamps) slice (contiguous range) of [the logfile generated by UAD-ng](https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/wiki/FAQ#where-are-the-logfiles)"
- value: |
- Log
+ render: "" # this should disable soft-wrap
+ validations:
+ required: true
- ```
- Please replace this line by the log-file contents
- ```
-
-
-
+
+**Check out the issues, and [feel free to contribute!](https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/wiki/How-to-contribute)**
+
+**For real-time communication, consider joining our Discord server:**
+
+[](https://discord.gg/YHujHzA57a)
+
+**In case you prefer using Matrix (using a Matrix bridge to Discord):**
+
+[
](https://matrix.to/#/#uad-ng:matrix.org)
+
+
+## Summary
+
+This is a detached fork of the [UAD project](https://github.com/0x192/universal-android-debloater), which aims to improve privacy and battery performance by removing unnecessary and obscure system apps.
+This can also contribute to improving security by reducing (but not eliminating) [the attack surface](https://en.wikipedia.org/wiki/Attack_surface). Read the [wiki](https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/wiki) for more details on getting started. Whilst UAD-ng can remove system apps, it cannot detect or remove potentially malicious system services or drivers baked into the firmware of your device by various vendors; some vendor-specific apps are only UI front-ends to vendor-provided system services, and as such disabling/uninstalling those apps will not stop a service from running. Additional information can be found in package descriptions inside the Universal Android Debloater Next Generation application.
## Documentation
-Everything about UAD-ng (and related stuff) can be found on the Wiki, such as:
-
-- [Getting started](https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/wiki/Getting-started)
-- Features of this app
-- [Usage guide](https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/wiki/Usage)
-- Suggested Android app replacements
-- How to get the cutting-edge version by [building the source-code](https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/wiki/Building-from-source)
-- Weird things OEMs do
-- [Suggested apps for analyzing APKs](https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/wiki/How-to-contribute#useful-apps)
-
-## Privacy
-
-UAD-ng does not collect or transmit any user data. The only external connections are `GET` requests to GitHub for fetching the [package list](https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/blob/main/resources/assets/uad_lists.json) ([src/core/uad_lists.rs](src/core/uad_lists.rs)) and checking for updates ([src/core/update.rs](src/core/update.rs)).
-
-## Contact
-
-**For real-time communication and support, consider joining our Discord guild:**
-
-[
](https://discord.gg/CzwbMCPEZa)
-
-**If you prefer using Matrix, we have a bridge to Discord:**
-
-[
](https://matrix.to/#/#uad-ng:matrix.org)
-
-## Friends
-
-Several projects integrate with or depend on UAD-ng's data and tools:
-
-- **[Canta](https://github.com/samolego/Canta)** — A mobile Android debloater that uses Shizuku for rootless privilege escalation. It integrates with UAD-ng's Universal Debloat List to provide safe package recommendations without requiring a PC.
-
-- **Projects by [Muntashir Akon](https://github.com/MuntashirAkon):**
- - **[AppManager](https://github.com/MuntashirAkon/AppManager)** — An advanced Android app manager with powerful debloating features.
- - **[android-debloat-list](https://github.com/MuntashirAkon/android-debloat-list)** — A comprehensive, community-driven list of Android packages to debloat, based on UAD-ng's list.
+For documentation regarding how to use UAD-ng, the FAQ, building from source and how to decompile/extract APKs, see [our Wiki](https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/wiki).
## Special thanks
- [@0x192](https://github.com/0x192) who created the original UAD project.
-- [@mawilms](https://github.com/mawilms) for his LotRO plugin manager ([Lembas](https://github.com/mawilms/lembas)) which helped a lot to understand how to use the [Iced](https://github.com/iced-rs/iced) GUI library.
+- [@mawilms](https://github.com/mawilms) for his LotRO plugin manager ([Lembas](https://github.com/mawilms/lembas)) which helped a lot to understand how to use the [Iced](https://github.com/hecrj/iced) GUI library.
- [@casperstorm](https://github.com/casperstorm) for the UI/UX inspiration.
diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index c029638..0000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Release management
-
-## Semantic versioning
-
-We're making use of [semantic versioning](https://semver.org/). We use semantic versioning for two things:
-
-1. GitHub Milestones
-1. UAD-ng releases
-
-Speaking of milestones: it could be that we have a bug-fix release (e.g. 1.0.3), but a contributor submits a PR that adds a new feature. What do we do? Merge after we released 1.0.3? Change the name of the milestone to for example 1.1.0? Or another approach?
-
-In that case, we should closely review the PR and 'compare' it with what semantic versioning has to say about the submitted feature. If the changes are significant enough, we're renaming the milestone to (for example) 1.1.0.
-
-## Checklist before releasing a new version
-
-- [ ] Make sure the Milestone is completed and if not, check what needs to be done to complete it.
-- [ ] Make sure all merged PRs regarding the application follow the Conventional Commit Messages style. This makes sure that when generating a changelog, the changes look consistent, which in turn improves readability.
-- [ ] Make sure all merged PRs have the correct labels assigned, as the changelog is generated based on labels.
-- [ ] Create a release preparation PR that bumps the UAD-ng version in `Cargo.toml` and `Cargo.lock`.
-
-When all the above has been checked, you can push a tag to `main` to trigger the GitHub Action that creates a release:
-
-- Create the tag: `git tag -s v1.2.3 -am '1.2.3'`
-- Push the tag: `git push origin v1.2.3`
-
-Change the version number to whatever version we're releasing.
-
-## Development process
-
-1. Update dependencies right after a new release, so that we start a new milestone with updated dependencies
-1. On-going development of bug-fixes and new features etc, along with fixing potential bugs, potentially due to the updated dependencies
-1. Release
-
-## Faulty releases
-
-If we publish a faulty release, for example containing a critical bug, this is how we should deal with it:
-
-We issue a hotfix and keep the faulty release but we'll add warnings to the faulty release in the changelog.
diff --git a/build.rs b/build.rs
index e2bbb62..cc564fe 100644
--- a/build.rs
+++ b/build.rs
@@ -1,11 +1,9 @@
-const META: &str = "resources/assets/manifest.rc";
+use std::{env, error::Error};
-fn main() -> Result<(), Box> {
- println!("cargo::rerun-if-changed={META}");
- if std::env::var("CARGO_CFG_TARGET_FAMILY")? == "windows" {
- embed_resource::compile(META, embed_resource::NONE)
- .manifest_optional()
- .unwrap();
+fn main() -> Result<(), Box> {
+ if env::var("CARGO_CFG_TARGET_FAMILY")? == "windows" {
+ embed_resource::compile("resources/assets/manifest.rc", embed_resource::NONE);
}
+
Ok(())
}
diff --git a/clippy.toml b/clippy.toml
deleted file mode 100644
index ea830ad..0000000
--- a/clippy.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-disallowed-types = [
- { path = "iced::widget::Text", reason = "Use [`crate::gui::widgets::text`] instead. For further details, see #523 and #858" },
-]
-
-disallowed-methods= [
- { path = "iced::widget::text", reason = "Use [`crate::gui::widgets::text`] instead. For further details, see #523 and #858" },
-]
diff --git a/crates/uad-cli/Cargo.toml b/crates/uad-cli/Cargo.toml
deleted file mode 100644
index 6045f95..0000000
--- a/crates/uad-cli/Cargo.toml
+++ /dev/null
@@ -1,52 +0,0 @@
-[package]
-name = "uad-cli"
-version.workspace = true
-authors.workspace = true
-license.workspace = true
-homepage.workspace = true
-repository.workspace = true
-readme.workspace = true
-keywords.workspace = true
-categories = ["command-line-utilities"]
-edition.workspace = true
-
-[[bin]]
-name = "uad"
-path = "src/main.rs"
-
-[dependencies]
-uad-core = { path = "../uad-core" }
-clap.workspace = true
-clap_complete = "4.4"
-tokio.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-log.workspace = true
-chrono.workspace = true
-toml.workspace = true
-dirs.workspace = true
-ureq.workspace = true
-retry.workspace = true
-csv.workspace = true
-rustyline = "14.0"
-
-[lints.rust]
-deprecated_safe = "warn"
-
-[lints.clippy]
-undocumented_unsafe_blocks = "deny"
-exit = "deny"
-panic_in_result_fn = "warn"
-infinite_loop = "warn"
-mem_forget = "warn"
-implicit_clone = "warn"
-format_push_string = "warn"
-large_include_file = "warn"
-shadow_unrelated = "warn"
-struct_field_names = "allow" # annoying
-
-disallowed_types = "deny"
-disallowed_methods = "deny"
-
-allow_attributes_without_reason = "warn"
-pedantic = { level = "warn", priority = -1 }
diff --git a/crates/uad-cli/examples/usage.sh b/crates/uad-cli/examples/usage.sh
deleted file mode 100755
index ab3192e..0000000
--- a/crates/uad-cli/examples/usage.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-# Example usage script for UAD CLI
-
-# Check if uad-cli is available
-if ! command -v uad &> /dev/null; then
- echo "uad command not found. Please build and install uad-cli first."
- exit 1
-fi
-
-echo "=== UAD CLI Usage Examples ==="
-echo
-
-echo "1. List connected devices:"
-uad devices
-echo
-
-echo "2. List all enabled packages:"
-uad list --state enabled | head -20
-echo "... (showing first 20)"
-echo
-
-echo "3. Search for Google packages:"
-uad list --search google | head -10
-echo "... (showing first 10)"
-echo
-
-echo "4. Show info about a package (example):"
-echo "uad info com.google.android.gms"
-echo
-
-echo "5. Dry-run uninstall (safe to test):"
-echo "uad uninstall com.example.package --dry-run"
-echo
-
-echo "6. Start interactive mode:"
-echo "uad repl"
-echo
-
-echo "=== Generate shell completions ==="
-echo "For bash: uad completions bash > ~/.local/share/bash-completion/completions/uad"
-echo "For zsh: uad completions zsh > ~/.local/share/zsh/site-functions/_uad"
-echo "For fish: uad completions fish > ~/.config/fish/completions/uad.fish"
-
diff --git a/crates/uad-cli/src/commands.rs b/crates/uad-cli/src/commands.rs
deleted file mode 100644
index 62286bd..0000000
--- a/crates/uad-cli/src/commands.rs
+++ /dev/null
@@ -1,470 +0,0 @@
-use clap::CommandFactory;
-use clap_complete::{Shell, generate};
-use std::collections::{HashMap, HashSet};
-use std::io::Write;
-use uad_core::adb::{ACommand, PmListPacksFlag};
-use uad_core::sync::{
- CorePackage, Phone, User, apply_pkg_state_commands, get_devices_list, get_package_state,
- run_adb_shell_action,
-};
-use uad_core::uad_lists::{Package, PackageState, Removal, UadList, load_debloat_lists};
-use uad_core::utils::{matches_search, truncate_description};
-
-use crate::device::{NO_DEVICES_FOUND, get_target_device, get_user};
-use crate::filters::{ListFilter, RemovalFilter, StateFilter};
-use crate::{Cli, print_or_exit, println_or_exit};
-
-/// List all connected Android devices
-pub fn list_devices() -> Result<(), Box> {
- println_or_exit!("Scanning for connected devices...");
- let devices = get_devices_list();
-
- if devices.is_empty() {
- return Err(NO_DEVICES_FOUND.into());
- }
-
- println_or_exit!("\nFound {} device(s):\n", devices.len());
- for device in &devices {
- println_or_exit!(" Model: {}", device.model);
- println_or_exit!(" Serial: {}", device.adb_id);
- println_or_exit!(" Android SDK: {}", device.android_sdk);
-
- if !device.user_list.is_empty() {
- println_or_exit!(" Users: {} user(s)", device.user_list.len());
- for user in &device.user_list {
- let protected = if user.protected { " (protected)" } else { "" };
- println_or_exit!(" - User ID: {}{}", user.id, protected);
- }
- }
- println_or_exit!();
- }
-
- Ok(())
-}
-
-/// Context for package filtering and display
-pub struct PackageListContext {
- pub state_filter: Option,
- pub removal_filter: Option,
- pub list_filter: Option,
- pub search: Option,
-}
-
-impl PackageListContext {
- /// Check if package passes all filters
- pub fn filter_package(
- &self,
- pkg_name: &str,
- pkg_info: Option<&Package>,
- pkg_state: PackageState,
- ) -> bool {
- // Removal filter
- if let Some(removal) = self.removal_filter {
- if !removal.matches(pkg_info) {
- return false;
- }
- }
-
- // State filter
- if let Some(state) = self.state_filter {
- if !state.matches(pkg_state) {
- return false;
- }
- }
-
- // List filter
- if let Some(list) = self.list_filter {
- if !list.matches(pkg_info) {
- return false;
- }
- }
-
- // Search filter
- if let Some(ref search_term) = self.search {
- let description = pkg_info.map(|p| p.description.as_str());
- if !matches_search(pkg_name, search_term, description) {
- return false;
- }
- }
-
- true
- }
-
- /// Determine what information to show based on active filters
- pub fn display_config(&self) -> DisplayConfig {
- DisplayConfig {
- show_state: self.state_filter.is_none_or(|f| !f.is_specific()),
- show_removal: self.removal_filter.is_none_or(|f| !f.is_specific()),
- }
- }
-}
-
-pub struct DisplayConfig {
- pub show_state: bool,
- pub show_removal: bool,
-}
-
-/// List packages on a device with filtering
-pub fn list_packages(
- device: Option,
- state_filter: Option,
- removal_filter: Option,
- list_filter: Option,
- search: Option,
- user_id: Option,
-) -> Result<(), Box> {
- let target_device = get_target_device(device)?;
- let uad_lists = load_debloat_lists(false).unwrap_or_else(|lists| lists);
-
- println_or_exit!(
- "Listing packages on: {} ({})\n",
- target_device.model,
- target_device.adb_id
- );
-
- let context = PackageListContext {
- state_filter,
- removal_filter,
- list_filter,
- search,
- };
-
- let pm_flag = state_filter.and_then(StateFilter::to_pm_flag);
- let system_packages = ACommand::new()
- .shell(&target_device.adb_id)
- .pm()
- .list_packages_sys(pm_flag, user_id)?;
-
- let displayed_count = display_package_list(
- &system_packages,
- &uad_lists,
- &target_device.adb_id,
- user_id,
- &context,
- )?;
-
- if displayed_count == 0 {
- println_or_exit!(" No packages found matching the specified filters.");
- } else {
- println_or_exit!("\nTotal: {} package(s)", displayed_count);
- }
-
- Ok(())
-}
-
-/// Display a list of packages with their info
-pub fn display_package_list(
- packages: &[String],
- uad_lists: &HashMap,
- device_serial: &str,
- user_id: Option,
- context: &PackageListContext,
-) -> Result> {
- let config = context.display_config();
- let mut displayed_count = 0;
-
- let enabled_packages: HashSet = ACommand::new()
- .shell(device_serial)
- .pm()
- .list_packages_sys(Some(PmListPacksFlag::OnlyEnabled), user_id)
- .unwrap_or_default()
- .into_iter()
- .collect();
- let disabled_packages: HashSet = ACommand::new()
- .shell(device_serial)
- .pm()
- .list_packages_sys(Some(PmListPacksFlag::OnlyDisabled), user_id)
- .unwrap_or_default()
- .into_iter()
- .collect();
-
- for pkg_name in packages {
- let pkg_info = uad_lists.get(pkg_name);
-
- let pkg_state = if enabled_packages.contains(pkg_name) {
- PackageState::Enabled
- } else if disabled_packages.contains(pkg_name) {
- PackageState::Disabled
- } else {
- PackageState::Uninstalled
- };
-
- if !context.filter_package(pkg_name, pkg_info, pkg_state) {
- continue;
- }
-
- display_package_entry(pkg_name, pkg_info, pkg_state, &config);
- displayed_count += 1;
- }
-
- Ok(displayed_count)
-}
-
-/// Display a single package entry
-pub fn display_package_entry(
- pkg_name: &str,
- pkg_info: Option<&Package>,
- pkg_state: PackageState,
- config: &DisplayConfig,
-) {
- print_or_exit!("[");
-
- if let Some(info) = pkg_info {
- if config.show_removal {
- print_or_exit!("{}", info.removal);
- if config.show_state {
- print_or_exit!(" - ");
- }
- }
- if config.show_state {
- print_or_exit!("{}", pkg_state);
- }
- print_or_exit!("] {}", pkg_name);
- if !info.description.is_empty() {
- print_or_exit!(" - {}", truncate_description(&info.description, 80));
- }
- } else {
- if config.show_removal {
- print_or_exit!("Unlisted");
- if config.show_state {
- print_or_exit!(" - ");
- }
- }
- if config.show_state {
- print_or_exit!("{}", pkg_state);
- }
- print_or_exit!("] {}", pkg_name);
- }
-
- println_or_exit!();
-}
-
-/// Change the state of one or more packages
-pub fn change_package_state(
- packages: &[String],
- device: Option,
- user_id: Option,
- dry_run: bool,
- target_state: PackageState,
- action_name: &str,
-) -> Result<(), Box> {
- if packages.is_empty() {
- return Err("No packages specified".into());
- }
-
- let target_device = get_target_device(device)?;
- let user = get_user(&target_device, user_id)?;
- let uad_lists = load_debloat_lists(false).unwrap_or_else(|lists| lists);
-
- println!(
- "{} {} package(s) on: {} ({})\n",
- action_name,
- packages.len(),
- target_device.model,
- target_device.adb_id
- );
-
- if dry_run {
- println!("DRY RUN - No changes will be made\n");
- }
-
- for pkg_name in packages {
- process_package_state_change(
- pkg_name,
- &target_device,
- user,
- target_state,
- dry_run,
- &uad_lists,
- )?;
- println!();
- }
-
- if dry_run {
- println!("Dry run completed. No changes were made.");
- } else {
- println!("Operation completed successfully.");
- }
-
- Ok(())
-}
-
-/// Process state change for a single package
-fn process_package_state_change(
- pkg_name: &str,
- device: &Phone,
- user: User,
- target_state: PackageState,
- dry_run: bool,
- uad_lists: &HashMap,
-) -> Result<(), Box> {
- let current_state = get_package_state(&device.adb_id, pkg_name, Some(user.id))
- .ok_or("Package not found on device")?;
-
- println!(" {} ({})", pkg_name, current_state);
-
- if current_state == target_state {
- println!(" → Already in target state, skipping");
- return Ok(());
- }
-
- let pkg_info = uad_lists.get(pkg_name);
- if let Some(info) = pkg_info {
- if info.removal == Removal::Unsafe {
- println!(" ⚠ WARNING: This package is marked as UNSAFE to remove!");
- }
- }
-
- let core_pkg = CorePackage {
- name: pkg_name.to_string(),
- description: pkg_info.map(|p| p.description.clone()).unwrap_or_default(),
- removal: pkg_info.map(|p| p.removal).unwrap_or(Removal::Unlisted),
- state: current_state,
- list: pkg_info.map(|p| p.list).unwrap_or(UadList::Unlisted),
- };
-
- let commands = apply_pkg_state_commands(&core_pkg, target_state, user, device);
-
- if dry_run {
- for cmd in &commands {
- println!(" Would run: {}", cmd);
- }
- } else {
- execute_with_fallback(
- pkg_name,
- target_state,
- &core_pkg,
- user,
- device,
- &commands,
- " ",
- )?;
- }
-
- Ok(())
-}
-
-/// Execute commands and verify package state with fallback
-pub fn execute_with_fallback(
- package: &str,
- target_state: PackageState,
- core_pkg: &CorePackage,
- user: User,
- device: &Phone,
- commands: &[String],
- indent: &str,
-) -> Result<(), Box> {
- // Capture the before-state of packages on other users for cross-user detection
- let before_cross_user_states =
- uad_core::sync::capture_cross_user_states(package, &device.adb_id, user.id, device);
-
- // Execute commands
- for cmd in commands {
- match run_adb_shell_action(&device.adb_id, cmd.as_str()) {
- Ok(_) => println!("{}✓ {}", indent, cmd),
- Err(e) => {
- return Err(format!("{indent}✗ Failed to execute `{cmd}`: {e:?}").into());
- }
- }
- }
-
- // Verify package state and attempt fallback if needed
- let actual_state = match get_package_state(&device.adb_id, package, Some(user.id)) {
- Some(state) => state,
- None if target_state == PackageState::Uninstalled => PackageState::Uninstalled,
- None => {
- return Err(format!(
- "Package '{package}' was not found on device for user {}",
- user.id
- )
- .into());
- }
- };
-
- if actual_state != target_state {
- println!(
- "{}⚠ Package state verification failed: expected {:?}, got {:?}",
- indent, target_state, actual_state
- );
-
- // Attempt fallback
- if let Ok(fallback_action) =
- uad_core::sync::attempt_fallback(core_pkg, target_state, actual_state, user, device)
- {
- println!("{}↻ Fallback: {}", indent, fallback_action);
- } else {
- println!("{}✗ No fallback available", indent);
- }
- }
-
- // Check for cross-user behavior if operation succeeded
- if actual_state == target_state {
- if let Some(notification) = uad_core::sync::detect_cross_user_behavior(
- package,
- device.adb_id.as_str(),
- user.id,
- target_state,
- actual_state,
- device,
- &before_cross_user_states,
- ) {
- println!("{}ℹ {}", indent, notification);
- }
- }
-
- Ok(())
-}
-
-/// Show detailed information about a package
-pub fn show_package_info(
- package: &str,
- device: Option,
- user_id: Option,
-) -> Result<(), Box> {
- println!("Package: {}\n", package);
-
- let uad_lists = load_debloat_lists(false).unwrap_or_else(|lists| lists);
-
- if let Some(pkg_info) = uad_lists.get(package) {
- println!("UAD Information:");
- println!(" List: {}", pkg_info.list);
- println!(" Removal: {}", pkg_info.removal);
- println!(" Description: {}", pkg_info.description);
- println!();
- } else {
- println!(" Not found in UAD lists (unlisted package)\n");
- }
-
- if let Some(device_id) = device {
- let target_device = get_target_device(Some(device_id))?;
- let user = get_user(&target_device, user_id)?;
- println!("Device: {} ({})", target_device.model, target_device.adb_id);
- println!("User: {}", user.id);
-
- let state = get_package_state(&target_device.adb_id, package, Some(user.id))
- .ok_or("Package not found on device")?;
- println!(" State: {}", state);
- }
-
- Ok(())
-}
-
-/// Update UAD package lists from remote repository
-pub fn update_lists() -> Result<(), Box> {
- println!("Updating UAD package lists from remote repository...");
-
- match load_debloat_lists(true) {
- Ok(_lists) => {
- println!("✓ Successfully updated package lists");
- Ok(())
- }
- Err(_lists) => Err("Failed to update lists from remote, using cached version".into()),
- }
-}
-
-/// Generate shell completion script
-pub fn generate_completions(shell: Shell) {
- let mut cmd = Cli::command();
- let name = cmd.get_name().to_string();
- generate(shell, &mut cmd, name, &mut std::io::stdout());
-}
diff --git a/crates/uad-cli/src/device.rs b/crates/uad-cli/src/device.rs
deleted file mode 100644
index 54fee8c..0000000
--- a/crates/uad-cli/src/device.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use uad_core::sync::{Phone, User, get_devices_list};
-
-pub const NO_DEVICES_FOUND: &str =
- "No devices found. Make sure ADB is installed and devices are connected.";
-
-/// Get target device, either by serial or first available
-pub fn get_target_device(device: Option) -> Result> {
- let devices = get_devices_list();
-
- if devices.is_empty() {
- return Err(NO_DEVICES_FOUND.into());
- }
-
- let target_device = if let Some(device_id) = device {
- devices
- .iter()
- .find(|d| d.adb_id == device_id)
- .ok_or("Device not found")?
- .clone()
- } else {
- if devices.len() > 1 {
- eprintln!(
- "Warning: Multiple devices found, using first one: {}",
- devices[0].adb_id
- );
- }
- devices[0].clone()
- };
-
- Ok(target_device)
-}
-
-/// Get user from device, creating a basic one if not found
-pub fn get_user(device: &Phone, user_id: Option) -> Result> {
- let uid = user_id.unwrap_or(0);
-
- if let Some(user) = device.user_list.iter().find(|u| u.id == uid) {
- Ok(*user)
- } else {
- // Create a basic user if not found in list
- Ok(User {
- id: uid,
- index: 0,
- protected: false,
- })
- }
-}
diff --git a/crates/uad-cli/src/filters.rs b/crates/uad-cli/src/filters.rs
deleted file mode 100644
index 5ae156f..0000000
--- a/crates/uad-cli/src/filters.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use clap::ValueEnum;
-use uad_core::adb::PmListPacksFlag;
-use uad_core::uad_lists::{Package, PackageState, Removal, UadList};
-
-#[derive(Debug, Clone, Copy, ValueEnum)]
-pub enum StateFilter {
- /// Show all packages regardless of state
- All,
- /// Show only enabled packages
- Enabled,
- /// Show only disabled packages
- Disabled,
- /// Show only uninstalled packages
- Uninstalled,
-}
-
-#[derive(Debug, Clone, Copy, ValueEnum)]
-pub enum RemovalFilter {
- All,
- Recommended,
- Advanced,
- Expert,
- Unsafe,
- Unlisted,
-}
-
-#[derive(Debug, Clone, Copy, ValueEnum)]
-pub enum ListFilter {
- All,
- Aosp,
- Carrier,
- Google,
- Misc,
- Oem,
- Pending,
- Unlisted,
-}
-
-impl StateFilter {
- pub fn to_pm_flag(self) -> Option {
- match self {
- Self::Enabled => Some(PmListPacksFlag::OnlyEnabled),
- Self::Disabled => Some(PmListPacksFlag::OnlyDisabled),
- Self::Uninstalled | Self::All => Some(PmListPacksFlag::IncludeUninstalled),
- }
- }
-
- pub fn matches(self, pkg_state: PackageState) -> bool {
- match self {
- Self::All => true,
- Self::Enabled => pkg_state == PackageState::Enabled,
- Self::Disabled => pkg_state == PackageState::Disabled,
- Self::Uninstalled => pkg_state == PackageState::Uninstalled,
- }
- }
-
- pub fn is_specific(self) -> bool {
- matches!(self, Self::Enabled | Self::Disabled | Self::Uninstalled)
- }
-}
-
-impl RemovalFilter {
- pub fn matches(self, pkg_info: Option<&Package>) -> bool {
- match pkg_info {
- Some(info) => match self {
- Self::All => true,
- Self::Recommended => info.removal == Removal::Recommended,
- Self::Advanced => info.removal == Removal::Advanced,
- Self::Expert => info.removal == Removal::Expert,
- Self::Unsafe => info.removal == Removal::Unsafe,
- Self::Unlisted => info.removal == Removal::Unlisted,
- },
- None => matches!(self, Self::All | Self::Unlisted),
- }
- }
-
- pub fn is_specific(self) -> bool {
- !matches!(self, Self::All)
- }
-}
-
-impl ListFilter {
- pub fn matches(self, pkg_info: Option<&Package>) -> bool {
- match pkg_info {
- Some(info) => match self {
- Self::All => true,
- Self::Aosp => info.list == UadList::Aosp,
- Self::Carrier => info.list == UadList::Carrier,
- Self::Google => info.list == UadList::Google,
- Self::Misc => info.list == UadList::Misc,
- Self::Oem => info.list == UadList::Oem,
- Self::Pending => info.list == UadList::Pending,
- Self::Unlisted => info.list == UadList::Unlisted,
- },
- None => matches!(self, Self::All | Self::Unlisted),
- }
- }
-}
diff --git a/crates/uad-cli/src/main.rs b/crates/uad-cli/src/main.rs
deleted file mode 100644
index f473e28..0000000
--- a/crates/uad-cli/src/main.rs
+++ /dev/null
@@ -1,251 +0,0 @@
-#![allow(
- clippy::needless_continue,
- clippy::collapsible_if,
- clippy::uninlined_format_args,
- clippy::map_unwrap_or,
- clippy::unnecessary_wraps,
- reason = "Suppress non-critical pedantic/style lints to keep build green"
-)]
-
-use clap::{Parser, Subcommand};
-use clap_complete::Shell;
-use std::process::ExitCode;
-use uad_core::uad_lists::PackageState;
-
-mod commands;
-mod device;
-mod filters;
-mod output;
-mod repl;
-
-use filters::{ListFilter, RemovalFilter, StateFilter};
-
-#[derive(Parser)]
-#[command(name = "uad")]
-#[command(about = "Universal Android Debloater - Command Line Interface", long_about = None)]
-#[command(version)]
-#[command(propagate_version = true)]
-pub struct Cli {
- #[command(subcommand)]
- command: Commands,
-}
-
-#[derive(Subcommand)]
-enum Commands {
- /// List connected Android devices
- Devices,
-
- /// List packages on a device
- #[command(name = "list", visible_alias = "ls")]
- List {
- /// Device serial number (optional, uses first device if not specified)
- #[arg(short, long)]
- device: Option,
-
- /// Filter by package state
- #[arg(short, long, value_enum)]
- state: Option,
-
- /// Filter by removal category
- #[arg(short, long, value_enum)]
- removal: Option,
-
- /// Filter by UAD list
- #[arg(short, long, value_enum)]
- list: Option,
-
- /// Search pattern (matches package name or description)
- #[arg(short = 'q', long)]
- search: Option,
-
- /// User ID (defaults to 0)
- #[arg(short, long)]
- user: Option,
- },
-
- /// Uninstall packages (default removal action)
- #[command(visible_alias = "rm")]
- Uninstall {
- /// Package names to uninstall
- packages: Vec,
-
- /// Device serial number (optional, uses first device if not specified)
- #[arg(short, long)]
- device: Option,
-
- /// User ID (defaults to 0)
- #[arg(short, long)]
- user: Option,
-
- /// Dry run - show what would be done without actually doing it
- #[arg(long)]
- dry_run: bool,
- },
-
- /// Restore (reinstall) packages
- #[command(visible_alias = "restore")]
- Enable {
- /// Package names to restore/enable
- packages: Vec,
-
- /// Device serial number (optional, uses first device if not specified)
- #[arg(short, long)]
- device: Option,
-
- /// User ID (defaults to 0)
- #[arg(short, long)]
- user: Option,
-
- /// Dry run - show what would be done without actually doing it
- #[arg(long)]
- dry_run: bool,
- },
-
- /// Disable packages (keeps data but prevents execution)
- Disable {
- /// Package names to disable
- packages: Vec,
-
- /// Device serial number (optional, uses first device if not specified)
- #[arg(short, long)]
- device: Option,
-
- /// User ID (defaults to 0)
- #[arg(short, long)]
- user: Option,
-
- /// Dry run - show what would be done without actually doing it
- #[arg(long)]
- dry_run: bool,
- },
-
- /// Show detailed information about a package
- Info {
- /// Package name
- package: String,
-
- /// Device serial number (optional, uses first device if not specified)
- #[arg(short, long)]
- device: Option,
-
- /// User ID (defaults to 0)
- #[arg(short, long)]
- user: Option,
- },
-
- /// Update UAD package lists from remote repository
- Update,
-
- /// Generate shell completion script
- Completions {
- /// Shell to generate completions for
- #[arg(value_enum)]
- shell: Shell,
- },
-
- /// Start interactive REPL mode
- #[command(visible_alias = "shell")]
- Repl {
- /// Device serial number (optional, uses first device if not specified)
- #[arg(short, long)]
- device: Option,
-
- /// User ID (defaults to 0)
- #[arg(short, long)]
- user: Option,
- },
-}
-
-#[tokio::main]
-async fn main() -> ExitCode {
- match run() {
- Ok(()) => ExitCode::SUCCESS,
- Err(err) => {
- eprintln!("Error: {err}");
- ExitCode::FAILURE
- }
- }
-}
-
-fn run() -> Result<(), Box> {
- let cli = Cli::parse();
-
- match cli.command {
- Commands::Devices => {
- commands::list_devices()?;
- }
- Commands::List {
- device,
- state,
- removal,
- list,
- search,
- user,
- } => {
- commands::list_packages(device, state, removal, list, search, user)?;
- }
- Commands::Uninstall {
- packages,
- device,
- user,
- dry_run,
- } => {
- commands::change_package_state(
- &packages,
- device,
- user,
- dry_run,
- PackageState::Uninstalled,
- "Uninstalling",
- )?;
- }
- Commands::Enable {
- packages,
- device,
- user,
- dry_run,
- } => {
- commands::change_package_state(
- &packages,
- device,
- user,
- dry_run,
- PackageState::Enabled,
- "Enabling",
- )?;
- }
- Commands::Disable {
- packages,
- device,
- user,
- dry_run,
- } => {
- commands::change_package_state(
- &packages,
- device,
- user,
- dry_run,
- PackageState::Disabled,
- "Disabling",
- )?;
- }
- Commands::Info {
- package,
- device,
- user,
- } => {
- commands::show_package_info(&package, device, user)?;
- }
- Commands::Update => {
- commands::update_lists()?;
- }
- Commands::Completions { shell } => {
- commands::generate_completions(shell);
- }
- Commands::Repl { device, user } => {
- repl::repl_mode(device, user)?;
- }
- }
-
- Ok(())
-}
diff --git a/crates/uad-cli/src/output.rs b/crates/uad-cli/src/output.rs
deleted file mode 100644
index cff4724..0000000
--- a/crates/uad-cli/src/output.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-/// Helper macro to handle broken pipe errors gracefully
-/// When piping to commands like `head`, we want to exit cleanly when the pipe closes
-#[macro_export]
-macro_rules! println_or_exit {
- () => {
- let _ = writeln!(std::io::stdout());
- };
- ($($arg:tt)*) => {
- let _ = writeln!(std::io::stdout(), $($arg)*);
- };
-}
-
-#[macro_export]
-macro_rules! print_or_exit {
- ($($arg:tt)*) => {
- let _ = write!(std::io::stdout(), $($arg)*);
- };
-}
diff --git a/crates/uad-cli/src/repl.rs b/crates/uad-cli/src/repl.rs
deleted file mode 100644
index eeee0c6..0000000
--- a/crates/uad-cli/src/repl.rs
+++ /dev/null
@@ -1,374 +0,0 @@
-use rustyline::DefaultEditor;
-use rustyline::error::ReadlineError;
-use std::collections::HashMap;
-use std::io::Write;
-use uad_core::adb::ACommand;
-use uad_core::sync::{CorePackage, Phone, User, apply_pkg_state_commands, get_package_state};
-use uad_core::uad_lists::{Package, PackageState, Removal, UadList, load_debloat_lists};
-
-use crate::commands::{PackageListContext, display_package_list, execute_with_fallback};
-use crate::device::{get_target_device, get_user};
-use crate::filters::StateFilter;
-use crate::println_or_exit;
-
-enum ReplAction {
- Continue,
- Exit,
-}
-
-/// Start interactive REPL mode
-pub fn repl_mode(
- device: Option,
- user_id: Option,
-) -> Result<(), Box> {
- println!("Universal Android Debloater - Interactive Mode");
- println!("Type 'help' for available commands, 'exit' or 'quit' to leave\n");
-
- let target_device = get_target_device(device)?;
- let user = get_user(&target_device, user_id)?;
-
- println!(
- "Connected to: {} ({})",
- target_device.model, target_device.adb_id
- );
- println!("User: {}\n", user.id);
-
- let uad_lists = load_debloat_lists(false).unwrap_or_else(|lists| lists);
- let mut rl = DefaultEditor::new()?;
-
- // Try to load history
- let history_file = dirs::cache_dir().map(|d| d.join("uad").join("cli_history.txt"));
- if let Some(ref path) = history_file {
- let _ = rl.load_history(path);
- }
-
- loop {
- let readline = rl.readline("uad> ");
- match readline {
- Ok(line) => {
- match handle_repl_line(&line, &mut rl, &target_device, user, user_id, &uad_lists) {
- Ok(ReplAction::Continue) => {}
- Ok(ReplAction::Exit) => break,
- Err(e) => {
- eprintln!("Error: {}", e);
- }
- }
- }
- Err(ReadlineError::Interrupted) => {
- println!("Interrupted (Ctrl-C). Type 'exit' to quit.");
- continue;
- }
- Err(ReadlineError::Eof) => {
- println!("Goodbye!");
- break;
- }
- Err(err) => {
- eprintln!("Error: {:?}", err);
- break;
- }
- }
- }
-
- // Save history
- if let Some(ref path) = history_file {
- if let Some(parent) = path.parent() {
- let _ = std::fs::create_dir_all(parent);
- }
- let _ = rl.save_history(path);
- }
-
- Ok(())
-}
-
-/// Handle a single line of REPL input
-fn handle_repl_line(
- line: &str,
- rl: &mut DefaultEditor,
- device: &Phone,
- user: User,
- user_id: Option,
- uad_lists: &HashMap,
-) -> Result> {
- let line = line.trim();
- if line.is_empty() {
- return Ok(ReplAction::Continue);
- }
-
- let _ = rl.add_history_entry(line);
-
- let parts: Vec<&str> = line.split_whitespace().collect();
- if parts.is_empty() {
- return Ok(ReplAction::Continue);
- }
-
- match parts[0] {
- "help" => print_repl_help(),
- "exit" | "quit" => {
- println!("Goodbye!");
- return Ok(ReplAction::Exit);
- }
- "list" | "ls" => {
- handle_list_command(&parts[1..], device, user_id, uad_lists)?;
- }
- "info" => {
- handle_info_command(&parts[1..], device, user.id, uad_lists)?;
- }
- "uninstall" | "rm" => {
- handle_state_change_command(
- &parts[1..],
- device,
- user,
- PackageState::Uninstalled,
- "Uninstalling",
- uad_lists,
- )?;
- }
- "enable" | "restore" => {
- handle_state_change_command(
- &parts[1..],
- device,
- user,
- PackageState::Enabled,
- "Enabling",
- uad_lists,
- )?;
- }
- "disable" => {
- handle_state_change_command(
- &parts[1..],
- device,
- user,
- PackageState::Disabled,
- "Disabling",
- uad_lists,
- )?;
- }
- "device" => {
- println!(
- "Device: {} ({}), Android SDK: {}, User: {}",
- device.model, device.adb_id, device.android_sdk, user.id
- );
- }
- "clear" => {
- print!("\x1B[2J\x1B[1;1H");
- }
- _ => {
- eprintln!(
- "Unknown command: '{}'. Type 'help' for available commands.",
- parts[0]
- );
- }
- }
-
- Ok(ReplAction::Continue)
-}
-
-/// Parse REPL arguments into filters
-struct ReplListArgs {
- state_filter: Option,
- search_term: Option,
-}
-
-impl ReplListArgs {
- fn parse(args: &[&str]) -> Result {
- let mut state_filter = None;
- let mut search_term = None;
- let mut i = 0;
-
- while i < args.len() {
- match args[i] {
- "--state" | "-s" => {
- if i + 1 >= args.len() {
- return Err("--state requires a value".to_string());
- }
- state_filter = match args[i + 1].to_lowercase().as_str() {
- "enabled" => Some(StateFilter::Enabled),
- "disabled" => Some(StateFilter::Disabled),
- "uninstalled" => Some(StateFilter::Uninstalled),
- "all" => Some(StateFilter::All),
- _ => return Err(format!("Invalid state: {}", args[i + 1])),
- };
- i += 2;
- }
- "--search" | "-q" => {
- if i + 1 >= args.len() {
- return Err("--search requires a value".to_string());
- }
- search_term = Some(args[i + 1].to_string());
- i += 2;
- }
- _ => {
- return Err(format!("Unknown option: {}", args[i]));
- }
- }
- }
-
- Ok(Self {
- state_filter,
- search_term,
- })
- }
-}
-
-/// Handle list command in REPL
-fn handle_list_command(
- args: &[&str],
- device: &Phone,
- user_id: Option,
- uad_lists: &HashMap,
-) -> Result<(), Box> {
- let parsed = ReplListArgs::parse(args)?;
-
- let pm_flag = parsed.state_filter.and_then(StateFilter::to_pm_flag);
- let system_packages = ACommand::new()
- .shell(&device.adb_id)
- .pm()
- .list_packages_sys(pm_flag, user_id)?;
-
- let context = PackageListContext {
- state_filter: parsed.state_filter,
- removal_filter: None,
- list_filter: None,
- search: parsed.search_term,
- };
-
- let displayed_count = display_package_list(
- &system_packages,
- uad_lists,
- &device.adb_id,
- user_id,
- &context,
- )?;
-
- if displayed_count == 0 {
- println_or_exit!(" No packages found.");
- } else {
- println_or_exit!("\nTotal: {} package(s)", displayed_count);
- }
-
- Ok(())
-}
-
-/// Handle info command in REPL
-fn handle_info_command(
- args: &[&str],
- device: &Phone,
- user_id: u16,
- uad_lists: &HashMap,
-) -> Result<(), Box> {
- if args.is_empty() {
- eprintln!("Usage: info ");
- return Ok(());
- }
-
- let package = args[0];
- println!("Package: {}", package);
-
- if let Some(pkg_info) = uad_lists.get(package) {
- println!(" List: {}", pkg_info.list);
- println!(" Removal: {}", pkg_info.removal);
- println!(" Description: {}", pkg_info.description);
- } else {
- println!(" Not found in UAD lists (unlisted package)");
- }
-
- let state = get_package_state(&device.adb_id, package, Some(user_id))
- .ok_or("Package not found on device")?;
- println!(" State: {}", state);
-
- Ok(())
-}
-
-/// Handle state change command in REPL
-fn handle_state_change_command(
- args: &[&str],
- device: &Phone,
- user: User,
- target_state: PackageState,
- action_name: &str,
- uad_lists: &HashMap,
-) -> Result<(), Box> {
- if args.is_empty() {
- eprintln!(
- "Usage: {} [package_name...]",
- action_name.to_lowercase()
- );
- return Ok(());
- }
-
- for pkg_name in args {
- process_package_change(pkg_name, device, user, target_state, action_name, uad_lists)?;
- }
-
- Ok(())
-}
-
-/// Process state change for a single package in REPL
-fn process_package_change(
- pkg_name: &str,
- device: &Phone,
- user: User,
- target_state: PackageState,
- action_name: &str,
- uad_lists: &HashMap,
-) -> Result<(), Box> {
- let current_state = get_package_state(&device.adb_id, pkg_name, Some(user.id))
- .ok_or("Package not found on device")?;
-
- println!("{} {} (current: {})", action_name, pkg_name, current_state);
-
- if current_state == target_state {
- println!(" → Already in target state, skipping");
- return Ok(());
- }
-
- let pkg_info = uad_lists.get(pkg_name);
- if let Some(info) = pkg_info {
- if info.removal == Removal::Unsafe {
- println!(" ⚠ WARNING: This package is marked as UNSAFE to remove!");
- }
- }
-
- let core_pkg = CorePackage {
- name: pkg_name.to_string(),
- description: pkg_info.map(|p| p.description.clone()).unwrap_or_default(),
- removal: pkg_info.map(|p| p.removal).unwrap_or(Removal::Unlisted),
- state: current_state,
- list: pkg_info.map(|p| p.list).unwrap_or(UadList::Unlisted),
- };
-
- let commands = apply_pkg_state_commands(&core_pkg, target_state, user, device);
-
- execute_with_fallback(
- pkg_name,
- target_state,
- &core_pkg,
- user,
- device,
- &commands,
- " ",
- )
-}
-
-/// Print REPL help message
-fn print_repl_help() {
- println!("Available commands:");
- println!(" list [--state ] [--search ]");
- println!(" List packages with optional filters");
- println!(" info ");
- println!(" Show information about a package");
- println!(" uninstall [package_name...]");
- println!(" Uninstall one or more packages");
- println!(" enable [package_name...]");
- println!(" Enable/restore one or more packages");
- println!(" disable [package_name...]");
- println!(" Disable one or more packages");
- println!(" device");
- println!(" Show current device information");
- println!(" clear");
- println!(" Clear the screen");
- println!(" help");
- println!(" Show this help message");
- println!(" exit, quit");
- println!(" Exit the interactive mode");
-}
diff --git a/crates/uad-core/Cargo.toml b/crates/uad-core/Cargo.toml
deleted file mode 100644
index f7d3a43..0000000
--- a/crates/uad-core/Cargo.toml
+++ /dev/null
@@ -1,52 +0,0 @@
-[package]
-name = "uad-core"
-version.workspace = true
-authors.workspace = true
-license.workspace = true
-homepage.workspace = true
-repository.workspace = true
-readme.workspace = true
-keywords.workspace = true
-categories = ["command-line-utilities"]
-edition.workspace = true
-
-[features]
-default = []
-self-update = ["dep:flate2", "dep:tar"]
-
-[dependencies]
-serde.workspace = true
-serde_json.workspace = true
-log.workspace = true
-chrono.workspace = true
-toml.workspace = true
-dirs.workspace = true
-ureq.workspace = true
-retry.workspace = true
-csv.workspace = true
-flate2 = { workspace = true, optional = true }
-tar = { workspace = true, optional = true }
-
-[target.'cfg(target_os = "windows")'.dependencies]
-win32console.workspace = true
-
-[lints.rust]
-deprecated_safe = "warn"
-
-[lints.clippy]
-undocumented_unsafe_blocks = "forbid"
-exit = "deny"
-panic_in_result_fn = "warn"
-infinite_loop = "warn"
-mem_forget = "warn"
-implicit_clone = "warn"
-format_push_string = "warn"
-large_include_file = "warn"
-shadow_unrelated = "warn"
-struct_field_names = "allow" # annoying
-
-disallowed_types = "deny"
-disallowed_methods = "deny"
-
-allow_attributes_without_reason = "warn"
-pedantic = { level = "warn", priority = -1 }
diff --git a/crates/uad-core/src/adb.rs b/crates/uad-core/src/adb.rs
deleted file mode 100644
index f2335e0..0000000
--- a/crates/uad-core/src/adb.rs
+++ /dev/null
@@ -1,503 +0,0 @@
-#![deny(clippy::unwrap_used)]
-
-//! This module is intended to group everything that's "intrinsic" of ADB.
-//!
-//! Following the design philosophy of most of Rust `std`,
-//! `*Command` are intended to be "thin wrappers" (low-overhead abstractions)
-//! around the ADB CLI or `adb_client`
-//! ([in the future](https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/issues/700) ),
-//! which implies:
-//! - no "magic"
-//! - no custom commands
-//! - no chaining ("piping") of existing commands
-//!
-//! This guarantees a 1-to-1 mapping between methods and cmds,
-//! thereby reducing surprises such as:
-//! - Non-atomic operations: consider what happens if a pack changes state
-//! in the middle of listing enabled and disabled packs!
-//! - Non-standard semantics: what would happen if a new ADB version
-//! supports a feature we already defined,
-//! but has _slightly_ different behavior?
-//!
-//! Despite being "low-level", we can still "have cake and eat it too";
-//! After all, what's the point of an abstraction if it doesn't come with goodies?:
-//! We can reserve some artistic license, such as:
-//! - pre-parsing or validanting output, to provide types with invariants
-//! - strongly-typed rather than "stringly-typed" APIs
-//! - nicer IDE support
-//! - compile-time prevention of malformed cmds
-//! - implicit enforcement of a narrow set of operations
-//!
-//! About that last point, if there's ever a need for an ADB feature
-//! which these APIs don't expose,
-//! please, **PLEASE** refrain from falling-back to any `Command`-like API.
-//! Rather, please extend these APIs in a consistent way.
-//!
-//! Thank you! ❤️
-//!
-//! For comprehensive info about ADB,
-//! [see this](https://android.googlesource.com/platform/packages/modules/adb/+/refs/heads/master/docs/)
-
-use std::rc::Rc;
-
-#[cfg(target_os = "windows")]
-use std::os::windows::process::CommandExt;
-
-use crate::utils::is_all_w_c;
-use log::{error, info, warn};
-
-/// Convert ADB output bytes to a trimmed UTF-8 string.
-/// Uses lossy conversion to prevent panics on non-UTF8 output from certain OEMs.
-#[must_use]
-pub fn to_trimmed_utf8(v: &[u8]) -> String {
- String::from_utf8_lossy(v).trim_end().to_string()
-}
-
-#[cfg(debug_assertions)]
-#[must_use]
-fn is_version_triple(s: &str) -> bool {
- let mut components = s.split('.');
- for _ in 0..3 {
- if !components
- .next()
- .is_some_and(|comp| comp.as_bytes().iter().all(u8::is_ascii_digit))
- {
- return false;
- }
- }
- if components.next().is_some() {
- return false;
- }
- true
-}
-
-/// Builder object for an Android Debug Bridge CLI command,
-/// using the type-state and new-type patterns.
-///
-/// This is not intended to model the entire ADB API.
-/// It only models the subset that concerns UADNG.
-///
-/// [More info here](https://developer.android.com/tools/adb)
-#[derive(Debug)]
-pub struct ACommand(std::process::Command);
-impl ACommand {
- /// `adb` command builder
- #[must_use]
- pub fn new() -> Self {
- Self(std::process::Command::new("adb"))
- }
-
- /// `shell` sub-command builder.
- ///
- /// If `device_serial` is empty, it lets ADB choose the default device.
- #[must_use]
- pub fn shell>(mut self, device_serial: S) -> ShellCommand {
- let serial = device_serial.as_ref();
- if !serial.is_empty() {
- self.0.args(["-s", serial]);
- }
- self.0.arg("shell");
- ShellCommand(self)
- }
-
- /// Header-less list of attached devices (as serials) and their statuses:
- /// - USB
- /// - TCP/IP: WIFI, Ethernet, etc...
- /// - Local emulators
- ///
- /// Status can be (but not limited to):
- /// - "unauthorized"
- /// - "device"
- pub fn devices(mut self) -> Result, String> {
- self.0.arg("devices");
- Ok(self
- .run()?
- .lines()
- .skip(1) // header
- .map(|dev_stat| {
- let tab_idx = dev_stat
- // OS-specific?
- .find('\t')
- // True on Linux,
- // no matter if ADB is piped or connected to terminal
- .expect("There must be 1 tab after serial");
- (
- // serial
- dev_stat[..tab_idx].to_string(),
- // status
- dev_stat[(tab_idx + 1)..].to_string(),
- )
- })
- .collect())
- }
-
- /// `version` sub-command
- ///
- /// ## Format
- /// This is just a sample,
- /// we don't know which guarantees are stable (yet):
- /// ```txt
- /// Android Debug Bridge version 1.0.41
- /// Version 34.0.5-debian
- /// Installed as /usr/lib/android-sdk/platform-tools/adb
- /// Running on Linux 6.12.12-amd64 (x86_64)
- /// ```
- ///
- /// The expected format should be like:
- /// ```txt
- /// Android Debug Bridge version ..
- /// Version ..-
- /// Installed as /platform-tools/adb[.exe]
- /// Running on ()
- /// ```
- #[expect(clippy::panic_in_result_fn, reason = "Assertions are fine")]
- pub fn version(mut self) -> Result {
- self.0.arg("version");
- let out = self.run()?;
-
- #[cfg(debug_assertions)]
- {
- const ADBV: &str = "Android Debug Bridge version ";
- const V: &str = "Version ";
-
- let mut lns = out.lines();
-
- assert!(
- lns.next()
- .is_some_and(|ln| ln.starts_with(ADBV) && is_version_triple(&ln[ADBV.len()..]))
- );
- assert!(lns.next().is_some_and(|ln| ln.starts_with(V)
- && is_version_triple(&ln[V.len()..ln.find('-').unwrap_or(ln.len())])));
- // missing test for valid path
- assert!(lns.next().is_some_and(|ln| ln.starts_with("Installed as ")
- && (ln.ends_with("adb") || ln.ends_with("adb.exe"))));
- // missing test for x86/ARM (both 64b)
- assert!(lns.next().is_some_and(|ln| ln.starts_with("Running on ")));
- if lns.next().is_some() {
- unreachable!("Expected < 5 lines")
- }
- }
-
- Ok(out)
- }
-
- /// General executor
- fn run(self) -> Result {
- let mut cmd = self.0;
- #[cfg(target_os = "windows")]
- let cmd = cmd.creation_flags(0x0800_0000); // do not open a cmd window
-
- info!(
- "Ran command: adb {}",
- cmd.get_args()
- .map(|s| s.to_str().unwrap_or_else(|| unreachable!()))
- .collect::>()
- .join(" ")
- );
- match cmd.output() {
- Err(e) => {
- error!("ADB: {e}");
- Err("Cannot run ADB, likely not found".to_string())
- }
- Ok(o) => {
- let stdout = to_trimmed_utf8(&o.stdout);
- if o.status.success() {
- Ok(stdout)
- } else {
- let stderr = to_trimmed_utf8(&o.stderr);
- // ADB does really weird things:
- // Some errors are not redirected to `stderr`
- let err = if stdout.is_empty() { stderr } else { stdout };
- Err(err)
- }
- }
- }
- }
-}
-
-impl Default for ACommand {
- fn default() -> Self {
- Self::new()
- }
-}
-
-/// Builder object for a command that runs on the device's default `sh` implementation.
-/// Typically MKSH, but could be Ash.
-///
-/// [More info](https://chromium.googlesource.com/aosp/platform/system/core/+/refs/heads/upstream/shell_and_utilities).
-#[derive(Debug)]
-pub struct ShellCommand(ACommand);
-impl ShellCommand {
- /// `pm` command builder
- pub fn pm(mut self) -> PmCommand {
- self.0.0.arg("pm");
- PmCommand(self)
- }
- /// Query a device property value, by its key.
- /// These can be of any type:
- /// - `boolean`
- /// - `int`
- /// - chars
- /// - etc...
- ///
- /// So to avoid lossy conversions, we return strs
- pub fn getprop(mut self, key: &str) -> Result {
- self.0.0.args(["getprop", key]);
- self.0.run()
- }
- /// Reboots device
- pub fn reboot(mut self) -> Result {
- self.0.0.arg("reboot");
- self.0.run()
- }
-
- /// Execute an arbitrary shell action string on the device's default shell.
- /// The action string is passed as a single argument to `adb shell` and
- /// interpreted by the remote shell (which splits on spaces).
- pub fn raw(mut self, action: &str) -> Result {
- self.0.0.arg(action);
- self.0.run()
- }
-}
-
-#[must_use]
-pub const fn is_pkg_component(s: &[u8]) -> bool {
- if s.is_empty() {
- return false;
- }
- s[0].is_ascii_alphabetic()
- && if s.len() > 1 {
- is_all_w_c(s.split_at(1).1)
- } else {
- true
- }
-}
-
-/// String with the invariant of being a valid package-name.
-/// See [`PackageId::new`] for validation details.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PackageId(Rc);
-impl PackageId {
- /// Creates a package-ID if it's `"android"` or valid according to:
- /// -
- /// -
- #[must_use]
- pub fn new(p_id: &str) -> Option {
- if p_id == "android" {
- return Some(Self(p_id.into()));
- }
- let mut components = p_id.split('.');
- for _ in 0..2 {
- if !components
- .next()
- .is_some_and(|comp| is_pkg_component(comp.as_bytes()))
- {
- return None;
- }
- }
- if components.all(|comp| is_pkg_component(comp.as_bytes())) {
- Some(Self(p_id.into()))
- } else {
- None
- }
- }
-}
-
-/// `pm list packages` flag/state/type
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum PmListPacksFlag {
- /// `-u`, not to be confused with `-a`
- IncludeUninstalled,
- /// `-e`
- OnlyEnabled,
- /// `-d`
- OnlyDisabled,
-}
-impl PmListPacksFlag {
- // is there a trait for this?
- fn to_str(self) -> &'static str {
- match self {
- Self::IncludeUninstalled => "-u",
- Self::OnlyEnabled => "-e",
- Self::OnlyDisabled => "-d",
- }
- }
-}
-#[expect(clippy::to_string_trait_impl, reason = "This is not user-facing")]
-impl ToString for PmListPacksFlag {
- fn to_string(&self) -> String {
- self.to_str().to_string()
- }
-}
-
-const PACK_PREFIX: &str = "package:";
-
-pub const PM_CLEAR_PACK: &str = "pm clear";
-
-/// Builder object for an Android Package Manager command.
-///
-#[derive(Debug)]
-#[must_use]
-pub struct PmCommand(ShellCommand);
-impl PmCommand {
- /// `list packages -s` sub-command, [`PACK_PREFIX`] stripped from each element.
- ///
- /// `Ok` variant:
- /// - isn't 100% guaranteed to contain valid pack-IDs
- /// but you can assume it does (except in `unsafe {}` blocks)
- /// - isn't sorted
- /// - duplicates never _seem_ to happen, but don't assume uniqueness
- pub fn list_packages_sys(
- mut self,
- f: Option,
- user_id: Option,
- ) -> Result, String> {
- let cmd = &mut self.0.0.0;
-
- cmd.args(["list", "packages", "-s"]);
- if let Some(s) = f {
- cmd.arg(s.to_str());
- }
- if let Some(u) = user_id {
- cmd.arg("--user");
- cmd.arg(u.to_string());
- }
-
- self.0.0.run().map(|pack_ls| {
- pack_ls
- .lines()
- .filter_map(|p_ln| {
- debug_assert!(p_ln.starts_with(PACK_PREFIX));
- let p = &p_ln[PACK_PREFIX.len()..];
- if PackageId::new(p).is_some() {
- Some(String::from(p))
- } else {
- warn!("skipping nonstandard package name: {p:?}");
- None
- }
- })
- .collect()
- })
- }
-
- /// `list users` sub-command, deserialized/parsed.
- ///
- /// -
- /// -
- pub fn list_users(mut self) -> Result, String> {
- self.0.0.0.args(["list", "users"]);
- Ok(self
- .0
- .0
- .run()?
- .lines()
- .skip(1) // omit header
- .map(|ln| {
- // this could be optimized by making more API-stability assumptions
- let ln = ln.trim_ascii_start();
- let ln = ln.strip_prefix("UserInfo").unwrap_or(ln).trim_ascii_start();
- let ln = ln.strip_prefix('{').unwrap_or(ln).trim_ascii();
- //let run;
- let ln = if let Some(l) = ln.strip_suffix("running") {
- //run = true;
- l.trim_ascii_end()
- } else {
- //run = false;
- ln
- };
- let ln = ln.strip_suffix('}').unwrap_or(ln).trim_ascii_end();
- // https://android.googlesource.com/platform/frameworks/base/+/refs/heads/main/core/java/android/content/pm/UserInfo.java
- // The format looks stable today, but google may change it in future Android versions
- // (and very old Androids might differ). Keep parsing defensive.
- // Expected shape: "UserInfo{::}[ running]"
-
- let mut comps = ln.split(':');
-
- let id = comps
- .next()
- .expect("There must be at least 1 ':'-separated component")
- .parse()
- .expect("string assumed to be UID numeral");
- //let name = comps
- // .next()
- // .expect("There must be at least 2 ':'-separated components. 2nd is user-name");
- //let flags = u32::from_str_radix(
- // comps.next().expect(
- // "There must be at least 3 ':'-separated components. 3rd is user bit-flags",
- // ),
- // 16,
- //)
- //.expect("string assumed to be hexadecimal bit-flags");
- UserInfo {
- id,
- //name: name.into(),
- //flags,
- //running: run,
- }
- })
- .collect())
- }
-}
-
-/// Mirror of AOSP `UserInfo` Java Class, with an extra field
-#[derive(Debug, Clone)]
-pub struct UserInfo {
- id: u16,
- //name: Box,
- //flags: u32,
- //running: bool,
-}
-impl UserInfo {
- #[must_use]
- pub const fn get_id(&self) -> u16 {
- self.id
- }
- /*
- /// Check if the user was logged-in at the time `pm list users` was invoked
- #[must_use]
- #[allow(dead_code, reason = "Currently unused by UI; kept for future features")]
- pub const fn was_running(&self) -> bool {
- self.running
- }
- */
-}
-
-#[cfg(test)]
-mod tests {
- use super::*;
-
- #[test]
- fn invalid_pack_ids() {
- for p_id in [
- "",
- " ",
- ".",
- "nodots",
- "com..example",
- "net.hello.",
- "org.0example",
- "org._foobar",
- "the.🎂.is.a.lie",
- "EXCLAMATION!!!!",
- ] {
- assert_eq!(PackageId::new(p_id), None);
- }
- }
-
- #[test]
- fn valid_pack_ids() {
- for p_id in [
- "A.a",
- "x.X",
- "org.example",
- "net.hello",
- "uwu.owo",
- "Am0Gu5.Zuz",
- "net.net.net.net.net.net.net.net.net.net.net",
- "com.github.w1nst0n",
- "this_.String_.is_.not_.real_",
- ] {
- assert_ne!(PackageId::new(p_id), None);
- }
- }
-}
diff --git a/crates/uad-core/src/config.rs b/crates/uad-core/src/config.rs
deleted file mode 100644
index 5c41d78..0000000
--- a/crates/uad-core/src/config.rs
+++ /dev/null
@@ -1,150 +0,0 @@
-use crate::CACHE_DIR;
-use crate::CONFIG_DIR;
-use crate::sync::User;
-use crate::utils::DisplayablePath;
-use log::error;
-use serde::{Deserialize, Serialize};
-use std::fs;
-use std::path::PathBuf;
-use std::sync::LazyLock;
-
-const DEFAULT_THEME: &str = "Auto (follow system theme)";
-
-#[derive(Default, Debug, Serialize, Deserialize, Clone)]
-pub struct Config {
- pub general: GeneralSettings,
- #[serde(skip_serializing_if = "Vec::is_empty", default = "Vec::new")]
- pub devices: Vec,
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct GeneralSettings {
- pub theme: String,
- pub expert_mode: bool,
- pub backup_folder: PathBuf,
-}
-
-#[derive(Default, Debug, Clone)]
-pub struct BackupSettings {
- pub backups: Vec,
- pub selected: Option,
- pub users: Vec,
- pub selected_user: Option,
- pub backup_state: String,
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone, Default)]
-pub struct DeviceSettings {
- /// Unique serial identifier
- pub device_id: String,
- pub disable_mode: bool, // should be `enum RemovalMode`
- pub multi_user_mode: bool,
- #[serde(skip)]
- pub backup: BackupSettings,
-}
-
-impl Default for GeneralSettings {
- fn default() -> Self {
- Self {
- theme: DEFAULT_THEME.to_string(),
- expert_mode: false,
- backup_folder: CACHE_DIR.join("backups"),
- }
- }
-}
-
-static CONFIG_FILE: LazyLock = LazyLock::new(|| CONFIG_DIR.join("config.toml"));
-
-impl Config {
- pub fn save_device_settings(
- &mut self,
- device_settings: DeviceSettings,
- general: GeneralSettings,
- ) {
- if let Some(device) = self
- .devices
- .iter_mut()
- .find(|x| x.device_id == device_settings.device_id)
- {
- *device = device_settings;
- } else {
- self.devices.push(device_settings);
- }
- self.general = general;
- let toml = toml::to_string(&self).unwrap();
- fs::write(&*CONFIG_FILE, toml).expect("Could not write config file to disk!");
- }
-
- #[must_use]
- pub fn load_configuration_file() -> Self {
- match fs::read_to_string(&*CONFIG_FILE) {
- Ok(s) => match toml::from_str(&s) {
- Ok(config) => return config,
- Err(e) => error!("Invalid config file: `{e}`"),
- },
- Err(e) => error!("Failed to read config file: `{e}`"),
- }
- error!("Restoring default config file");
- let toml = toml::to_string(&Self::default()).unwrap();
- fs::write(&*CONFIG_FILE, toml).expect("Could not write config file to disk!");
- Self::default()
- }
-}
-
-#[cfg(test)]
-mod tests {
- //! Unit tests
-
- use super::*;
- use std::path::Path;
-
- // create a clean default config file for testing
- fn create_default_config_file() {
- let toml = toml::to_string(&Config::default()).unwrap();
- fs::write(&*CONFIG_FILE, toml).expect("Could not write config file to disk!");
- }
-
- #[test]
- fn test_create_default_config_file() {
- create_default_config_file();
- assert!(CONFIG_FILE.exists());
- }
-
- #[test]
- fn test_load_configuration_file() {
- create_default_config_file();
- let config = Config::load_configuration_file();
- // non-deterministic
- //assert_eq!(config.devices.len(), 0);
- assert_eq!(config.general.theme, DEFAULT_THEME);
- assert!(!config.general.expert_mode);
- assert_eq!(config.general.backup_folder, CACHE_DIR.join("backups"));
- }
-
- // non-deterministic
- /*
- #[test]
- fn test_save_changes() {
- let mut settings = Settings::default();
- let device_id = "test_device".to_string();
- settings.device.device_id = device_id.clone();
- Config::save_changes(&settings, &device_id);
- let config = Config::load_configuration_file();
- assert_eq!(config.devices[0].device_id, device_id);
- }
- */
-
- #[test]
- fn test_default_config() {
- let config = Config::default();
- assert_eq!(config.devices.len(), 0);
- assert_eq!(config.general.theme, DEFAULT_THEME);
- assert!(!config.general.expert_mode);
- assert_eq!(config.general.backup_folder, CACHE_DIR.join("backups"));
- }
-
- #[test]
- fn test_config_file_path() {
- assert_eq!(&*CONFIG_FILE, Path::new(&*CONFIG_DIR.join("config.toml")));
- }
-}
diff --git a/crates/uad-core/src/lib.rs b/crates/uad-core/src/lib.rs
deleted file mode 100644
index be3e5b4..0000000
--- a/crates/uad-core/src/lib.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-#![allow(
- clippy::missing_panics_doc,
- clippy::missing_errors_doc,
- clippy::collapsible_if,
- clippy::uninlined_format_args,
- clippy::result_unit_err,
- reason = "Doc+style pedantic lints are out-of-scope for this pass"
-)]
-
-pub mod adb;
-pub mod config;
-pub mod save;
-pub mod sync;
-pub mod uad_lists;
-pub mod update;
-pub mod utils;
-
-use std::path::PathBuf;
-use std::sync::LazyLock;
-pub static CONFIG_DIR: LazyLock =
- LazyLock::new(|| utils::setup_uad_dir(&dirs::config_dir().expect("Can't detect config dir")));
-pub static CACHE_DIR: LazyLock =
- LazyLock::new(|| utils::setup_uad_dir(&dirs::cache_dir().expect("Can't detect cache dir")));
diff --git a/crates/uad-core/src/sync.rs b/crates/uad-core/src/sync.rs
deleted file mode 100644
index f90b6ee..0000000
--- a/crates/uad-core/src/sync.rs
+++ /dev/null
@@ -1,663 +0,0 @@
-use crate::{
- adb::{ACommand as AdbCommand, PM_CLEAR_PACK, PackageId},
- uad_lists::PackageState,
-};
-use log::{error, info};
-use retry::{OperationResult, delay::Fixed, retry};
-use serde::{Deserialize, Serialize};
-
-/// An Android device, typically a phone
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Phone {
- /// Non-market name
- pub model: String, // could be `Copy`
- /// Android API level version
- pub android_sdk: u8,
- /// In theory, `len < u16::MAX` _should_ always be `true`.
- /// In practice, `len <= u8::MAX`.
- pub user_list: Vec,
- /// Unique serial identifier
- pub adb_id: String, // could be `Copy`
-}
-
-impl Default for Phone {
- fn default() -> Self {
- Self {
- model: "fetching devices...".to_string(),
- android_sdk: 0,
- user_list: vec![],
- adb_id: String::default(),
- }
- }
-}
-
-impl std::fmt::Display for Phone {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- write!(f, "{}", self.model)
- }
-}
-
-/// `UserInfo` but relevant to UAD
-#[derive(Default, Debug, Clone, Copy, PartialEq, Eq)]
-pub struct User {
- pub id: u16,
- pub index: usize,
- pub protected: bool,
-}
-
-impl std::fmt::Display for User {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- write!(f, "user {}", self.id)
- }
-}
-
-/// An enum to contain different variants for errors yielded by ADB.
-#[derive(Debug, Clone)]
-pub enum AdbError {
- Generic(String),
-}
-
-/// Run an arbitrary shell action via the typed ADB wrapper.
-/// This replaces the deprecated `adb_shell_command`.
-///
-/// If `serial` is empty, it lets ADB choose the default device.
-pub fn run_adb_shell_action>(
- device_serial: S,
- action: &str,
-) -> Result {
- let serial = device_serial.as_ref();
-
- match AdbCommand::new().shell(serial).raw(action) {
- Ok(o) => {
- if ["Error", "Failure"].iter().any(|&e| o.contains(e)) {
- let friendly_msg = make_friendly_error_message(&o, action);
- return Err(AdbError::Generic(friendly_msg));
- }
- info!("{action} -> {o}");
- Ok(o)
- }
- Err(err) => {
- if !err.contains("[not installed for") {
- let friendly_msg = make_friendly_error_message(&err, action);
- return Err(AdbError::Generic(friendly_msg));
- }
- Err(AdbError::Generic(err))
- }
- }
-}
-
-/// Convert common OEM-specific ADB error messages into user-friendly explanations.
-fn make_friendly_error_message(error_output: &str, action: &str) -> String {
- // Common Samsung errors
- if error_output.contains("DELETE_FAILED_USER_RESTRICTED") {
- return format!(
- "Cannot uninstall: This package is restricted by the device manufacturer (Samsung Knox or similar).\n\
- Error: {error_output}\n\
- Tip: Try disabling the package instead, or check device settings for Knox/security restrictions."
- );
- }
-
- if error_output.contains("NOT_INSTALLED_FOR_USER") {
- return format!(
- "Package is not installed for the current user.\n\
- Error: {error_output}\n\
- Tip: The package may be installed for a different user profile or work profile."
- );
- }
-
- // Empty package name error
- if error_output.contains("Shell cannot change component state for null") {
- return format!(
- "Invalid package: Empty package name detected.\n\
- Error: {error_output}\n\
- Tip: Please refresh the package list and try again."
- );
- }
-
- // Generic permission errors
- if error_output.contains("Permission denied")
- || error_output.contains("INSTALL_FAILED_PERMISSION_MODEL_DOWNGRADE")
- {
- return format!(
- "Permission denied: Insufficient privileges to perform this action.\n\
- Error: {error_output}\n\
- Tip: This may require root access or the package is protected by the system."
- );
- }
-
- // Work profile / managed device errors
- if error_output.contains("DELETE_FAILED_DEVICE_POLICY_MANAGER") {
- return format!(
- "Cannot modify: Package is managed by device policy (MDM/EMM).\n\
- Error: {error_output}\n\
- Tip: Contact your IT administrator if this is a work device."
- );
- }
-
- // Generic failure with context
- format!("{action} -> {error_output}")
-}
-
-/// If `None`, returns an empty String, not " --user 0"
-#[must_use]
-pub fn user_flag(user_id: Option) -> String {
- user_id
- .map(|user| format!(" --user {}", user.id))
- .unwrap_or_default()
-}
-
-// Minimum information for processing adb commands
-#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
-pub struct CorePackage {
- pub name: String,
- pub description: String,
- #[serde(default)]
- pub removal: crate::uad_lists::Removal,
- #[serde(default)]
- pub state: PackageState,
- #[serde(default)]
- pub list: crate::uad_lists::UadList,
-}
-
-#[must_use]
-pub fn apply_pkg_state_commands(
- package: &CorePackage,
- wanted_state: PackageState,
- selected_user: User,
- phone: &Phone,
-) -> Vec {
- // https://github.com/Universal-Debloater-Alliance/universal-android-debloater/wiki/ADB-reference
- // ALWAYS PUT THE COMMAND THAT CHANGES THE PACKAGE STATE FIRST!
- let commands = match wanted_state {
- PackageState::Enabled => match package.state {
- PackageState::Disabled => vec!["pm enable"],
- PackageState::Uninstalled => match phone.android_sdk {
- i if i >= 23 => vec!["cmd package install-existing"],
- 21 | 22 => vec!["pm unhide"],
- 19 | 20 => vec!["pm unblock", PM_CLEAR_PACK],
- _ => unreachable!("already prevented by the GUI"),
- },
- _ => vec![],
- },
- PackageState::Disabled => match package.state {
- PackageState::Uninstalled | PackageState::Enabled => {
- if supports_disabling(phone) {
- vec!["pm disable-user", "am force-stop", PM_CLEAR_PACK]
- } else {
- vec![]
- }
- }
- _ => vec![],
- },
- PackageState::Uninstalled => match package.state {
- PackageState::Enabled | PackageState::Disabled => match phone.android_sdk {
- sdk if sdk >= 23 => vec!["pm uninstall"], // > Marshmallow (6.0)
- 21 | 22 => vec!["pm hide", PM_CLEAR_PACK], // Lollipop (5.x)
- _ => vec!["pm block", PM_CLEAR_PACK], // Disable mode is unavailable on older devices because the specific ADB commands need root
- },
- _ => vec![],
- },
- PackageState::All => vec![],
- }; // this should be a `tinyvec`, as `len <= 4`
-
- let user = supports_multi_user(phone).then_some(selected_user);
- request_builder(&commands, &package.name, user)
-}
-
-/// Build a command request to be sent via ADB to a device.
-/// `commands` accepts one or more ADB shell commands
-/// which act on a common `package` and `user`.
-#[must_use]
-pub fn request_builder(commands: &[&str], package: &str, user: Option) -> Vec {
- // Defense-in-depth: `package` is interpolated verbatim into a device-shell
- // action, so refuse any invalid name/ID. Every current caller already
- // reconciles the name against the live device package list before reaching
- // here, so this rejects nothing legitimate — it just keeps the no-injection
- // guarantee local to the sink instead of relying on each caller to sanitise.
- // Fail closed: emit no command for a malformed name rather than an injectable
- // device-shell string.
- if PackageId::new(package).is_none() {
- error!("request_builder: refusing invalid package name: {package:?}");
- return Vec::new();
- }
- let maybe_user_flag = user_flag(user);
- commands
- .iter()
- .map(|c| format!("{c}{maybe_user_flag} {package}"))
- .collect()
-}
-
-/// Get the model by querying the `ro.product.model` property.
-///
-/// If `serial` is empty, it lets ADB choose the default device.
-#[must_use]
-pub fn get_device_model(serial: &str) -> String {
- AdbCommand::new()
- .shell(serial)
- .getprop("ro.product.model")
- .unwrap_or_else(|err| {
- eprintln!("ERROR: {err}");
- error!("{err}");
- if err.contains("adb: no devices/emulators found") {
- "no devices/emulators found".to_string()
- } else {
- err
- }
- })
-}
-
-/// Get the brand by querying the `ro.product.brand` property.
-///
-/// If `serial` is empty, it lets ADB choose the default device.
-#[must_use]
-pub fn get_device_brand(serial: &str) -> String {
- AdbCommand::new()
- .shell(serial)
- .getprop("ro.product.brand")
- // `trim` is just-in-case
- .map(|s| s.trim().to_string())
- .unwrap_or_default()
-}
-
-/// Get Android SDK version by querying the
-// `ro.build.version.sdk` property or defaulting to 0.
-///
-/// If `device_serial` is empty, it lets ADB choose the default device.
-#[must_use]
-pub fn get_android_sdk(device_serial: &str) -> u8 {
- AdbCommand::new()
- .shell(device_serial)
- .getprop("ro.build.version.sdk")
- .map_or(0, |sdk| {
- sdk.parse().expect("SDK version numeral must be valid")
- })
-}
-
-/// Capture the current state of a package across all non-protected users.
-/// This is used to detect cross-user behavior by comparing before and after states.
-///
-/// Only includes users where the package exists (Some state). Users where the package
-/// doesn't exist (None) are not tracked.
-#[must_use]
-pub fn capture_cross_user_states(
- package_name: &str,
- device_serial: &str,
- target_user_id: u16,
- phone: &Phone,
-) -> Vec<(u16, PackageState)> {
- phone
- .user_list
- .iter()
- .filter(|u| !u.protected && u.id != target_user_id)
- .filter_map(|u| {
- verify_package_state(package_name, device_serial, Some(u.id)).map(|state| (u.id, state))
- })
- .collect()
-}
-
-/// Detect cross-user behavior and return appropriate notification message.
-/// This handles unexpected cross-user behavior:
-/// - Case A: Uninstall → Restore (package appears on other users)
-/// - Case B: Uninstall → Uninstall (package disappears from other users that previously had it)
-/// - Case C: Restore → Restore (package appears on other users)
-#[must_use]
-pub fn detect_cross_user_behavior(
- package_name: &str,
- device_serial: &str,
- target_user_id: u16,
- wanted_state: PackageState,
- actual_state: PackageState,
- phone: &Phone,
- before_states: &[(u16, PackageState)],
-) -> Option {
- // Only check if operation was successful on target user
- if actual_state != wanted_state {
- return None;
- }
-
- // Only check if we have multiple users
- if phone.user_list.len() < 2 {
- return None;
- }
-
- let after_states =
- check_cross_user_package_existence(package_name, device_serial, target_user_id, phone);
-
- match wanted_state {
- PackageState::Uninstalled => {
- if after_states.is_empty() {
- // Case B: Uninstall → Uninstall (check if all users lost package)
- let affected_users: Vec<_> = before_states
- .iter()
- .filter(|(uid, before_state)| {
- // Only flag if the package was installed/enabled/disabled before
- *before_state != PackageState::Uninstalled
- // And is NOT in after_states (doesn't exist in usable state anymore)
- && !after_states.iter().any(|(after_uid, _)| after_uid == uid)
- })
- .map(|(uid, _)| uid)
- .collect();
-
- if affected_users.is_empty() {
- None
- } else {
- let user_list = affected_users
- .iter()
- .map(|uid| format!("user {uid}"))
- .collect::>()
- .join(", ");
-
- Some(format!(
- "Detected cross-user uninstall: package was also uninstalled from {user_list} after uninstalling from user {target_user_id}"
- ))
- }
- } else {
- // Case A: Uninstall → Restore (package appears on other users)
- let user_list = after_states
- .iter()
- .map(|(uid, state)| format!("user {uid} ({state:?})"))
- .collect::>()
- .join(", ");
-
- Some(format!(
- "Detected cross-user restoration: package exists on {user_list} after uninstalling from user {target_user_id}"
- ))
- }
- }
- PackageState::Enabled | PackageState::Disabled => {
- // Case C: Restore → Restore (package appears on other users)
-
- // Check if a user didn't have the package before (not tracked or package didn't exist).
- // Detects packages that appear on users where they didn't exist previously (OEM cross-user restoration).
- let was_package_absent_before = |uid: &u16| {
- before_states
- .iter()
- .find(|(before_uid, _)| before_uid == uid)
- .is_none_or(|(_, before_state)| *before_state == PackageState::Uninstalled)
- };
-
- let newly_appeared: Vec<_> = after_states
- .iter()
- .filter(|(uid, _after_state)| was_package_absent_before(uid))
- .collect();
-
- if newly_appeared.is_empty() {
- None
- } else {
- let user_list = newly_appeared
- .iter()
- .map(|(uid, state)| format!("user {uid} ({state:?})"))
- .collect::>()
- .join(", ");
-
- Some(format!(
- "Detected cross-user restoration: package exists on {user_list} after {} from user {target_user_id}",
- if wanted_state == PackageState::Enabled {
- "enabling"
- } else {
- "disabling"
- }
- ))
- }
- }
- PackageState::All => None,
- }
-}
-
-#[must_use]
-pub const fn supports_disabling(dev: &Phone) -> bool {
- // >= Marshmallow (6.0)
- dev.android_sdk >= 23
-}
-
-/// Check if it might support multi-user mode,
-/// by simply comparing SDK version.
-/// `true` isn't reliable, you can only trust `false`.
-///
-/// See:
-/// -
-/// -
-#[must_use]
-pub const fn supports_multi_user(dev: &Phone) -> bool {
- // >= Lollipop (5.0)
- dev.android_sdk >= 21
-}
-
-/// Check if a `user_id` is protected on a device by trying
-/// to list associated packages.
-///
-/// If `device_serial` is empty, it lets ADB choose the default device.
-pub fn is_protected_user>(user_id: u16, device_serial: S) -> bool {
- AdbCommand::new()
- .shell(device_serial)
- .pm()
- .list_packages_sys(None, Some(user_id))
- .is_err()
-}
-
-#[must_use]
-pub fn list_users_idx_prot(device_serial: &str) -> Vec {
- AdbCommand::new()
- .shell(device_serial)
- .pm()
- .list_users()
- .map(|out| {
- out.into_iter()
- .enumerate()
- .map(|(i, user)| {
- let id = user.get_id();
- User {
- id,
- index: i,
- protected: is_protected_user(id, device_serial),
- }
- })
- .collect()
- })
- .unwrap_or_default()
-}
-
-/// This matches serials (`getprop ro.serialno`)
-/// that are authorized by the user.
-#[must_use]
-pub fn get_devices_list() -> Vec {
- retry(
- Fixed::from_millis(500).take(if cfg!(debug_assertions) { 3 } else { 10 }),
- || match AdbCommand::new().devices() {
- Ok(devices) => {
- let mut device_list: Vec = vec![];
- if devices.iter().all(|(_, stat)| stat != "device") {
- return OperationResult::Retry(vec![]);
- }
- for device in devices {
- let serial = &device.0;
- device_list.push(Phone {
- model: format!("{} {}", get_device_brand(serial), get_device_model(serial)),
- android_sdk: get_android_sdk(serial),
- user_list: list_users_idx_prot(serial),
- adb_id: serial.clone(),
- });
- }
- OperationResult::Ok(device_list)
- }
- Err(err) => {
- error!("get_devices_list() -> {err}");
- let test: Vec = vec![];
- OperationResult::Retry(test)
- }
- },
- )
- .unwrap_or_default()
-}
-
-#[must_use]
-pub fn initial_load() -> bool {
- match AdbCommand::new().devices() {
- Ok(_devices) => true,
- Err(_err) => false,
- }
-}
-
-/// Get the current state of a package on a device
-#[must_use]
-pub fn get_package_state(
- device_serial: &str,
- package_name: &str,
- user_id: Option,
-) -> Option {
- use crate::adb::{ACommand as AdbCommand, PmListPacksFlag};
-
- // Check if package is enabled
- if let Ok(enabled_packages) = AdbCommand::new()
- .shell(device_serial)
- .pm()
- .list_packages_sys(Some(PmListPacksFlag::OnlyEnabled), user_id)
- && enabled_packages.contains(&package_name.to_string())
- {
- return Some(PackageState::Enabled);
- }
-
- // Check if package is disabled
- if let Ok(disabled_packages) = AdbCommand::new()
- .shell(device_serial)
- .pm()
- .list_packages_sys(Some(PmListPacksFlag::OnlyDisabled), user_id)
- && disabled_packages.contains(&package_name.to_string())
- {
- return Some(PackageState::Disabled);
- }
-
- // Check if package exists at all (including uninstalled)
- if let Ok(all_packages) = AdbCommand::new()
- .shell(device_serial)
- .pm()
- .list_packages_sys(Some(PmListPacksFlag::IncludeUninstalled), user_id)
- && all_packages.contains(&package_name.to_string())
- {
- return Some(PackageState::Uninstalled);
- }
-
- // Package not found at all - it doesn't exist on this device/user
- None
-}
-
-/// Verify the current state of a package on a device.
-/// Returns the package state, or `None` if the package doesn't exist.
-#[must_use]
-pub fn verify_package_state(
- package_name: &str,
- device_serial: &str,
- user_id: Option,
-) -> Option {
- get_package_state(device_serial, package_name, user_id)
-}
-
-/// Check if a package exists on any other users besides the target user.
-/// This helps detect OEM-specific cross-user restoration behavior.
-///
-/// Only includes users where the package exists in a non-uninstalled state
-/// (i.e., Enabled or Disabled).
-#[must_use]
-pub fn check_cross_user_package_existence(
- package_name: &str,
- device_serial: &str,
- target_user_id: u16,
- phone: &Phone,
-) -> Vec<(u16, PackageState)> {
- let mut other_user_states = Vec::new();
-
- for user in &phone.user_list {
- if user.id != target_user_id
- && !user.protected
- && let Some(state) = verify_package_state(package_name, device_serial, Some(user.id))
- && state != PackageState::Uninstalled
- {
- other_user_states.push((user.id, state));
- }
- }
-
- other_user_states
-}
-
-/// Creates a `CorePackage` with the specified state, preserving other fields from the original.
-fn package_with_state(package: &CorePackage, state: PackageState) -> CorePackage {
- CorePackage {
- state,
- ..package.clone()
- }
-}
-
-/// Executes the first available command and returns the result.
-fn execute_first_command(commands: &[String], phone: &Phone) -> Result<(), String> {
- if commands.is_empty() {
- return Err("No command available".to_string());
- }
- AdbCommand::new()
- .shell(&phone.adb_id)
- .raw(&commands[0])
- .map(|_| ())
- .map_err(|err| err.clone())
-}
-
-/// Attempt fallback action when package state verification fails
-pub fn attempt_fallback(
- package: &CorePackage,
- wanted_state: PackageState,
- actual_state: PackageState,
- user: User,
- phone: &Phone,
-) -> Result {
- match (wanted_state, actual_state) {
- // Case 1: Tried to uninstall but package was reinstalled -> disable it
- (PackageState::Uninstalled, PackageState::Enabled) => {
- let pkg = package_with_state(package, PackageState::Enabled);
- let commands = apply_pkg_state_commands(&pkg, PackageState::Disabled, user, phone);
- execute_first_command(&commands, phone)
- .map(|()| "disabled package instead of uninstalling".to_string())
- .map_err(|e| format!("Failed to disable package: {e}"))
- }
-
- // Case 2: Tried to disable but package re-enabled itself -> try uninstall
- (PackageState::Disabled, PackageState::Enabled) => {
- let pkg = package_with_state(package, PackageState::Enabled);
- let commands = apply_pkg_state_commands(&pkg, PackageState::Uninstalled, user, phone);
- execute_first_command(&commands, phone)
- .map_err(|e| format!("Failed to uninstall: {e}"))?;
-
- // Verify the package was actually uninstalled
- match verify_package_state(&package.name, &phone.adb_id, Some(user.id)) {
- Some(PackageState::Uninstalled) | None => {
- Ok("uninstalled package instead of disabling".to_string())
- }
- _ => Err("Package still exists after uninstall attempt".to_string()),
- }
- }
-
- // Case 3: Tried to enable but package was disabled -> try uninstall then reinstall
- (PackageState::Enabled, PackageState::Disabled) => {
- let pkg = package_with_state(package, PackageState::Disabled);
- let uninstall_cmds =
- apply_pkg_state_commands(&pkg, PackageState::Uninstalled, user, phone);
- execute_first_command(&uninstall_cmds, phone)
- .map_err(|e| format!("Failed to uninstall for reinstall: {e}"))?;
-
- // Now try to reinstall/enable
- let pkg_uninstalled = package_with_state(package, PackageState::Uninstalled);
- let enable_cmds =
- apply_pkg_state_commands(&pkg_uninstalled, PackageState::Enabled, user, phone);
-
- if enable_cmds.is_empty() {
- return Ok("uninstalled package but couldn't reinstall".to_string());
- }
-
- execute_first_command(&enable_cmds, phone)
- .map(|()| "uninstalled and reinstalled package to enable it".to_string())
- .map_err(|e| format!("Failed to reinstall package: {e}"))
- }
-
- // Other cases - no fallback available
- _ => Err(format!(
- "No fallback available for wanted state {wanted_state:?} and actual state {actual_state:?}"
- )),
- }
-}
diff --git a/crates/uad-core/src/utils.rs b/crates/uad-core/src/utils.rs
deleted file mode 100644
index 3569162..0000000
--- a/crates/uad-core/src/utils.rs
+++ /dev/null
@@ -1,299 +0,0 @@
-#![warn(clippy::unwrap_used)]
-
-use crate::{
- adb::{ACommand as AdbCommand, PmListPacksFlag},
- sync::{CorePackage, User},
- uad_lists::{PackageHashMap, PackageState, Removal, UadList},
-};
-use chrono::{DateTime, offset::Utc};
-use csv::Writer;
-use log::error;
-use std::{
- collections::HashSet,
- fmt, fs,
- path::{Path, PathBuf},
-};
-
-/// Canonical shortened name of the application
-pub const NAME: &str = "UAD-ng";
-/// Full name of the application
-pub const FULL_NAME: &str = "Universal Android Debloater Next Generation";
-pub const EXPORT_FILE_NAME: &str = "selection_export.txt";
-
-/// Returns `true` if `c` matches the regex `\w`
-#[inline]
-#[must_use]
-pub const fn is_w(c: u8) -> bool {
- // https://github.com/rust-lang/rust/issues/93279
- // https://github.com/rust-lang/rust/issues/83623
- (c == b'_') | c.is_ascii_alphanumeric()
-}
-
-/// Returns `true` if `s` matches the regex `^\w+$`
-#[must_use]
-pub const fn is_all_w_c(s: &[u8]) -> bool {
- let mut i = 0;
- while i < s.len() {
- if !is_w(s[i]) {
- return false;
- }
- i += 1;
- }
- true
-}
-
-// Takes a time-stamp parameter,
-// for purity and testability.
-//
-// The TZ is generic, because testing requires UTC,
-// while users get the local-aware version.
-#[expect(
- clippy::needless_pass_by_value,
- reason = "Timestamps should be fresh, no need to borrow"
-)]
-#[must_use]
-pub fn generate_backup_name(t: DateTime) -> String
-where
- T: chrono::TimeZone,
- T::Offset: std::fmt::Display,
-{
- t.format("uninstalled_packages_%Y%m%d.csv").to_string()
-}
-
-#[derive(Debug, Clone, Copy)]
-pub enum Error {
- DialogClosed,
-}
-
-#[must_use]
-pub fn fetch_packages(
- uad_lists: &PackageHashMap,
- device_serial: &str,
- user_id: Option,
-) -> Vec {
- let all_sys_packs = AdbCommand::new()
- .shell(device_serial)
- .pm()
- .list_packages_sys(Some(PmListPacksFlag::IncludeUninstalled), user_id)
- .unwrap_or_default();
- let enabled_sys_packs: HashSet = AdbCommand::new()
- .shell(device_serial)
- .pm()
- .list_packages_sys(Some(PmListPacksFlag::OnlyEnabled), user_id)
- .unwrap_or_default()
- .into_iter()
- .collect();
- let disabled_sys_packs: HashSet = AdbCommand::new()
- .shell(device_serial)
- .pm()
- .list_packages_sys(Some(PmListPacksFlag::OnlyDisabled), user_id)
- .unwrap_or_default()
- .into_iter()
- .collect();
-
- let mut description;
- let mut removal;
- let mut state;
- let mut list;
- let mut user_package: Vec = Vec::new();
-
- for pack_name in all_sys_packs {
- let p_name = &pack_name;
- description = String::from("[No description]: CONTRIBUTION WELCOMED");
- removal = Removal::Unlisted;
- state = PackageState::Uninstalled;
- list = UadList::Unlisted;
-
- if let Some(package) = uad_lists.get(p_name) {
- if !package.description.is_empty() {
- description = package.description.clone();
- }
- removal = package.removal;
- list = package.list;
- }
-
- if enabled_sys_packs.contains(p_name) {
- state = PackageState::Enabled;
- } else if disabled_sys_packs.contains(p_name) {
- state = PackageState::Disabled;
- }
-
- let package = CorePackage {
- name: p_name.clone(),
- description,
- removal,
- state,
- list,
- };
- user_package.push(package);
- }
- user_package.sort_by_key(|package| package.name.to_lowercase());
- user_package
-}
-
-#[must_use]
-pub fn setup_uad_dir(dir: &Path) -> PathBuf {
- let dir = dir.join("uad");
- if let Err(e) = fs::create_dir_all(&dir) {
- error!("Can't create directory: {}", dir.display());
- panic!("{e}");
- }
- dir
-}
-
-/// Open a directory or file with the system's default file manager.
-pub fn open_url(dir: PathBuf) {
- const OPENER: &str = match std::env::consts::OS.as_bytes() {
- b"windows" => "explorer",
- b"macos" => "open",
- // "linux"
- _ => "xdg-open",
- };
- match std::process::Command::new(OPENER).arg(dir).output() {
- Ok(o) => {
- if !o.status.success() {
- // Use lossy conversion for stderr - some systems (like Windows)
- // may output non-UTF8 characters in error messages
- let stderr = String::from_utf8_lossy(&o.stderr);
- let stderr_trimmed = stderr.trim_end();
- if stderr_trimmed.is_empty() {
- error!("Can't open URL: command failed with no error message");
- } else {
- error!("Can't open the following URL: {stderr_trimmed}");
- }
- }
- }
- Err(e) => error!("Failed to run command to open the file explorer: {e}"),
- }
-}
-
-#[rustfmt::skip]
-#[must_use]
-pub fn last_modified_date(file: PathBuf) -> DateTime {
- fs::metadata(file).map_or_else(|_| Utc::now(), |metadata| match metadata.modified() {
- Ok(time) => time.into(),
- Err(_) => Utc::now(),
- })
-}
-
-#[must_use]
-pub fn format_diff_time_from_now(date: DateTime) -> String {
- let now: DateTime = Utc::now();
- let last_update = now - date;
- if last_update.num_days() == 0 {
- if last_update.num_hours() == 0 {
- last_update.num_minutes().to_string() + " min(s) ago"
- } else {
- last_update.num_hours().to_string() + " hour(s) ago"
- }
- } else {
- last_update.num_days().to_string() + " day(s) ago"
- }
-}
-
-/// Export selected package names.
-/// File will be saved in same directory where UAD-ng is located.
-pub fn export_selection(package_names: &[String]) -> Result {
- let selected = package_names.join("\n");
-
- match fs::write(EXPORT_FILE_NAME, selected) {
- Ok(()) => Ok(true),
- Err(err) => Err(err.to_string()),
- }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct DisplayablePath {
- pub path: PathBuf,
-}
-
-impl fmt::Display for DisplayablePath {
- fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
- let stem = self.path.file_stem().map_or_else(
- || {
- error!("[PATH STEM]: No file stem found");
- "[File steam not found]".to_string()
- },
- |p| {
- if let Ok(stem) = p.to_os_string().into_string() {
- stem
- } else {
- error!("[PATH ENCODING]: {}", self.path.display());
- "[PATH ENCODING ERROR]".to_string()
- }
- },
- );
-
- write!(f, "{stem}")
- }
-}
-
-/// Export uninstalled packages in a csv file.
-/// Exported information will contain package name and description.
-pub fn export_packages(user: User, phone_packages: &[Vec]) -> Result {
- let backup_file = generate_backup_name(chrono::Local::now());
-
- let file = fs::File::create(backup_file).map_err(|err| err.to_string())?;
- let mut wtr = Writer::from_writer(file);
-
- wtr.write_record(["Package Name", "Description"])
- .map_err(|err| err.to_string())?;
-
- let uninstalled_packages: Vec<&CorePackage> = phone_packages[user.index]
- .iter()
- .filter(|p| p.state == PackageState::Uninstalled)
- .collect();
-
- for package in uninstalled_packages {
- wtr.write_record([&package.name, &package.description.replace('\n', " ")])
- .map_err(|err| err.to_string())?;
- }
-
- wtr.flush().map_err(|err| err.to_string())?;
-
- Ok(true)
-}
-
-/// Truncate description to fit within max length, taking only the first line
-#[must_use]
-pub fn truncate_description(desc: &str, max_len: usize) -> String {
- let first_line = desc.split('\n').next().unwrap_or("").trim_end();
-
- if first_line.len() <= max_len {
- first_line.to_string()
- } else {
- format!("{}...", &first_line[..max_len.saturating_sub(3)])
- }
-}
-
-/// Check if package matches search term (checks name and description)
-#[must_use]
-pub fn matches_search(pkg_name: &str, search_term: &str, pkg_description: Option<&str>) -> bool {
- let search_lower = search_term.to_lowercase();
-
- if pkg_name.to_lowercase().contains(&search_lower) {
- return true;
- }
-
- if let Some(description) = pkg_description {
- if description.to_lowercase().contains(&search_lower) {
- return true;
- }
- }
-
- false
-}
-
-#[cfg(test)]
-mod tests {
- use super::*;
- use chrono::TimeZone;
-
- #[test]
- fn backup_name() {
- assert_eq!(
- generate_backup_name(chrono::Utc.timestamp_millis_opt(0).unwrap()),
- "uninstalled_packages_19700101.csv".to_string()
- );
- }
-}
diff --git a/crates/uad-gui/Cargo.toml b/crates/uad-gui/Cargo.toml
deleted file mode 100644
index 4a50636..0000000
--- a/crates/uad-gui/Cargo.toml
+++ /dev/null
@@ -1,62 +0,0 @@
-[package]
-name = "uad-gui"
-version.workspace = true
-authors.workspace = true
-license.workspace = true
-homepage.workspace = true
-repository.workspace = true
-readme.workspace = true
-keywords.workspace = true
-categories = ["gui"]
-edition.workspace = true
-
-[[bin]]
-name = "uad-ng"
-path = "src/main.rs"
-
-[features]
-default = ["wgpu", "self-update", "img"]
-wgpu = [] # Iced/wgpu is default
-self-update = ["flate2", "tar"]
-no-self-update = []
-img = ["image", "iced/image"]
-
-[dependencies]
-uad-core = { path = "../uad-core", features = ["self-update"] }
-iced.workspace = true
-image = { workspace = true, optional = true }
-rfd.workspace = true
-dark-light.workspace = true
-fern.workspace = true
-chrono.workspace = true
-dirs.workspace = true
-log.workspace = true
-flate2 = { workspace = true, optional = true }
-tar = { workspace = true, optional = true }
-
-[target.'cfg(target_os = "windows")'.dependencies]
-win32console.workspace = true
-
-[build-dependencies]
-embed-resource = "3"
-
-[lints.rust]
-deprecated_safe = "warn"
-
-[lints.clippy]
-undocumented_unsafe_blocks = "forbid"
-exit = "deny"
-panic_in_result_fn = "warn"
-infinite_loop = "warn"
-mem_forget = "warn"
-implicit_clone = "warn"
-format_push_string = "warn"
-large_include_file = "warn"
-shadow_unrelated = "warn"
-struct_field_names = "allow" # annoying
-
-disallowed_types = "deny"
-disallowed_methods = "deny"
-
-allow_attributes_without_reason = "warn"
-pedantic = { level = "warn", priority = -1 }
diff --git a/crates/uad-gui/src/helpers.rs b/crates/uad-gui/src/helpers.rs
deleted file mode 100644
index 25c06f1..0000000
--- a/crates/uad-gui/src/helpers.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use crate::style;
-use crate::theme::Theme;
-use iced::Element;
-use iced::widget::button::Button;
-
-/// Wrapper function for `iced::widget::button` with padding and style applied
-pub fn button_primary<'a, Message>(
- content: impl Into>,
-) -> Button<'a, Message, Theme> {
- iced::widget::button(content)
- .padding([5, 10])
- .style(style::Button::Primary)
-}
-
-/// Opens a file picker dialog to select a folder
-pub async fn open_folder() -> Result {
- rfd::AsyncFileDialog::new()
- .set_title("Choose a backup location")
- .pick_folder()
- .await
- .ok_or(uad_core::utils::Error::DialogClosed)
- .map(|f| f.path().to_path_buf())
-}
diff --git a/crates/uad-gui/src/lib.rs b/crates/uad-gui/src/lib.rs
deleted file mode 100644
index ede5da8..0000000
--- a/crates/uad-gui/src/lib.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#![allow(
- clippy::missing_errors_doc,
- reason = "Short-circuit doc lint to keep CI green"
-)]
-
-pub mod gui;
-pub mod helpers;
-pub mod style;
-pub mod theme;
-pub mod views;
-pub mod widgets;
diff --git a/crates/uad-gui/src/style.rs b/crates/uad-gui/src/style.rs
deleted file mode 100644
index 9eeba68..0000000
--- a/crates/uad-gui/src/style.rs
+++ /dev/null
@@ -1,776 +0,0 @@
-#![allow(
- non_snake_case,
- clippy::trivially_copy_pass_by_ref,
- clippy::wildcard_imports,
- reason = "Iced style modules use PascalCase and &Theme; wildcard for local convenience"
-)]
-use crate::theme::{ColorPalette, Theme};
-use iced::widget::{
- button, checkbox, container, overlay, pick_list, radio, scrollable, text, text_editor,
- text_input,
-};
-use iced::{Background, Border, Color, Shadow};
-
-// Implement theming catalogs for our custom `Theme` so generic widgets
-// like `Button<'_, Message, Theme, Renderer>` compile under iced 0.13.
-
-impl button::Catalog for Theme {
- type Class<'a> = button::StyleFn<'a, Theme>;
-
- fn default<'a>() -> ::Class<'a> {
- Box::new(|t: &Theme, s: button::Status| Button::Primary(t, s))
- }
-
- fn style(
- &self,
- class: &::Class<'_>,
- status: button::Status,
- ) -> button::Style {
- (class)(self, status)
- }
-}
-
-impl checkbox::Catalog for Theme {
- type Class<'a> = checkbox::StyleFn<'a, Theme>;
-
- fn default<'a>() -> ::Class<'a> {
- Box::new(|t: &Theme, s: checkbox::Status| CheckBox::SettingsEnabled(t, s))
- }
-
- fn style(
- &self,
- class: &::Class<'_>,
- status: checkbox::Status,
- ) -> checkbox::Style {
- (class)(self, status)
- }
-}
-
-impl container::Catalog for Theme {
- type Class<'a> = container::StyleFn<'a, Theme>;
-
- fn default<'a>() -> ::Class<'a> {
- Box::new(|t: &Theme| Container::Background(t))
- }
-
- fn style(&self, class: &::Class<'_>) -> container::Style {
- (class)(self)
- }
-}
-
-impl scrollable::Catalog for Theme {
- type Class<'a> = scrollable::StyleFn<'a, Theme>;
-
- fn default<'a>() -> ::Class<'a> {
- Box::new(|t: &Theme, s: scrollable::Status| Scrollable::Description(t, s))
- }
-
- fn style(
- &self,
- class: &::Class<'_>,
- status: scrollable::Status,
- ) -> scrollable::Style {
- (class)(self, status)
- }
-}
-
-impl text::Catalog for Theme {
- type Class<'a> = text::StyleFn<'a, Theme>;
-
- fn default<'a>() -> ::Class<'a> {
- Box::new(|t: &Theme| Text::Default(t))
- }
-
- fn style(&self, class: &::Class<'_>) -> text::Style {
- (class)(self)
- }
-}
-
-// Additional catalogs required by Iced 0.13 generic theming
-
-impl text_input::Catalog for Theme {
- type Class<'a> = text_input::StyleFn<'a, Theme>;
-
- fn default<'a>() -> ::Class<'a> {
- Box::new(|t: &Theme, s: text_input::Status| {
- let p = t.palette();
-
- let active = text_input::Style {
- background: Background::Color(p.base.foreground),
- border: Border {
- color: p.base.foreground,
- width: 0.0,
- radius: 5.0.into(),
- },
- icon: Color {
- a: 0.5,
- ..p.normal.primary
- },
- placeholder: p.normal.surface,
- value: p.bright.primary,
- selection: p.normal.primary,
- };
-
- let focused = text_input::Style {
- background: Background::Color(p.base.foreground),
- border: Border {
- color: Color {
- a: 0.5,
- ..p.normal.primary
- },
- width: 1.0,
- radius: 2.0.into(),
- },
- icon: Color {
- a: 0.5,
- ..p.normal.primary
- },
- placeholder: p.normal.surface,
- value: p.bright.primary,
- selection: p.normal.primary,
- };
-
- let disabled = text_input::Style {
- background: Background::Color(p.base.background),
- border: Border {
- color: Color {
- a: 0.5,
- ..p.base.foreground
- },
- width: 1.0,
- radius: 2.0.into(),
- },
- icon: Color {
- a: 0.5,
- ..p.base.foreground
- },
- placeholder: p.normal.surface,
- value: p.bright.primary,
- selection: p.normal.primary,
- };
-
- match s {
- text_input::Status::Active => active,
- text_input::Status::Focused { .. } | text_input::Status::Hovered => focused,
- text_input::Status::Disabled => disabled,
- }
- })
- }
-
- fn style(
- &self,
- class: &::Class<'_>,
- status: text_input::Status,
- ) -> text_input::Style {
- (class)(self, status)
- }
-}
-
-impl pick_list::Catalog for Theme {
- type Class<'a> = pick_list::StyleFn<'a, Theme>;
-
- fn default<'a>() -> ::Class<'a> {
- Box::new(|t: &Theme, s: pick_list::Status| {
- let p = t.palette();
- let border_color = match s {
- pick_list::Status::Hovered => p.normal.primary,
- _ => Color {
- a: 0.5,
- ..p.normal.primary
- },
- };
- pick_list::Style {
- text_color: p.bright.surface,
- placeholder_color: p.bright.surface,
- handle_color: p.bright.surface,
- background: Background::Color(p.base.background),
- border: Border {
- color: border_color,
- width: 1.0,
- radius: 2.0.into(),
- },
- }
- })
- }
-
- fn style(
- &self,
- class: &::Class<'_>,
- status: pick_list::Status,
- ) -> pick_list::Style {
- (class)(self, status)
- }
-}
-
-impl overlay::menu::Catalog for Theme {
- type Class<'a> = overlay::menu::StyleFn<'a, Theme>;
-
- fn default<'a>() -> ::Class<'a> {
- Box::new(|t: &Theme| {
- let p = t.palette();
- overlay::menu::Style {
- text_color: p.bright.surface,
- background: p.base.background.into(),
- border: Border {
- color: p.base.background,
- width: 1.0,
- radius: 2.0.into(),
- },
- selected_text_color: p.bright.surface,
- selected_background: p.normal.primary.into(),
- shadow: Shadow::default(),
- }
- })
- }
-
- fn style(&self, class: &::Class<'_>) -> overlay::menu::Style {
- (class)(self)
- }
-}
-
-impl radio::Catalog for Theme {
- type Class<'a> = radio::StyleFn<'a, Theme>;
-
- fn default<'a>() -> ::Class<'a> {
- Box::new(|t: &Theme, s: radio::Status| {
- let p = t.palette();
- let active = radio::Style {
- background: Color::TRANSPARENT.into(),
- dot_color: p.bright.primary,
- border_width: 1.0,
- border_color: p.bright.primary,
- text_color: None,
- };
-
- match s {
- radio::Status::Active { .. } => active,
- radio::Status::Hovered { .. } => radio::Style {
- border_width: 2.0,
- ..active
- },
- }
- })
- }
-
- fn style(
- &self,
- class: &::Class<'_>,
- status: radio::Status,
- ) -> radio::Style {
- (class)(self, status)
- }
-}
-
-impl text_editor::Catalog for Theme {
- type Class<'a> = text_editor::StyleFn<'a, Theme>;
-
- fn default<'a>() -> ::Class<'a> {
- Box::new(|t: &Theme, _s: text_editor::Status| {
- let p = t.palette();
- text_editor::Style {
- background: Background::Color(p.base.foreground),
- border: Border {
- color: Color::TRANSPARENT,
- width: 0.0,
- radius: 0.0.into(),
- },
- placeholder: p.normal.surface,
- value: p.bright.surface,
- selection: Color {
- a: 0.3,
- ..p.normal.primary
- },
- }
- })
- }
-
- fn style(
- &self,
- class: &::Class<'_>,
- status: text_editor::Status,
- ) -> text_editor::Style {
- (class)(self, status)
- }
-}
-
-// Rule styling for custom Theme (needed by vertical_rule)
-impl iced::widget::rule::Catalog for Theme {
- type Class<'a> = iced::widget::rule::StyleFn<'a, Theme>;
-
- fn default<'a>() -> ::Class<'a> {
- Box::new(|t: &Theme| {
- let p = t.palette();
- iced::widget::rule::Style {
- color: p.bright.surface,
- radius: 2.0.into(),
- fill_mode: iced::widget::rule::FillMode::Full,
- snap: true,
- }
- })
- }
-
- fn style(
- &self,
- class: &::Class<'_>,
- ) -> iced::widget::rule::Style {
- (class)(self)
- }
-}
-
-pub mod Container {
- use super::*;
-
- #[allow(dead_code, reason = "Used by other themes or future styles")]
- #[must_use]
- pub fn Invisible(_: &Theme) -> container::Style {
- container::Style::default()
- }
-
- #[must_use]
- pub fn Frame(theme: &Theme) -> container::Style {
- let p = theme.palette();
- container::Style {
- background: Some(Background::Color(p.base.foreground)),
- text_color: Some(p.bright.surface),
- border: Border {
- color: Color::TRANSPARENT,
- width: 0.0,
- radius: 5.0.into(),
- },
- shadow: Shadow::default(),
- snap: true,
- }
- }
-
- #[must_use]
- pub fn BorderedFrame(theme: &Theme) -> container::Style {
- let p = theme.palette();
- container::Style {
- background: Some(Background::Color(p.base.foreground)),
- text_color: Some(p.bright.surface),
- border: Border {
- color: p.normal.error,
- width: 1.0,
- radius: 5.0.into(),
- },
- shadow: Shadow::default(),
- snap: true,
- }
- }
-
- #[allow(dead_code, reason = "Currently unused in some views")]
- #[must_use]
- pub fn Tooltip(theme: &Theme) -> container::Style {
- let p = theme.palette();
- container::Style {
- background: Some(Background::Color(p.base.foreground)),
- text_color: Some(p.bright.surface),
- border: Border {
- color: p.normal.primary,
- width: 1.0,
- radius: 8.0.into(),
- },
- shadow: Shadow::default(),
- snap: true,
- }
- }
-
- #[must_use]
- pub fn Background(theme: &Theme) -> container::Style {
- let p = theme.palette();
- container::Style {
- background: Some(Background::Color(p.base.background)),
- text_color: Some(p.bright.surface),
- border: Border {
- color: Color::TRANSPARENT,
- width: 0.0,
- radius: 5.0.into(),
- },
- shadow: Shadow::default(),
- snap: true,
- }
- }
-}
-
-pub mod Button {
- use super::*;
-
- #[allow(
- dead_code,
- reason = "Helper used by multiple styles; may be inlined by compiler"
- )]
- fn base(border_color: Color) -> button::Style {
- button::Style {
- background: None,
- text_color: Color::WHITE,
- border: Border {
- color: border_color,
- width: 1.0,
- radius: 2.0.into(),
- },
- shadow: Shadow::default(),
- snap: true,
- }
- }
-
- #[must_use]
- pub fn Primary(theme: &Theme, status: button::Status) -> button::Style {
- let p = theme.palette();
- let mut style = style_active_hover_disabled(p.bright.primary, p.bright.primary, status);
- if matches!(status, button::Status::Active | button::Status::Pressed) {
- style.background = Some(Background::Color(p.base.foreground));
- }
- style
- }
-
- #[allow(
- dead_code,
- reason = "Alias kept for semantic clarity in some call-sites"
- )]
- #[must_use]
- pub fn SelfUpdate(theme: &Theme, status: button::Status) -> button::Style {
- Primary(theme, status)
- }
-
- #[must_use]
- pub fn RestorePackage(theme: &Theme, status: button::Status) -> button::Style {
- let p = theme.palette();
- let mut style = style_active_hover_disabled(p.bright.secondary, p.bright.secondary, status);
- if matches!(status, button::Status::Active | button::Status::Pressed) {
- style.background = Some(Background::Color(p.base.foreground));
- }
- if matches!(status, button::Status::Disabled) {
- style.background = Some(Background::Color(Color {
- a: 0.05,
- ..p.normal.primary
- }));
- style.text_color = p.bright.primary;
- }
- style
- }
-
- #[must_use]
- pub fn UninstallPackage(theme: &Theme, status: button::Status) -> button::Style {
- let p = theme.palette();
- let mut style = style_active_hover_disabled(p.bright.error, p.bright.error, status);
- if matches!(status, button::Status::Active | button::Status::Pressed) {
- style.background = Some(Background::Color(p.base.foreground));
- }
- style
- }
-
- #[allow(
- dead_code,
- reason = "Style exposed for disabled state buttons in some contexts"
- )]
- #[must_use]
- pub fn Unavailable(theme: &Theme, status: button::Status) -> button::Style {
- UninstallPackage(theme, status)
- }
-
- #[must_use]
- pub fn NormalPackage(theme: &Theme, status: button::Status) -> button::Style {
- let p = theme.palette();
- match status {
- button::Status::Hovered => button::Style {
- background: Some(Background::Color(Color {
- a: 0.25,
- ..p.normal.primary
- })),
- text_color: p.bright.surface,
- border: Border {
- color: p.base.background,
- width: 0.0,
- radius: 5.0.into(),
- },
- shadow: Shadow::default(),
- snap: true,
- },
- _ => button::Style {
- background: Some(Background::Color(p.base.foreground)),
- text_color: p.bright.surface,
- border: Border {
- color: p.base.background,
- width: 0.0,
- radius: 5.0.into(),
- },
- shadow: Shadow::default(),
- snap: true,
- },
- }
- }
-
- #[must_use]
- pub fn SelectedPackage(theme: &Theme, _status: button::Status) -> button::Style {
- let p = theme.palette();
- button::Style {
- background: Some(Background::Color(Color {
- a: 0.25,
- ..p.normal.primary
- })),
- text_color: p.bright.primary,
- border: Border {
- color: p.normal.primary,
- width: 0.0,
- radius: 5.0.into(),
- },
- shadow: Shadow::default(),
- snap: true,
- }
- }
-
- #[allow(dead_code, reason = "Used in views where buttons must be invisible")]
- #[must_use]
- pub fn Hidden(_: &Theme, _: button::Status) -> button::Style {
- button::Style {
- background: Some(Background::Color(Color::TRANSPARENT)),
- text_color: Color::TRANSPARENT,
- border: Border {
- color: Color::TRANSPARENT,
- width: 0.0,
- radius: 5.0.into(),
- },
- shadow: Shadow::default(),
- snap: true,
- }
- }
-
- fn style_active_hover_disabled(
- main: Color,
- text: Color,
- status: button::Status,
- ) -> button::Style {
- match status {
- button::Status::Active | button::Status::Pressed => button::Style {
- background: Some(Background::Color(main)),
- text_color: text,
- border: Border {
- color: Color { a: 0.5, ..main },
- width: 1.0,
- radius: 2.0.into(),
- },
- shadow: Shadow::default(),
- snap: true,
- },
- button::Status::Hovered => button::Style {
- background: Some(Background::Color(Color { a: 0.25, ..main })),
- text_color: text,
- border: Border {
- color: Color { a: 0.5, ..main },
- width: 1.0,
- radius: 2.0.into(),
- },
- shadow: Shadow::default(),
- snap: true,
- },
- button::Status::Disabled => button::Style {
- background: Some(Background::Color(Color { a: 0.05, ..main })),
- text_color: Color { a: 0.5, ..text },
- border: Border {
- color: Color { a: 0.5, ..main },
- width: 1.0,
- radius: 2.0.into(),
- },
- shadow: Shadow::default(),
- snap: true,
- },
- }
- }
-}
-
-pub mod Scrollable {
- use super::*;
-
- #[allow(dead_code, reason = "Kept for future custom rails variations")]
- fn rails(scroller_color: Color) -> (scrollable::Rail, scrollable::Rail) {
- let rail = scrollable::Rail {
- background: Some(Background::Color(Color::TRANSPARENT)),
- border: Border {
- color: Color::TRANSPARENT,
- width: 0.0,
- radius: 5.0.into(),
- },
- scroller: scrollable::Scroller {
- background: Background::Color(scroller_color),
- border: Border {
- color: Color::TRANSPARENT,
- width: 1.0,
- radius: 5.0.into(),
- },
- },
- };
- (rail, rail)
- }
-
- fn autoscroll(p: ColorPalette) -> scrollable::AutoScroll {
- scrollable::AutoScroll {
- background: Background::Color(Color {
- a: 0.05,
- ..p.base.background
- }),
- border: Border {
- color: Color::TRANSPARENT,
- width: 0.0,
- radius: 5.0.into(),
- },
- shadow: Shadow::default(),
- icon: p.bright.surface,
- }
- }
-
- #[must_use]
- pub fn Description(theme: &Theme, _status: scrollable::Status) -> scrollable::Style {
- let p = theme.palette();
- let (v, h) = rails(p.normal.surface);
- scrollable::Style {
- container: container::Style::default(),
- vertical_rail: v,
- horizontal_rail: h,
- gap: Some(Background::Color(Color::TRANSPARENT)),
- auto_scroll: autoscroll(p),
- }
- }
-
- #[must_use]
- pub fn Packages(theme: &Theme, _status: scrollable::Status) -> scrollable::Style {
- let p = theme.palette();
- let (v, h) = rails(p.base.foreground);
- scrollable::Style {
- container: container::Style::default(),
- vertical_rail: v,
- horizontal_rail: h,
- gap: Some(Background::Color(Color::TRANSPARENT)),
- auto_scroll: autoscroll(p),
- }
- }
-}
-
-pub mod CheckBox {
- use super::*;
-
- #[must_use]
- pub fn PackageEnabled(theme: &Theme, _status: checkbox::Status) -> checkbox::Style {
- let p = theme.palette();
- checkbox::Style {
- background: Background::Color(p.base.background),
- icon_color: p.bright.primary,
- border: Border {
- color: p.base.background,
- width: 1.0,
- radius: 5.0.into(),
- },
- text_color: Some(p.bright.surface),
- }
- }
-
- #[must_use]
- pub fn PackageDisabled(theme: &Theme, _status: checkbox::Status) -> checkbox::Style {
- let p = theme.palette();
- checkbox::Style {
- background: Background::Color(Color {
- a: 0.55,
- ..p.base.background
- }),
- icon_color: p.bright.primary,
- border: Border {
- color: p.normal.primary,
- width: 1.0,
- radius: 5.0.into(),
- },
- text_color: Some(p.normal.primary),
- }
- }
-
- #[must_use]
- pub fn SettingsEnabled(theme: &Theme, _status: checkbox::Status) -> checkbox::Style {
- let p = theme.palette();
- checkbox::Style {
- background: Background::Color(p.base.background),
- icon_color: p.bright.primary,
- border: Border {
- color: p.bright.primary,
- width: 1.0,
- radius: 5.0.into(),
- },
- text_color: Some(p.bright.surface),
- }
- }
-
- #[must_use]
- pub fn SettingsDisabled(theme: &Theme, _status: checkbox::Status) -> checkbox::Style {
- let p = theme.palette();
- checkbox::Style {
- background: Background::Color(p.base.foreground),
- icon_color: p.bright.primary,
- border: Border {
- color: p.normal.primary,
- width: 1.0,
- radius: 5.0.into(),
- },
- text_color: Some(p.bright.surface),
- }
- }
-}
-
-pub mod Text {
- use super::*;
-
- #[must_use]
- pub fn Default(theme: &Theme) -> text::Style {
- let _ = theme;
- text::Style::default()
- }
-
- #[must_use]
- pub fn Ok(theme: &Theme) -> text::Style {
- let p = theme.palette();
- text::Style {
- color: Some(p.bright.secondary),
- }
- }
-
- #[must_use]
- pub fn Danger(theme: &Theme) -> text::Style {
- let p = theme.palette();
- text::Style {
- color: Some(p.bright.error),
- }
- }
-
- #[must_use]
- pub fn Commentary(theme: &Theme) -> text::Style {
- let p = theme.palette();
- text::Style {
- color: Some(p.normal.surface),
- }
- }
-
- #[allow(
- dead_code,
- reason = "Convenience factory used by dynamic text coloring"
- )]
- pub fn Color(c: Color) -> impl Fn(&Theme) -> text::Style {
- move |_t: &Theme| text::Style { color: Some(c) }
- }
-}
-
-// Unit tests
-#[cfg(test)]
-mod tests {
- use super::*;
-
- #[test]
- fn test_palette() {
- let palette = Theme::Dark.palette();
-
- assert_ne!(palette.base.background, palette.base.foreground);
- assert_ne!(palette.normal.primary, Color::BLACK);
- assert_ne!(palette.normal.surface, Color::BLACK);
- assert_ne!(palette.bright.primary, Color::BLACK);
- // if `LIGHT` then this can be `BLACK`
- // https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/pull/730#issuecomment-2525405134
- //assert_ne!(palette.bright.surface, Color::BLACK);
- assert_ne!(palette.normal.error, Color::BLACK);
- assert_ne!(palette.bright.error, Color::BLACK);
- }
-}
diff --git a/crates/uad-gui/src/views/about.rs b/crates/uad-gui/src/views/about.rs
deleted file mode 100644
index 42cb723..0000000
--- a/crates/uad-gui/src/views/about.rs
+++ /dev/null
@@ -1,174 +0,0 @@
-use crate::helpers::button_primary;
-use crate::theme::Theme;
-use crate::{gui::UpdateState, style, widgets::text};
-use iced::widget::{Space, column, container, row};
-use iced::{Alignment, Element, Length, Renderer};
-use log::error;
-use std::path::PathBuf;
-use uad_core::CACHE_DIR;
-use uad_core::adb;
-use uad_core::uad_lists::LIST_FNAME;
-use uad_core::utils::{FULL_NAME, NAME, last_modified_date, open_url};
-
-#[cfg(feature = "self-update")]
-use uad_core::update::SelfUpdateStatus;
-
-#[derive(Default, Debug, Clone)]
-pub struct About {}
-
-#[derive(Debug, Clone)]
-pub enum Message {
- UrlPressed(PathBuf),
- UpdateUadLists,
- DoSelfUpdate,
-}
-
-impl About {
- #[allow(
- clippy::unused_self,
- reason = "Trait-like shape required by GUI architecture"
- )]
- pub fn update(&mut self, msg: Message) {
- if let Message::UrlPressed(url) = msg {
- open_url(url);
- }
- // other events are handled by UadGui update()
- }
- #[allow(
- clippy::unused_self,
- reason = "Trait-like shape required by GUI architecture"
- )]
- pub fn view(&self, update_state: &UpdateState) -> Element<'_, Message, Theme, Renderer> {
- let about_text = text(format!(
- "{FULL_NAME} ({NAME}) is a free and open-source community project \naiming at simplifying the removal of pre-installed apps on any Android device."
- ));
-
- let descr_container = container(about_text)
- .width(Length::Fill)
- .padding(25)
- .style(style::Container::Frame);
-
- let date = last_modified_date(CACHE_DIR.join(LIST_FNAME));
- let uad_list_text =
- text(format!("{NAME} package list: v{}", date.format("%Y%m%d"))).width(250);
- let last_update_text = text(update_state.uad_list.to_string());
- let uad_lists_btn = button_primary("Update").on_press(Message::UpdateUadLists);
-
- #[cfg(feature = "self-update")]
- let self_update_row = {
- let self_update_btn = button_primary("Update").on_press(Message::DoSelfUpdate);
-
- let uad_version_text =
- text(format!("{NAME} version: v{}", env!("CARGO_PKG_VERSION"))).width(250);
-
- let self_update_text = update_state
- .self_update
- .latest_release
- .as_ref()
- .map_or_else(
- || {
- if update_state.self_update.status == SelfUpdateStatus::Done {
- "(No update available)".to_string()
- } else {
- update_state.self_update.status.to_string()
- }
- },
- |r| {
- if update_state.self_update.status == SelfUpdateStatus::Updating {
- update_state.self_update.status.to_string()
- } else {
- format!("({} available)", r.tag_name)
- }
- },
- );
-
- let last_self_update_text = text(self_update_text).style(style::Text::Default);
-
- row![uad_version_text, self_update_btn, last_self_update_text,]
- .align_y(Alignment::Center)
- .spacing(10)
- .width(550)
- };
-
- let uad_list_row = row![uad_list_text, uad_lists_btn, last_update_text,]
- .align_y(Alignment::Center)
- .spacing(10)
- .width(550);
-
- /*
- There's no need to fetch this info every time the view is updated,
- we could cache it in a `static` `LazyLock`.
-
- But what if the system updates ADB while the app is running?
- the numbers will be out of sync!
-
- However, the server will still be the "old" version
- until it's killed
- */
- let adb_version_text = text(match adb::ACommand::new().version() {
- Ok(s) => s
- .lines()
- .nth(0)
- .unwrap_or_else(|| unreachable!())
- // This allocation is good.
- // If it was a ref, the app would hold the entire string
- // instead of the relevant slice.
- .to_string(),
- Err(e) => {
- error!("{e}");
- "Couldn't fetch ADB version. Is it installed?".into()
- // satisfy `match` by inferring the type of the `Ok` arm
- }
- })
- .width(250);
- let adb_version_row = row![adb_version_text].align_y(Alignment::Center).width(550);
-
- #[cfg(feature = "self-update")]
- let update_column = column![uad_list_row, self_update_row, adb_version_row];
- #[cfg(not(feature = "self-update"))]
- let update_column = column![uad_list_row, adb_version_row];
-
- let update_column = update_column.align_x(Alignment::Center).spacing(10);
-
- let update_container = container(update_column)
- .width(Length::Fill)
- .center_x(Length::Fill)
- .padding(10)
- .style(style::Container::Frame);
-
- let website_btn =
- button_primary("GitHub page").on_press(Message::UrlPressed(PathBuf::from(
- "https://github.com/Universal-Debloater-Alliance/universal-android-debloater",
- )));
-
- let issue_btn = button_primary("Have an issue?")
- .on_press(Message::UrlPressed(PathBuf::from(
- "https://github.com/Universal-Debloater-Alliance/universal-android-debloater/issues",
- )));
-
- let log_btn = button_primary("Locate the logfiles")
- .on_press(Message::UrlPressed(CACHE_DIR.to_path_buf()));
-
- let wiki_btn = button_primary("Wiki").on_press(Message::UrlPressed(PathBuf::from(
- "https://github.com/Universal-Debloater-Alliance/universal-android-debloater/wiki",
- )));
-
- let row = row![website_btn, wiki_btn, issue_btn, log_btn,].spacing(20);
-
- let content = column![
- Space::new().width(Length::Fill).height(Length::Shrink),
- descr_container,
- update_container,
- row,
- ]
- .width(Length::Fill)
- .spacing(20)
- .align_x(Alignment::Center);
-
- container(content)
- .width(Length::Fill)
- .height(Length::Fill)
- .padding(10)
- .into()
- }
-}
diff --git a/crates/uad-gui/src/views/list.rs b/crates/uad-gui/src/views/list.rs
deleted file mode 100644
index a9792dd..0000000
--- a/crates/uad-gui/src/views/list.rs
+++ /dev/null
@@ -1,1597 +0,0 @@
-use crate::helpers::button_primary;
-use crate::style;
-use crate::theme::Theme;
-use crate::widgets::navigation_menu::ICONS;
-use log::{error, info, warn};
-use std::path::PathBuf;
-use uad_core::config::DeviceSettings;
-use uad_core::sync::{AdbError, Phone, User, apply_pkg_state_commands};
-use uad_core::uad_lists::{
- Opposite, PackageHashMap, PackageState, Removal, UadList, UadListState, load_debloat_lists,
-};
-use uad_core::utils::{
- EXPORT_FILE_NAME, NAME, export_selection, fetch_packages, matches_search, open_url,
-};
-
-use crate::views::settings::Settings;
-use crate::widgets::modal::Modal;
-use crate::widgets::package_row::{Message as RowMessage, PackageRow};
-use crate::widgets::text;
-use iced::widget::scrollable::{Direction, Scrollbar};
-use iced::widget::{
- Column, Space, button, checkbox, column, container, pick_list, radio, row, rule, scrollable,
- text_editor, text_input, tooltip,
-};
-use iced::{Alignment, Element, Length, Renderer, Task, alignment};
-
-#[derive(Debug, Default, Clone)]
-pub struct PackageInfo {
- pub i_user: usize,
- pub index: usize,
- pub removal: String,
- pub before_cross_user_states: Vec<(u16, PackageState)>,
-}
-
-#[derive(Default, Debug, Clone)]
-pub enum LoadingState {
- DownloadingList,
- #[default]
- FindingPhones,
- LoadingPackages,
- _UpdatingUad,
- Ready,
- RestoringDevice(String),
- FailedToUpdate,
-}
-
-#[derive(Default, Debug)]
-#[allow(clippy::struct_excessive_bools, reason = "Not a state-machine")]
-pub struct List {
- pub loading_state: LoadingState,
- pub uad_lists: PackageHashMap,
- /// packages of all users of the phone
- pub phone_packages: Vec>,
- /// `phone_packages` indexes of the selected user (= what you see on screen)
- filtered_packages: Vec,
- /// Vec of `(user_index, pkg_index)`
- selected_packages: Vec<(usize, usize)>,
- selected_removal: Option,
- selected_package_state: Option,
- selected_list: Option,
- pub selected_user: Option,
- all_selected: bool,
- pub input_value: String,
- description: String,
- description_content: text_editor::Content,
- selection_modal: bool,
- error_modal: Option,
- export_modal: bool,
- current_package_index: usize,
- is_adb_satisfied: bool,
- copy_confirmation: bool,
- fallback_notifications: Vec,
-}
-
-#[derive(Debug, Clone)]
-pub enum Message {
- LoadUadList(bool),
- LoadPhonePackages((PackageHashMap, UadListState)),
- RestoringDevice(Result),
- ApplyFilters(Vec>),
- DismissFallbackNotifications,
- VerifyAndFallbackFinished(VerifyAndFallbackResult),
- SearchInputChanged(String),
- ToggleAllSelected(bool),
- ListSelected(UadList),
- UserSelected(User),
- RemovalSelected(Removal),
- PackageStateSelected(PackageState),
- ApplyActionOnSelection,
- List(usize, RowMessage),
- VerifyAndFallback(Result),
- Nothing,
- ModalHide,
- ModalUserSelected(User),
- ModalValidate,
- ClearSelectedPackages,
- ADBSatisfied(bool),
- UpdateFailed,
- GoToUrl(PathBuf),
- ExportSelection,
- SelectionExported(Result),
- DescriptionEdit(text_editor::Action),
- CopyError(String),
- HideCopyConfirmation,
-}
-
-pub struct SummaryEntry {
- category: Removal,
- discard: u8,
- restore: u8,
-}
-
-#[derive(Debug, Clone)]
-pub struct VerifyAndFallbackResult {
- pub i_user: usize,
- pub index: usize,
- pub new_state: PackageState,
- pub notification: Option,
- pub error_modal: Option,
-}
-
-impl From for SummaryEntry {
- fn from(category: Removal) -> Self {
- Self {
- category,
- discard: 0,
- restore: 0,
- }
- }
-}
-
-impl List {
- pub fn update(
- &mut self,
- settings: &mut Settings,
- selected_device: &mut Phone,
- list_update_state: &mut UadListState,
- message: Message,
- ) -> Task {
- match message {
- Message::ModalHide => self.on_modal_hide(),
- Message::ModalValidate => self.on_modal_validate(settings, selected_device),
- Message::RestoringDevice(output) => self.on_restoring_device(output),
- Message::LoadUadList(remote) => self.on_load_uad_list(remote, selected_device),
- Message::LoadPhonePackages(payload) => {
- self.on_load_phone_packages(payload, selected_device, list_update_state)
- }
- Message::ApplyFilters(packages) => self.on_apply_filters(packages),
- Message::DismissFallbackNotifications => self.on_dismiss_fallback_notifications(),
- Message::ToggleAllSelected(selected) => {
- self.on_toggle_all_selected(selected, settings, selected_device, list_update_state)
- }
- Message::SearchInputChanged(letter) => self.on_search_input_changed(letter),
- Message::ListSelected(list) => self.on_list_selected(list),
- Message::RemovalSelected(removal) => self.on_removal_selected(removal),
- Message::PackageStateSelected(state) => self.on_package_state_selected(state),
- Message::List(i, row_msg) => self.on_list_row(i, &row_msg, settings, selected_device),
- Message::ApplyActionOnSelection => self.on_apply_action_on_selection(),
- Message::UserSelected(user) => self.on_user_selected(user),
- Message::VerifyAndFallback(res) => {
- self.on_verify_and_fallback(res, settings, selected_device)
- }
- Message::VerifyAndFallbackFinished(result) => {
- self.on_verify_and_fallback_finished(result)
- }
- Message::ModalUserSelected(user) => {
- self.on_modal_user_selected(user, settings, selected_device, list_update_state)
- }
- Message::ClearSelectedPackages => self.on_clear_selected_packages(),
- Message::ADBSatisfied(result) => self.on_adb_satisfied(result),
- Message::UpdateFailed => self.on_update_failed(),
- Message::GoToUrl(url) => Self::on_go_to_url(url),
- Message::ExportSelection => self.on_export_selection(),
- Message::SelectionExported(res) => self.on_selection_exported(res),
- Message::Nothing => Task::none(),
- Message::DescriptionEdit(action) => self.on_description_edit(action),
- Message::CopyError(err) => self.on_copy_error(err),
- Message::HideCopyConfirmation => self.on_hide_copy_confirmation(),
- }
- }
-
- // Handle verification completion on the UI thread after async work
- fn on_verify_and_fallback_finished(
- &mut self,
- result: VerifyAndFallbackResult,
- ) -> Task {
- let package = &mut self.phone_packages[result.i_user][result.index];
- if let Some(notification) = result.notification {
- self.fallback_notifications.push(notification);
- }
- if let Some(err) = result.error_modal {
- self.error_modal = Some(err);
- }
- package.state = result.new_state;
- package.selected = false;
- self.selected_packages
- .retain(|&x| x.1 != result.index && x.0 != result.i_user);
- Self::filter_package_lists(self);
- Task::none()
- }
-
- /// Builds the main view for the app list interface
- pub fn view(
- &self,
- settings: &Settings,
- selected_device: &Phone,
- ) -> Element<'_, Message, Theme, Renderer> {
- match &self.loading_state {
- LoadingState::DownloadingList => waiting_view(
- &format!("Downloading latest {NAME} lists from GitHub. Please wait..."),
- Some(button("No internet?").on_press(Message::LoadUadList(false))),
- style::Text::Default,
- ),
- LoadingState::FindingPhones => {
- if self.is_adb_satisfied {
- waiting_view("Finding connected devices...", None, style::Text::Default)
- } else {
- waiting_view(
- "ADB is not installed on your system, install ADB and relaunch application.",
- Some(button("Read on how to get started.")
- .on_press(Message::GoToUrl(PathBuf::from(
- "https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/wiki/Getting-started",
- )))),
- style::Text::Danger,
- )
- }
- }
- LoadingState::LoadingPackages => waiting_view(
- "Pulling packages from the device. Please wait...",
- None,
- style::Text::Default,
- ),
- LoadingState::_UpdatingUad => waiting_view(
- &format!("Updating {NAME}. Please wait..."),
- None,
- style::Text::Default,
- ),
- LoadingState::RestoringDevice(device) => waiting_view(
- &format!("Restoring device: {device}"),
- None,
- style::Text::Default,
- ),
- LoadingState::Ready => self.ready_view(settings, selected_device),
- LoadingState::FailedToUpdate => waiting_view(
- "Failed to download update",
- Some(button("Go back").on_press(Message::LoadUadList(false))),
- style::Text::Danger,
- ),
- }
- }
-
- fn control_panel(&self, selected_device: &Phone) -> Element<'_, Message, Theme, Renderer> {
- let search_packages = text_input("Search packages...", &self.input_value)
- .width(Length::Fill)
- .on_input(Message::SearchInputChanged)
- .padding([5, 10]);
-
- let select_all_checkbox = checkbox(self.all_selected)
- .on_toggle(Message::ToggleAllSelected)
- .size(20)
- .style(style::CheckBox::SettingsEnabled)
- .spacing(0); // no label, so remove space entirely
-
- let col_sel_all = row![
- tooltip(
- select_all_checkbox,
- if self.all_selected {
- "Deselect all"
- } else {
- "Select all"
- },
- tooltip::Position::Top,
- )
- .style(style::Container::Tooltip)
- .gap(4)
- ]
- .padding(8);
-
- let user_picklist = pick_list(
- selected_device.user_list.clone(),
- self.selected_user,
- Message::UserSelected,
- )
- .width(85);
-
- let list_picklist =
- pick_list(UadList::ALL, self.selected_list, Message::ListSelected).width(96);
-
- let package_state_picklist = pick_list(
- PackageState::ALL,
- self.selected_package_state,
- Message::PackageStateSelected,
- )
- .width(120);
-
- let removal_picklist = pick_list(
- Removal::ALL,
- self.selected_removal,
- Message::RemovalSelected,
- )
- .width(150);
-
- row![
- col_sel_all,
- search_packages,
- user_picklist,
- removal_picklist,
- package_state_picklist,
- list_picklist,
- ]
- .width(Length::Fill)
- .align_y(Alignment::Center)
- .spacing(6)
- .padding(iced::Padding {
- top: 0.0,
- right: 16.0,
- bottom: 0.0,
- left: 0.0,
- })
- .into()
- }
-
- #[allow(
- clippy::too_many_lines,
- reason = "Complex layout; further refactor later"
- )]
- fn ready_view(
- &self,
- settings: &Settings,
- selected_device: &Phone,
- ) -> Element<'_, Message, Theme, Renderer> {
- let packages = self
- .filtered_packages
- .iter()
- .fold(column![].spacing(6), |col, &i| {
- col.push(
- self.phone_packages[self.selected_user.unwrap_or_default().index][i]
- .view(settings, selected_device)
- .map(move |msg| Message::List(i, msg)),
- )
- });
-
- let packages_scrollable = scrollable(packages)
- .height(Length::FillPortion(6))
- .style(style::Scrollable::Packages);
-
- let description_scroll =
- scrollable(text_editor(&self.description_content).on_action(Message::DescriptionEdit))
- .style(style::Scrollable::Description);
-
- let description_panel = container(description_scroll)
- .padding(6)
- .height(Length::FillPortion(2))
- .width(Length::Fill)
- .style(style::Container::Frame);
-
- let review_selection = {
- let tmp_widget = text(format!(
- "Review selection ({})",
- self.selected_packages.len()
- ));
- if self.selected_packages.is_empty() {
- button(tmp_widget).padding([5, 10])
- } else {
- button_primary(tmp_widget).on_press(Message::ApplyActionOnSelection)
- }
- };
-
- let mut export_selection = button(text(format!(
- "Export current selection ({})",
- self.selected_packages.len()
- )))
- .padding([5, 10]);
- if !self.selected_packages.is_empty() {
- export_selection = export_selection
- .on_press(Message::ExportSelection)
- .style(style::Button::Primary);
- }
- // lock
- let export_selection = export_selection;
-
- let action_row = row![
- export_selection,
- Space::new().width(Length::Fill).height(Length::Shrink),
- review_selection
- ]
- .width(Length::Fill)
- .spacing(10)
- .align_y(Alignment::Center);
-
- let unavailable = container(
- column![
- text("ADB is not authorized to access this user!").size(20)
- .style(style::Text::Danger),
- text("The most likely reason is that it is the user of your work profile (also called Secure Folder on Samsung devices). There's really no solution, other than completely disabling your work profile in your device settings.")
- .style(style::Text::Commentary)
- .align_x(alignment::Horizontal::Center),
- ]
- .spacing(6)
- .align_x(Alignment::Center)
- )
- .padding(10)
- .center_x(Length::Shrink)
- .style(style::Container::BorderedFrame);
-
- let control_panel = self.control_panel(selected_device);
-
- // Fallback notifications area
- let notifications_area: Element<'_, Message, Theme, Renderer> =
- if self.fallback_notifications.is_empty() {
- Space::new().into()
- } else {
- let notification_texts: Vec<_> = self
- .fallback_notifications
- .iter()
- .map(|msg| text(msg).style(style::Text::Commentary).into())
- .collect();
-
- container(
- column![
- text("Fallback Actions Performed:").style(style::Text::Default),
- column(notification_texts).spacing(4),
- row![
- Space::new().width(Length::Fill).height(Length::Shrink),
- button(text("Dismiss"))
- .on_press(Message::DismissFallbackNotifications)
- .style(style::Button::Primary)
- .padding([4, 10]),
- ]
- ]
- .spacing(6),
- )
- .padding(8)
- .style(style::Container::BorderedFrame)
- .into()
- };
-
- let content = if selected_device.user_list.is_empty()
- || match self.selected_user {
- Some(u) => !self.phone_packages[u.index].is_empty(),
- // If no user has been selected,
- // then it could be considered as "equivalent"
- // to the case where the `user_list` is empty?
- // However, this is inconsistent,
- // because other parts of the code simply use a `default` `User`.
- None => true,
- } {
- column![
- control_panel,
- notifications_area,
- packages_scrollable,
- description_panel,
- action_row,
- ]
- } else {
- column![
- control_panel,
- notifications_area,
- container(unavailable)
- .height(Length::Fill)
- .center_y(Length::Fill),
- ]
- }
- .width(Length::Fill)
- .spacing(10)
- .align_x(Alignment::Center);
-
- if self.selection_modal {
- return Modal::new(
- content.padding(10),
- self.apply_selection_modal(
- selected_device,
- settings,
- &self.phone_packages[self.selected_user.unwrap_or_default().index],
- ),
- )
- .on_blur(Message::ModalHide)
- .into();
- }
-
- if self.export_modal {
- let title = container(row![text("Success").size(24)].align_y(Alignment::Center))
- .width(Length::Fill)
- .style(style::Container::Frame)
- .padding([10, 0])
- .center_y(Length::Shrink)
- .center_x(Length::Shrink);
-
- let text_box = row![
- text(format!("Exported current selection into file.\nFile is exported in same directory where {NAME} is located.")).width(Length::Fill),
- ].padding(20);
-
- let file_row = row![text(EXPORT_FILE_NAME).style(style::Text::Commentary)].padding(20);
-
- let modal_btn_row = row![
- Space::new().width(Length::Fill).height(Length::Shrink),
- button(text("Close").width(Length::Shrink))
- .width(Length::Shrink)
- .on_press(Message::ModalHide),
- Space::new().width(Length::Fill).height(Length::Shrink),
- ];
-
- let ctn = container(column![title, text_box, file_row, modal_btn_row])
- .height(Length::Shrink)
- .width(500)
- .padding(10)
- .style(style::Container::Frame);
-
- return Modal::new(content.padding(10), ctn)
- .on_blur(Message::ModalHide)
- .into();
- }
-
- if let Some(err) = &self.error_modal {
- error_view(err, content, self.copy_confirmation).into()
- } else {
- container(content).height(Length::Fill).padding(10).into()
- }
- }
-
- #[allow(
- clippy::too_many_lines,
- reason = "Modal construction is verbose by nature"
- )]
- fn apply_selection_modal(
- &self,
- device: &Phone,
- settings: &Settings,
- packages: &[PackageRow],
- ) -> Element<'_, Message, Theme, Renderer> {
- const PACK_NO_USER_MSG: &str = "`selected_packages` implies a user must be selected";
-
- // 5 element slice is cheap
- let mut summaries = Removal::CATEGORIES.map(SummaryEntry::from);
- for p in packages.iter().filter(|p| p.selected) {
- let summary = &mut summaries[p.removal as usize];
- match p.state {
- PackageState::Uninstalled | PackageState::Disabled => summary.restore += 1,
- _ => summary.discard += 1,
- }
- }
-
- let radio_btn_users = device.user_list.iter().filter(|&u| !u.protected).fold(
- row![].spacing(10),
- |row, &user| {
- row.push(
- radio(
- format!("{}", user.clone()),
- user,
- self.selected_user,
- Message::ModalUserSelected,
- )
- .size(24),
- )
- },
- );
-
- let title_ctn =
- container(row![text("Review your selection").size(24)].align_y(Alignment::Center))
- .width(Length::Fill)
- .style(style::Container::Frame)
- .padding([10, 0])
- .center_y(Length::Shrink)
- .center_x(Length::Fill);
-
- let users_ctn = container(radio_btn_users)
- .padding(10)
- .center_x(Length::Shrink)
- .style(style::Container::Frame);
-
- let explaination_ctn = container(
- row![
- text("The action for the selected user will be applied to all other users")
- .style(style::Text::Danger),
- tooltip(
- text("\u{EA0C}")
- .font(ICONS)
- .width(22)
- .align_x(alignment::Horizontal::Center)
- .style(style::Text::Commentary),
- "Let's say you choose user 0. If a selected package on user 0\n\
- is set to be uninstalled and if this same package is disabled on user 10,\n\
- then the package on both users will be uninstalled.",
- tooltip::Position::Top,
- )
- .gap(20)
- .padding(10)
- .style(style::Container::Tooltip)
- ]
- .spacing(10),
- )
- .center_x(Length::Shrink)
- .padding(10)
- .style(style::Container::BorderedFrame);
-
- let modal_btn_row = row![
- button(text("Cancel")).on_press(Message::ModalHide),
- Space::new().width(Length::Fill),
- button(text("Apply")).on_press(Message::ModalValidate),
- ]
- .padding(iced::Padding {
- top: 0.0,
- right: 15.0,
- bottom: 10.0,
- left: 10.0,
- });
-
- let recap_view = summaries
- .iter()
- .fold(column![].spacing(6).width(Length::Fill), |col, r| {
- col.push(recap(settings, r))
- });
-
- let selected_pkgs_ctn = container(
- container(
- scrollable(
- container(
- if self
- .selected_packages
- .iter()
- .any(|s| s.0 == self.selected_user.expect(PACK_NO_USER_MSG).index)
- {
- self.selected_packages
- .iter()
- .filter(|s| {
- s.0 == self.selected_user.expect(PACK_NO_USER_MSG).index
- })
- .fold(
- column![].spacing(6).width(Length::Shrink),
- |col, selection| {
- col.push(
- row![
- row![text(
- self.phone_packages[selection.0][selection.1]
- .removal
- .to_string()
- )]
- .width(120),
- row![text(
- self.phone_packages[selection.0][selection.1]
- .list
- .to_string()
- )]
- .width(55),
- row![text(
- self.phone_packages[selection.0][selection.1]
- .name
- .clone()
- ),]
- .width(540),
- row![match self.phone_packages[selection.0]
- [selection.1]
- .state
- {
- PackageState::Enabled =>
- if settings.device.disable_mode {
- text("Disable")
- .style(style::Text::Danger)
- } else {
- text("Uninstall")
- .style(style::Text::Danger)
- },
- PackageState::Disabled =>
- text("Enable").style(style::Text::Ok),
- PackageState::Uninstalled =>
- text("Restore").style(style::Text::Ok),
- PackageState::All => text("Impossible")
- .style(style::Text::Danger),
- },]
- .width(70),
- ]
- .width(Length::Shrink)
- .spacing(20),
- )
- },
- )
- } else {
- column![text("No packages selected for this user")]
- .align_x(Alignment::Center)
- .width(Length::Fill)
- },
- )
- .padding(10)
- .width(Length::Shrink)
- .style(style::Container::Invisible),
- )
- .direction(Direction::Both {
- vertical: Scrollbar::default(),
- horizontal: Scrollbar::default(),
- })
- .style(style::Scrollable::Description),
- )
- .width(Length::Fill)
- .style(style::Container::Frame),
- )
- .width(Length::Fill)
- .max_height(150)
- .padding([0, 10]);
-
- container(
- if device.user_list.iter().filter(|&u| !u.protected).count() > 1
- && settings.device.multi_user_mode
- {
- column![
- title_ctn,
- users_ctn,
- row![explaination_ctn].padding([0, 10]),
- container(recap_view).padding(10),
- selected_pkgs_ctn,
- modal_btn_row,
- ]
- .spacing(10)
- .align_x(Alignment::Center)
- } else if !settings.device.multi_user_mode {
- column![
- title_ctn,
- users_ctn,
- container(recap_view).padding(10),
- selected_pkgs_ctn,
- modal_btn_row,
- ]
- .spacing(10)
- .align_x(Alignment::Center)
- } else {
- column![
- title_ctn,
- container(recap_view).padding(10),
- selected_pkgs_ctn,
- modal_btn_row,
- ]
- .spacing(10)
- .align_x(Alignment::Center)
- },
- )
- .width(900)
- .height(Length::Shrink)
- .max_height(700)
- .style(style::Container::Background)
- .into()
- }
-
- fn filter_package_lists(&mut self) {
- let list_filter: UadList = self.selected_list.expect("UAD-list type must be selected");
- let package_filter: PackageState = self
- .selected_package_state
- .expect("pack-state must be selected");
- let removal_filter: Removal = self
- .selected_removal
- .expect("removal recommendation must be selected");
-
- self.filtered_packages = self.phone_packages
- [self.selected_user.expect("User must be selected").index]
- .iter()
- // we must filter the indices associated with pack-rows,
- // that's why `enumerate` is before `filter`.
- .enumerate()
- .filter(|(_, p)| {
- (list_filter == UadList::All || p.list == list_filter)
- && (package_filter == PackageState::All || p.state == package_filter)
- && (removal_filter == Removal::All || p.removal == removal_filter)
- && (self.input_value.is_empty()
- || matches_search(&p.name, &self.input_value, Some(&p.description)))
- })
- .map(|(i, _)| i)
- .collect();
- }
-
- #[expect(clippy::unused_async, reason = "1 call-site")]
- async fn load_packages>(
- uad_list: PackageHashMap,
- device_serial: S,
- user_list: Vec,
- ) -> Vec> {
- let serial = device_serial.as_ref();
- if user_list.len() <= 1 {
- vec![
- fetch_packages(&uad_list, serial, None)
- .into_iter()
- .map(PackageRow::from)
- .collect(),
- ]
- } else {
- user_list
- .iter()
- .map(|user| {
- fetch_packages(&uad_list, serial, Some(user.id))
- .into_iter()
- .map(PackageRow::from)
- .collect()
- })
- .collect()
- }
- }
-
- #[expect(clippy::unused_async, reason = "1 call-site")]
- async fn init_apps_view(remote: bool, phone: Phone) -> (PackageHashMap, UadListState) {
- let uad_lists = load_debloat_lists(remote);
- match uad_lists {
- Ok(list) => {
- if phone.adb_id.is_empty() {
- warn!("AppsView ready but no phone found");
- }
- (list, UadListState::Done)
- }
- Err(local_list) => {
- error!(
- "Error loading remote debloat list for the phone. Fallback to embedded (and outdated) list"
- );
- (local_list, UadListState::Failed)
- }
- }
- }
-
- // === Split handlers to keep update short ===
- fn on_modal_hide(&mut self) -> Task {
- self.selection_modal = false;
- self.error_modal = None;
- self.export_modal = false;
- Task::none()
- }
-
- fn on_modal_validate(
- &mut self,
- settings: &Settings,
- selected_device: &mut Phone,
- ) -> Task {
- self.fallback_notifications.clear();
- let mut commands = vec![];
- self.selected_packages.sort_unstable();
- self.selected_packages.dedup();
- for selection in &self.selected_packages {
- commands.append(&mut build_action_pkg_commands(
- &self.phone_packages,
- selected_device,
- &settings.device,
- *selection,
- ));
- }
- self.selection_modal = false;
- Task::batch(commands)
- }
-
- fn on_restoring_device(&mut self, output: Result) -> Task {
- let i_user = self.selected_user.unwrap_or_default().index;
- if let Ok(p) = output {
- self.loading_state =
- LoadingState::RestoringDevice(self.phone_packages[i_user][p.index].name.clone());
- } else {
- self.loading_state = LoadingState::RestoringDevice("Error [TODO]".to_string());
- }
- Task::none()
- }
-
- fn on_load_uad_list(&mut self, remote: bool, selected_device: &Phone) -> Task {
- info!("{:-^65}", "-");
- info!(
- "ANDROID_SDK: {} | DEVICE: {}",
- selected_device.android_sdk, selected_device.model
- );
- info!("{:-^65}", "-");
- self.loading_state = LoadingState::DownloadingList;
- Task::perform(
- Self::init_apps_view(remote, selected_device.clone()),
- Message::LoadPhonePackages,
- )
- }
-
- fn on_load_phone_packages(
- &mut self,
- payload: (PackageHashMap, UadListState),
- selected_device: &Phone,
- list_update_state: &mut UadListState,
- ) -> Task {
- let (uad_list, list_state) = payload;
- self.loading_state = LoadingState::LoadingPackages;
- self.uad_lists.clone_from(&uad_list);
- *list_update_state = list_state;
- Task::perform(
- Self::load_packages(
- uad_list,
- selected_device.adb_id.clone(),
- selected_device.user_list.clone(),
- ),
- Message::ApplyFilters,
- )
- }
-
- fn on_apply_filters(&mut self, packages: Vec>) -> Task {
- let i_user = self.selected_user.unwrap_or_default().index;
- self.phone_packages = packages;
- self.filtered_packages = (0..self.phone_packages[i_user].len()).collect();
- self.selected_removal = Some(Removal::Recommended);
- self.selected_package_state = Some(PackageState::Enabled);
- self.selected_list = Some(UadList::All);
- self.selected_user = Some(User::default());
- self.fallback_notifications.clear();
- Self::filter_package_lists(self);
- self.loading_state = LoadingState::Ready;
- Task::none()
- }
-
- fn on_toggle_all_selected(
- &mut self,
- selected: bool,
- settings: &mut Settings,
- selected_device: &mut Phone,
- list_update_state: &mut UadListState,
- ) -> Task {
- let i_user = self.selected_user.unwrap_or_default().index;
- for i in self.filtered_packages.clone() {
- if self.phone_packages[i_user][i].selected != selected {
- #[expect(unused_must_use, reason = "side-effect")]
- self.update(
- settings,
- selected_device,
- list_update_state,
- Message::List(i, RowMessage::ToggleSelection(selected)),
- );
- }
- }
- self.all_selected = selected;
- Task::none()
- }
-
- fn on_search_input_changed(&mut self, letter: String) -> Task {
- self.input_value = letter;
- Self::filter_package_lists(self);
- Task::none()
- }
-
- fn on_list_selected(&mut self, list: UadList) -> Task {
- self.selected_list = Some(list);
- Self::filter_package_lists(self);
- Task::none()
- }
-
- fn on_package_state_selected(&mut self, package_state: PackageState) -> Task {
- self.selected_package_state = Some(package_state);
- Self::filter_package_lists(self);
- Task::none()
- }
-
- fn on_removal_selected(&mut self, removal: Removal) -> Task {
- self.selected_removal = Some(removal);
- Self::filter_package_lists(self);
- Task::none()
- }
-
- fn on_list_row(
- &mut self,
- i_package: usize,
- row_message: &RowMessage,
- settings: &Settings,
- selected_device: &mut Phone,
- ) -> Task {
- let i_user = self.selected_user.unwrap_or_default().index;
- #[expect(unused_must_use, reason = "side-effect")]
- {
- self.phone_packages[i_user][i_package]
- .update(row_message)
- .map(move |row_message| Message::List(i_package, row_message));
- }
-
- let package = &mut self.phone_packages[i_user][i_package];
-
- match *row_message {
- RowMessage::ToggleSelection(toggle) => {
- if package.removal == Removal::Unsafe && !settings.general.expert_mode {
- package.selected = false;
- return Task::none();
- }
-
- if settings.device.multi_user_mode {
- for u in selected_device.user_list.iter().filter(|&u| !u.protected) {
- if let Some(pkg) = self
- .phone_packages
- .get_mut(u.index)
- .and_then(|pkgs| pkgs.get_mut(i_package))
- {
- pkg.selected = toggle;
- if toggle && !self.selected_packages.contains(&(u.index, i_package)) {
- self.selected_packages.push((u.index, i_package));
- }
- }
- }
- if !toggle {
- self.selected_packages.retain(|&x| x.1 != i_package);
- }
- } else {
- package.selected = toggle;
- if toggle {
- if !self.selected_packages.contains(&(i_user, i_package)) {
- self.selected_packages.push((i_user, i_package));
- }
- } else {
- self.selected_packages
- .retain(|&x| x.1 != i_package || x.0 != i_user);
- }
- }
- Task::none()
- }
- RowMessage::ActionPressed => {
- self.fallback_notifications.clear();
- self.phone_packages[i_user][i_package].selected = true;
- Task::batch(build_action_pkg_commands(
- &self.phone_packages,
- selected_device,
- &settings.device,
- (i_user, i_package),
- ))
- }
- RowMessage::PackagePressed => {
- self.description = package.clone().description;
- self.description_content = text_editor::Content::with_text(&package.description);
- package.current = true;
- if self.current_package_index != i_package {
- self.phone_packages[i_user][self.current_package_index].current = false;
- }
- self.current_package_index = i_package;
- Task::none()
- }
- }
- }
-
- fn on_apply_action_on_selection(&mut self) -> Task {
- self.selection_modal = true;
- Task::none()
- }
-
- fn on_user_selected(&mut self, user: User) -> Task {
- self.selected_user = Some(user);
- self.fallback_notifications.clear();
- self.filtered_packages = (0..self.phone_packages[user.index].len()).collect();
- Self::filter_package_lists(self);
- Task::none()
- }
-
- #[allow(
- clippy::too_many_lines,
- reason = "Complex verification and fallback logic"
- )]
- //this functions matches the adb command to two types, when it is a soft issue and when it is a hard issue
- // soft issue: utilizes core::sync::attempt_fallback in the case the state that wanted to be changed wasn't in fact changed
- // hard issue: does basically nothing in most cases FIXME, besides handling enabling packages.
- // also this really should be refactored, these are gigantic code blocks
- fn on_verify_and_fallback(
- &mut self,
- res: Result,
- settings: &Settings,
- selected_device: &Phone,
- ) -> Task {
- match res {
- Ok(p) => {
- // Snapshot minimal info to move into background task
- let i_user = p.i_user;
- let index = p.index;
- let pkg_name = self.phone_packages[i_user][index].name.clone();
- let current_state = self.phone_packages[i_user][index].state;
- let wanted_state = current_state.opposite(settings.device.disable_mode);
- let before_cross_user_states = p.before_cross_user_states.clone();
- let device = selected_device.clone();
- let user_id = device.user_list[i_user].id;
-
- // Offload verification + potential fallback to background
- Task::perform(
- async move {
- // Blocking ADB calls happen here (off UI thread)
- let actual_state_opt = uad_core::sync::verify_package_state(
- &pkg_name,
- device.adb_id.as_str(),
- Some(user_id),
- );
-
- match actual_state_opt {
- Some(actual_state) if actual_state == wanted_state => {
- // Check cross-user behavior
- let error_modal = uad_core::sync::detect_cross_user_behavior(
- &pkg_name,
- device.adb_id.as_str(),
- user_id,
- wanted_state,
- actual_state,
- &device,
- &before_cross_user_states,
- )
- .map(|notification| {
- format!(
- "Cross-User Behavior Detected:\n\n{notification}\n\n\
- This is unusual behavior that may be specific to your device manufacturer (OEM). \
- The package state has been successfully changed on the target user."
- )
- });
-
- VerifyAndFallbackResult {
- i_user,
- index,
- new_state: wanted_state,
- notification: None,
- error_modal,
- }
- }
- actual_state_opt => {
- // Package doesn't exist (None) or has wrong state - try fallback
- let actual_state =
- actual_state_opt.unwrap_or(PackageState::Uninstalled);
- // Create CorePackage for fallback
- let core_package = uad_core::sync::CorePackage {
- name: pkg_name.clone(),
- description: String::new(),
- removal: Removal::All,
- state: current_state,
- list: UadList::Unlisted,
- };
- let fallback_result = uad_core::sync::attempt_fallback(
- &core_package,
- wanted_state,
- actual_state,
- device.user_list[i_user],
- &device,
- );
-
- let state_description = match actual_state_opt {
- Some(PackageState::Uninstalled) => "remains uninstalled",
- Some(PackageState::Disabled) => "was disabled",
- Some(PackageState::Enabled) => "was enabled",
- Some(PackageState::All) => {
- "unexpected state (error determining state)"
- }
- None => "does not exist on device",
- };
-
- let (notification, new_state) = match fallback_result {
- Ok(fallback_action) => (
- Some(format!(
- "Package '{pkg_name}' was {} but {} instead. Fallback: {fallback_action}",
- match wanted_state {
- PackageState::Uninstalled => "uninstalled",
- PackageState::Disabled => "disabled",
- PackageState::Enabled => "enabled",
- PackageState::All => "modified",
- },
- state_description
- )),
- actual_state,
- ),
- Err(err) => (
- Some(format!(
- "Package '{pkg_name}' verification failed: {err}"
- )),
- current_state, // no change if fallback failed
- ),
- };
-
- VerifyAndFallbackResult {
- i_user,
- index,
- new_state,
- notification,
- error_modal: None,
- }
- }
- }
- },
- Message::VerifyAndFallbackFinished,
- )
- }
-
- //this is an example of how errors should be done, this is hard to implement however.
- // Err(AdbError::SecurityException(err)) => {
-
- // }
- //FIXME: this has to be changed as soon as possible, generic errors are bad practice
- // keep in mind most solutions to hard errors like this are going to be hacky
- // and weird.
- Err(AdbError::Generic(err)) => {
- // this is such a hacky solution
- if err.contains("Shell cannot change component state") {
- // look for the "pm enable --user " to get the command
- if let Some(start_index) = err.find("pm enable --user ") {
- // slice the string starting from the end of the prefix
- let remainder = &err[start_index + "pm enable --user ".len()..];
- // split by whitespace to get the arguments: [ID, PACKAGE, ...]
- let parts: Vec<&str> = remainder.split_whitespace().collect();
-
- if parts.len() >= 2 {
- let user_id_str = parts[0];
- let pkg_name_str = parts[1];
-
- let found_user = selected_device
- .user_list
- .iter()
- .enumerate()
- .find(|(_, u)| u.id.to_string() == user_id_str);
-
- if let Some((i_user, user_ref)) = found_user {
- // find the package index
- let found_pkg = self.phone_packages[i_user]
- .iter()
- .enumerate()
- .find(|(_, p)| p.name == pkg_name_str);
-
- if let Some((index, _)) = found_pkg {
- let user = *user_ref;
- let device = selected_device.clone();
- let pkg_name = pkg_name_str.to_string();
-
- // fallback task
- return Task::perform(
- async move {
- let temp_pkg = uad_core::sync::CorePackage {
- name: pkg_name.clone(),
- description: String::new(),
- removal: Removal::All,
- state: PackageState::Disabled,
- list: UadList::Unlisted,
- };
-
- // get uninstall command
- let uninstall_cmds =
- uad_core::sync::apply_pkg_state_commands(
- &temp_pkg,
- PackageState::Uninstalled,
- user,
- &device,
- );
-
- if let Some(cmd) = uninstall_cmds.first() {
- let _ = uad_core::sync::run_adb_shell_action(
- &device.adb_id,
- cmd,
- );
- }
-
- // reinstall/enable
- let temp_pkg_uninstalled =
- uad_core::sync::CorePackage {
- name: pkg_name.clone(),
- description: String::new(),
- removal: Removal::All,
- state: PackageState::Uninstalled,
- list: UadList::Unlisted,
- };
-
- let enable_cmds =
- uad_core::sync::apply_pkg_state_commands(
- &temp_pkg_uninstalled,
- PackageState::Enabled,
- user,
- &device,
- );
-
- // lets enable the new package
- if let Some(cmd) = enable_cmds.first() {
- let _ = uad_core::sync::run_adb_shell_action(
- &device.adb_id,
- cmd,
- );
- }
-
- //verifies the final state for thread confirmation
- let actual_state =
- uad_core::sync::verify_package_state(
- &pkg_name,
- &device.adb_id,
- Some(user.id),
- )
- .unwrap_or(PackageState::Uninstalled);
- VerifyAndFallbackResult {
- i_user,
- index,
- new_state: actual_state,
- notification: Some(format!(
- "Attempted recovery for {pkg_name}"
- )),
- error_modal: None,
- }
- },
- Message::VerifyAndFallbackFinished,
- );
- }
- }
- }
- }
- }
-
- // Fallthrough: default error handling if parsing failed or unrelated error
- self.error_modal = Some(err);
- Task::none()
- }
- }
- }
-
- fn on_modal_user_selected(
- &mut self,
- user: User,
- settings: &mut Settings,
- selected_device: &mut Phone,
- list_update_state: &mut UadListState,
- ) -> Task {
- self.selected_user = Some(user);
- self.update(
- settings,
- selected_device,
- list_update_state,
- Message::UserSelected(user),
- )
- }
-
- fn on_clear_selected_packages(&mut self) -> Task {
- self.selected_packages = Vec::new();
- Task::none()
- }
-
- fn on_adb_satisfied(&mut self, result: bool) -> Task {
- self.is_adb_satisfied = result;
- Task::none()
- }
-
- fn on_update_failed(&mut self) -> Task {
- self.loading_state = LoadingState::FailedToUpdate;
- Task::none()
- }
-
- fn on_go_to_url(url: PathBuf) -> Task {
- open_url(url);
- Task::none()
- }
-
- fn on_export_selection(&mut self) -> Task {
- let i_user = self.selected_user.unwrap_or_default().index;
- let package_names: Vec = self.phone_packages[i_user]
- .iter()
- .filter(|p| p.selected)
- .map(|p| p.name.clone())
- .collect();
- Task::perform(
- async move { export_selection(&package_names) },
- Message::SelectionExported,
- )
- }
-
- fn on_selection_exported(&mut self, export: Result) -> Task {
- match export {
- Ok(_) => self.export_modal = true,
- Err(err) => error!("Failed to export current selection: {err:?}"),
- }
- Task::none()
- }
-
- fn on_description_edit(&mut self, action: text_editor::Action) -> Task {
- match action {
- text_editor::Action::Scroll { lines: _ } | text_editor::Action::Edit(_) => {}
- _ => {
- self.description_content.perform(action);
- }
- }
- Task::none()
- }
-
- fn on_copy_error(&mut self, err: String) -> Task {
- self.copy_confirmation = true;
- Task::batch(vec![
- iced::clipboard::write::(err),
- Task::perform(
- // intentional delay
- async { std::thread::sleep(std::time::Duration::from_secs(1)) },
- |()| Message::HideCopyConfirmation,
- ),
- ])
- }
-
- fn on_hide_copy_confirmation(&mut self) -> Task {
- self.copy_confirmation = false;
- Task::none()
- }
-}
-
-impl List {
- fn on_dismiss_fallback_notifications(&mut self) -> Task {
- self.fallback_notifications.clear();
- Task::none()
- }
-}
-fn error_view<'a>(
- error: &'a str,
- content: Column<'a, Message, Theme, Renderer>,
- copy_confirmation: bool,
-) -> Modal<'a, Message, Theme, Renderer> {
- let title_ctn = container(
- row![text("Failed to perform ADB operation").size(24)].align_y(Alignment::Center),
- )
- .width(Length::Fill)
- .style(style::Container::Frame)
- .padding([10, 0])
- .center_y(Length::Shrink)
- .center_x(Length::Shrink);
-
- let modal_btn_row = row![
- button(
- text(if copy_confirmation {
- "Copied!"
- } else {
- "Copy error"
- })
- .width(Length::Fill)
- .align_x(alignment::Horizontal::Center),
- )
- .width(Length::Fill)
- .on_press_maybe(if copy_confirmation {
- None
- } else {
- Some(Message::CopyError(error.to_string()))
- })
- .style(style::Button::Primary),
- button(
- text("Close")
- .width(Length::Fill)
- .align_x(alignment::Horizontal::Center),
- )
- .width(Length::Fill)
- .on_press(Message::ModalHide)
- ]
- .padding(iced::Padding {
- top: 10.0,
- right: 0.0,
- bottom: 0.0,
- left: 0.0,
- });
-
- let text_box = scrollable(text(error).width(Length::Fill)).height(400);
-
- let ctn = container(column![title_ctn, text_box, modal_btn_row])
- .height(Length::Shrink)
- .max_height(700)
- .padding(10)
- .style(style::Container::Frame);
-
- Modal::new(content, ctn).on_blur(Message::ModalHide)
-}
-
-fn waiting_view<'a>(
- displayed_text: &(impl ToString + ?Sized),
- btn: Option>,
- text_style: impl Fn(&Theme) -> iced::widget::text::Style + 'a,
-) -> Element<'a, Message, Theme, Renderer> {
- let col = column![]
- .spacing(10)
- .align_x(Alignment::Center)
- .push(text(displayed_text.to_string()).style(text_style).size(20));
-
- let col = match btn {
- Some(btn) => col.push(btn.style(style::Button::Primary).padding([5, 10])),
- None => col,
- };
-
- container(col)
- .width(Length::Fill)
- .height(Length::Fill)
- .center_y(Length::Fill)
- .center_x(Length::Fill)
- .style(style::Container::Frame)
- .into()
-}
-
-fn build_action_pkg_commands(
- packages: &[Vec],
- device: &Phone,
- settings: &DeviceSettings,
- selection: (usize, usize),
-) -> Vec> {
- let pkg = &packages[selection.0][selection.1];
- let wanted_state = pkg.state.opposite(settings.disable_mode);
-
- let mut commands = vec![];
- for u in device.user_list.iter().filter(|&&u| {
- !u.protected
- && packages
- .get(u.index)
- .and_then(|user_pkgs| user_pkgs.get(selection.1))
- .is_some_and(|row_pkg| {
- // Only apply to users where package is explicitly selected
- // OR if multi_user_mode is enabled AND this is the initiating user
- row_pkg.selected || (settings.multi_user_mode && u.index == selection.0)
- })
- }) {
- let u_pkg = &packages[u.index][selection.1];
- let wanted_state = if settings.multi_user_mode {
- wanted_state
- } else {
- u_pkg.state.opposite(settings.disable_mode)
- };
-
- let actions = apply_pkg_state_commands(&u_pkg.into(), wanted_state, *u, device);
-
- for (j, action) in actions.into_iter().enumerate() {
- let p_info = PackageInfo {
- i_user: u.index,
- index: selection.1,
- removal: pkg.removal.to_string(),
- // Will be filled asynchronously before running the adb action
- before_cross_user_states: vec![],
- };
- // Clone data before async block to avoid borrowing issues
- let device_serial = device.adb_id.clone();
- let package_name = u_pkg.name.clone();
- let user_id = u.id;
- let phone = device.clone();
- // In the end there is only one package state change
- // even if we run multiple adb commands
- commands.push(Task::perform(
- async move {
- run_adb_action_with_before_states(
- &device_serial,
- &action,
- p_info,
- &package_name,
- user_id,
- &phone,
- )
- },
- if j == 0 {
- Message::VerifyAndFallback
- } else {
- |_| Message::Nothing
- },
- ));
- }
- }
- commands
-}
-
-fn run_adb_action_with_before_states(
- device_serial: &str,
- action: &str,
- mut p_info: PackageInfo,
- package_name: &str,
- target_user_id: u16,
- phone: &Phone,
-) -> Result {
- // Capture before-state in background to avoid blocking UI thread
- let before_states = uad_core::sync::capture_cross_user_states(
- package_name,
- device_serial,
- target_user_id,
- phone,
- );
- p_info.before_cross_user_states = before_states;
- // Run the ADB action
- uad_core::sync::run_adb_shell_action(device_serial, action)?;
- Ok(p_info)
-}
-
-fn recap<'a>(settings: &Settings, recap: &SummaryEntry) -> Element<'a, Message, Theme, Renderer> {
- container(
- row![
- text(recap.category.to_string())
- .size(19)
- .width(Length::FillPortion(1)),
- rule::vertical(5),
- row![
- if settings.device.disable_mode {
- text("Disable").style(style::Text::Danger)
- } else {
- text("Uninstall").style(style::Text::Danger)
- },
- Space::new().width(Length::Fill),
- text(recap.discard.to_string()).style(style::Text::Danger)
- ]
- .width(Length::FillPortion(1)),
- rule::vertical(5),
- row![
- if settings.device.disable_mode {
- text("Enable").style(style::Text::Ok)
- } else {
- text("Restore").style(style::Text::Ok)
- },
- Space::new().width(Length::Fill),
- text(recap.restore.to_string()).style(style::Text::Ok)
- ]
- .width(Length::FillPortion(1))
- ]
- .spacing(20)
- .padding(iced::Padding {
- top: 0.0,
- right: 10.0,
- bottom: 0.0,
- left: 0.0,
- })
- .width(Length::Fill)
- .align_y(Alignment::Center),
- )
- .padding(10)
- .width(Length::Fill)
- .height(45)
- .style(style::Container::Frame)
- .into()
-}
diff --git a/crates/uad-gui/src/views/settings.rs b/crates/uad-gui/src/views/settings.rs
deleted file mode 100644
index 3a09b80..0000000
--- a/crates/uad-gui/src/views/settings.rs
+++ /dev/null
@@ -1,694 +0,0 @@
-use crate::helpers::{button_primary, open_folder};
-use crate::theme::Theme;
-use crate::theme::string_to_theme;
-use crate::{
- style,
- views::list::{List as AppsView, PackageInfo},
- widgets::modal::Modal,
- widgets::navigation_menu::ICONS,
- widgets::package_row::PackageRow,
- widgets::text,
-};
-use chrono;
-use iced::widget::{Space, button, checkbox, column, container, pick_list, radio, row, scrollable};
-use iced::{Alignment, Element, Length, Renderer, Task, alignment};
-use log::{debug, error, info};
-use std::path::PathBuf;
-use uad_core::{
- config::{BackupSettings, Config, DeviceSettings, GeneralSettings},
- save::{backup_phone, list_available_backup_user, list_available_backups, restore_backup},
- sync::{
- AdbError, CorePackage, Phone, User, get_android_sdk, run_adb_shell_action,
- supports_disabling, supports_multi_user,
- },
- utils::{DisplayablePath, Error, NAME, export_packages, generate_backup_name, open_url},
-};
-
-#[derive(Debug, Clone)]
-pub enum PopUpModal {
- ExportUninstalled,
-}
-
-#[derive(Debug, Clone)]
-pub struct Settings {
- pub general: GeneralSettings,
- pub device: DeviceSettings,
- is_loading: bool,
- modal: Option,
-}
-
-impl Default for Settings {
- fn default() -> Self {
- Self {
- general: Config::load_configuration_file().general,
- device: DeviceSettings::default(),
- is_loading: false,
- modal: None,
- }
- }
-}
-
-#[derive(Debug, Clone)]
-pub enum Message {
- LoadDeviceSettings,
- ExpertMode(bool),
- DisableMode(bool),
- MultiUserMode(bool),
- ApplyTheme(Theme),
- UrlPressed(PathBuf),
- BackupSelected(DisplayablePath),
- BackupDevice,
- RestoreDevice,
- RestoringDevice(Result),
- DeviceBackedUp(Result),
- ChooseBackUpFolder,
- FolderChosen(Result),
- ExportPackages,
- PackagesExported(Result),
- ModalHide,
-}
-
-impl Settings {
- pub fn update(
- &mut self,
- phone: &Phone,
- packages: &[Vec],
- nb_running_async_adb_commands: &mut u32,
- msg: Message,
- selected_user: Option,
- ) -> Task {
- match msg {
- Message::ModalHide => self.handle_modal_hide(),
- Message::ExpertMode(toggled) => self.handle_expert_mode(phone, toggled),
- Message::DisableMode(toggled) => self.handle_disable_mode(phone, toggled),
- Message::MultiUserMode(toggled) => self.handle_multi_user_mode(phone, toggled),
- Message::ApplyTheme(theme) => self.handle_apply_theme(phone, theme),
- Message::UrlPressed(url) => Self::handle_url_pressed(url),
- Message::LoadDeviceSettings => self.handle_load_device_settings(phone),
- Message::BackupSelected(d_path) => self.handle_backup_selected(d_path),
- Message::BackupDevice => self.handle_backup_device(phone, packages),
- Message::DeviceBackedUp(result) => self.handle_device_backed_up(phone, result),
- Message::RestoreDevice => {
- self.handle_restore_device(phone, packages, nb_running_async_adb_commands)
- }
- Message::RestoringDevice(_) => Task::none(),
- Message::FolderChosen(result) => self.handle_folder_chosen(phone, result),
- Message::ChooseBackUpFolder => self.handle_choose_backup_folder(),
- Message::ExportPackages => Self::handle_export_packages(selected_user, packages),
- Message::PackagesExported(result) => self.handle_packages_exported(result),
- }
- }
-
- fn handle_modal_hide(&mut self) -> Task {
- self.modal = None;
- Task::none()
- }
-
- fn handle_expert_mode(&mut self, _phone: &Phone, toggled: bool) -> Task {
- self.general.expert_mode = toggled;
- debug!("Config change: {self:?}");
- let mut config = Config::load_configuration_file();
- config.save_device_settings(self.device.clone(), self.general.clone());
- Task::none()
- }
-
- fn handle_disable_mode(&mut self, phone: &Phone, toggled: bool) -> Task {
- if supports_disabling(phone) {
- self.device.disable_mode = toggled;
- debug!("Config change: {self:?}");
- let mut config = Config::load_configuration_file();
- config.save_device_settings(self.device.clone(), self.general.clone());
- }
- Task::none()
- }
-
- fn handle_multi_user_mode(&mut self, _phone: &Phone, toggled: bool) -> Task {
- self.device.multi_user_mode = toggled;
- debug!("Config change: {self:?}");
- let mut config = Config::load_configuration_file();
- config.save_device_settings(self.device.clone(), self.general.clone());
- Task::none()
- }
-
- fn handle_apply_theme(&mut self, _phone: &Phone, theme: Theme) -> Task {
- self.general.theme = theme.to_string();
- debug!("Config change: {self:?}");
- let mut config = Config::load_configuration_file();
- config.save_device_settings(self.device.clone(), self.general.clone());
- Task::none()
- }
-
- fn handle_url_pressed(url: PathBuf) -> Task {
- open_url(url);
- Task::none()
- }
-
- fn handle_load_device_settings(&mut self, phone: &Phone) -> Task