From 1290a353a4a57625b290e2bd4b07fcfa9b23410c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CFrigyes06=E2=80=9D?= Date: Thu, 26 Oct 2023 19:04:39 -0700 Subject: [PATCH 1/5] Bumped version, modified update url --- Cargo.toml | 4 ++-- src/core/update.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5ae3b27e..5e6eab0e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "uad_gui" description = "A cross-platform GUI debloater for android devices" -version = "0.5.1" +version = "0.5.2" authors = ["w1nst0n"] license = "GPL-3.0" homepage = "https://github.com/0x192/universal-android-debloater" @@ -9,7 +9,7 @@ repository = "https://github.com/0x192/universal-android-debloater" readme = "README.md" keywords = ["debloater", "android", "adb", "privacy", "bloatware"] categories = ["gui"] -edition = "2021" +edition = "2023" [features] default = ["wgpu", "self-update"] diff --git a/src/core/update.rs b/src/core/update.rs index 3d634699..6fb7f866 100644 --- a/src/core/update.rs +++ b/src/core/update.rs @@ -167,13 +167,13 @@ pub fn get_latest_release() -> Result, ()> { } // UAD only has pre-releases so we can't use -// https://api.github.com/repos/0x192/universal-android-debloater/releases/latest +// https://api.github.com/repos/Frigyes06/universal-android-debloater/releases/latest // to only get the latest release #[cfg(feature = "self-update")] pub fn get_latest_release() -> Result, ()> { debug!("Checking for UAD update"); - match ureq::get("https://api.github.com/repos/0x192/universal-android-debloater/releases") + match ureq::get("https://api.github.com/repos/Frigyes06/universal-android-debloater/releases") .call() { Ok(res) => { From 4d62d13d4519a4dd3faf9af77b80cd8bf7ab7cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CFrigyes06=E2=80=9D?= Date: Thu, 26 Oct 2023 19:06:02 -0700 Subject: [PATCH 2/5] release notes --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 295d6247..8eeabfcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 The sections should follow the order `Apps`, `Added`, `Changed`, `Fixed`, `Packaging` and `Removed`. -## [0.6] - Unreleased +## [0.5.2] - Unreleased **WARNING: Settings specification has changed. Previous user settings will be erased**. From 3c382ca9d753ee9f03ca4c4765b8831160e006ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CFrigyes06=E2=80=9D?= Date: Thu, 26 Oct 2023 19:07:25 -0700 Subject: [PATCH 3/5] clarified release notes --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8eeabfcd..94dd9ff7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,8 +11,11 @@ and `Removed`. ## [0.5.2] - Unreleased **WARNING: Settings specification has changed. Previous user settings will be erased**. +**THIS IS AN UNOFFICIAL FORK** ### Added +- All of AnonymousWP's patches. This release notes will probably be restarted as issue counter is reset on fork. + - [[#374](https://github.com/0x192/universal-android-debloater/pull/374)] **Device-specific persistent configuration:** Some settings are now device-specific which means you can maintain different settings across several devices. - [[#447](https://github.com/0x192/universal-android-debloater/pull/447)] **Backup/Restore the state of a device:** Quick and easy way to save the state of all the system apps on a device and restore it. From 8d9fefdcb9eef3261ae23a708a2a8fc73e239bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CFrigyes06=E2=80=9D?= Date: Thu, 26 Oct 2023 19:08:15 -0700 Subject: [PATCH 4/5] reverted edition change --- Cargo.lock | 45 ++++----------------------------------------- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 42 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3a47f0d3..59bba8ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -830,7 +830,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" dependencies = [ - "toml 0.5.11", + "toml", ] [[package]] @@ -2483,7 +2483,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit 0.19.15", + "toml_edit", ] [[package]] @@ -2856,15 +2856,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_spanned" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" -dependencies = [ - "serde", -] - [[package]] name = "servo-fontconfig" version = "0.5.1" @@ -3190,26 +3181,11 @@ dependencies = [ "serde", ] -[[package]] -name = "toml" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3efaf127c78d5339cc547cce4e4d973bd5e4f56e949a06d091c082ebeef2f800" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.20.5", -] - [[package]] name = "toml_datetime" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] [[package]] name = "toml_edit" @@ -3222,19 +3198,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "toml_edit" -version = "0.20.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "782bf6c2ddf761c1e7855405e8975472acf76f7f36d0d4328bd3b7a2fae12a85" -dependencies = [ - "indexmap 2.0.2", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - [[package]] name = "ttf-parser" version = "0.19.2" @@ -3254,7 +3217,7 @@ dependencies = [ [[package]] name = "uad_gui" -version = "0.5.1" +version = "0.5.2" dependencies = [ "chrono", "dirs", @@ -3276,7 +3239,7 @@ dependencies = [ "serde_json", "static_init", "tar", - "toml 0.8.5", + "toml", "ureq", ] diff --git a/Cargo.toml b/Cargo.toml index 5e6eab0e..a53b1d2f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ repository = "https://github.com/0x192/universal-android-debloater" readme = "README.md" keywords = ["debloater", "android", "adb", "privacy", "bloatware"] categories = ["gui"] -edition = "2023" +edition = "2021" [features] default = ["wgpu", "self-update"] From 85eb22ccbb6c11e3525dfee1cf6c8a0faf937bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CFrigyes06=E2=80=9D?= Date: Thu, 26 Oct 2023 19:13:54 -0700 Subject: [PATCH 5/5] Updated in-app links --- Cargo.toml | 4 ++-- src/gui/views/about.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a53b1d2f..4d06bb57 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,8 +4,8 @@ description = "A cross-platform GUI debloater for android devices" version = "0.5.2" authors = ["w1nst0n"] license = "GPL-3.0" -homepage = "https://github.com/0x192/universal-android-debloater" -repository = "https://github.com/0x192/universal-android-debloater" +homepage = "https://github.com/Frigyes06/universal-android-debloater" +repository = "https://github.com/Frigyes06/universal-android-debloater" readme = "README.md" keywords = ["debloater", "android", "adb", "privacy", "bloatware"] categories = ["gui"] diff --git a/src/gui/views/about.rs b/src/gui/views/about.rs index 5a2fffeb..a12824d9 100644 --- a/src/gui/views/about.rs +++ b/src/gui/views/about.rs @@ -100,14 +100,14 @@ impl About { let website_btn = button("Github page") .on_press(Message::UrlPressed(PathBuf::from( - "https://github.com/0x192/universal-android-debloater", + "https://github.com/Frigyes06/universal-android-debloater", ))) .padding(5) .style(style::Button::Primary); let issue_btn = button("Have an issue?") .on_press(Message::UrlPressed(PathBuf::from( - "https://github.com/0x192/universal-android-debloater/issues", + "https://github.com/Frigyes06/universal-android-debloater/issues", ))) .padding(5) .style(style::Button::Primary);