Merge pull request #18 from Frigyes06/uad_list-update-fix

ADB get all packages fix
Universal-Debloater-Alliance · Oct 28, 2023 · e719f76 · e719f76
2 parents 5a180c8 + 8575c4b
commit e719f76
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,14 +12,13 @@ and `Removed`.
 
 ## [0.5.3] - Unreleased
 
-### Added
+### Apps
 - [[#13](https://github.com/Frigyes06/universal-android-debloater/pull/13)] com.telus.myaccount package
-- [[#15](https://github.com/Frigyes06/universal-android-debloater/pull/15)] more Wiko oem packages
+- [[#15](https://github.com/Frigyes06/universal-android-debloater/pull/15)] more Wiko oem packages/
 
-### Changed
-- [[#16](https://github.com/Frigyes06/universal-android-debloater/pull/16)] com.android.companiondevicemanager description improved
 ### Fixed
 - [[#14](https://github.com/Frigyes06/universal-android-debloater/pull/14)] Fixed typos in uad_list.json
+- [[#18](https://github.com/Frigyes06/universal-android-debloater/pull/18)] Fixed ABD command to include all packages, not just system packages. Also fixed uad_list update url.
 
 ### Removed
 

diff --git a/src/core/sync.rs b/src/core/sync.rs
@@ -142,7 +142,7 @@ pub fn user_flag(user_id: Option<&User>) -> String {
 }
 
 pub fn list_all_system_packages(user_id: Option<&User>) -> String {
-    let action = format!("pm list packages -s -u{}", user_flag(user_id));
+    let action = format!("pm list packages -u{}", user_flag(user_id));
 
     adb_shell_command(true, &action)
         .unwrap_or_else(|_| String::new())
@@ -152,8 +152,8 @@ pub fn list_all_system_packages(user_id: Option<&User>) -> String {
 pub fn hashset_system_packages(state: PackageState, user_id: Option<&User>) -> HashSet<String> {
     let user = user_flag(user_id);
     let action = match state {
-        PackageState::Enabled => format!("pm list packages -s -e{user}"),
-        PackageState::Disabled => format!("pm list package -s -d{user}"),
+        PackageState::Enabled => format!("pm list packages -e{user}"),
+        PackageState::Disabled => format!("pm list package -d{user}"),
         _ => String::new(), // You probably don't need to use this function for anything else
     };
 

diff --git a/src/core/uad_lists.rs b/src/core/uad_lists.rs
@@ -179,7 +179,7 @@ pub fn load_debloat_lists(remote: bool) -> (Result<PackageHashMap, PackageHashMa
     let list: Vec<Package> = if remote {
         retry(Fixed::from_millis(1000).take(60), || {
             match ureq::get(
-                "https://raw.githubusercontent.com/0x192/universal-android-debloater/\
+                "https://raw.githubusercontent.com/Frigyes06/universal-android-debloater/\
            main/resources/assets/uad_lists.json",
             )
             .call()