Merge branch 'main' into main

Universal-Debloater-Alliance · Jan 20, 2025 · f9a87f2 · f9a87f2
2 parents 3e5377b + 37b39e8
commit f9a87f2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/core/sync.rs b/src/core/sync.rs
@@ -315,7 +315,7 @@ pub fn get_user_list() -> Vec<User> {
 // getprop ro.serialno
 pub async fn get_devices_list() -> Vec<Phone> {
     retry(
-        Fixed::from_millis(500).take(120),
+        Fixed::from_millis(500).take(if cfg!(debug_assertions) { 3 } else { 120 }),
         || match adb_shell_command(false, "devices") {
             Ok(devices) => {
                 let mut device_list: Vec<Phone> = vec![];

diff --git a/src/core/uad_lists.rs b/src/core/uad_lists.rs
@@ -112,7 +112,7 @@ impl std::fmt::Display for PackageState {
             f,
             "{}",
             match self {
-                Self::All => "All packages",
+                Self::All => "All states",
                 Self::Enabled => "Enabled",
                 Self::Uninstalled => "Uninstalled",
                 Self::Disabled => "Disabled",
@@ -177,7 +177,7 @@ impl std::fmt::Display for Removal {
             f,
             "{}",
             match self {
-                Self::All => "All",
+                Self::All => "All removals",
                 Self::Recommended => "Recommended",
                 Self::Advanced => "Advanced",
                 Self::Expert => "Expert",