From 8e2d07934ee53bc048aecf3a85811c588cfca819 Mon Sep 17 00:00:00 2001
From: w1nst0n <mreve@keemail.me>
Date: Sun, 3 Oct 2021 15:29:13 +0200
Subject: [PATCH] Refresh button should apply default settings state

---
 CHANGELOG.md              | 3 ++-
 src/gui/mod.rs            | 5 +----
 src/gui/views/settings.rs | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ab3b8a..8b59e01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,8 @@ and `Removed`.
    - User switcher (picklist).
 
 ## Fixed
-- [Regression] Unsafe packages can be deleted without enabling `expert mode`
+- [Regression] Unsafe packages can be deleted without enabling `expert mode`.
+- Refresh button doesn't update settings when a (new) phone is connected.
 
 ## [0.2.2] - 2021-09-30
 
diff --git a/src/gui/mod.rs b/src/gui/mod.rs
index 2dc4546..fc45a3e 100644
--- a/src/gui/mod.rs
+++ b/src/gui/mod.rs
@@ -74,15 +74,12 @@ impl Application for UadGui {
     fn update(&mut self, message: Message) -> Command<Message> {
         match message {
             Message::Init(_) => {
-
-                if self.phone.android_sdk < 26 {
-                    self.settings_view.update(SettingsMessage::DisableMode(true));
-                }
                 info!("ANDROID_SDK: {} | PHONE: {}", self.phone.android_sdk, self.phone.model);
                 Command::perform(Self::load_phone_packages(), Message::AppsAction)
             }
             Message::AppsRefreshPress => {
                 self.phone = Phone::default();
+                self.settings_view = SettingsView::default();
                 info!("{:-^65}", "-");
                 info!("ANDROID_SDK: {} | PHONE: {}", self.phone.android_sdk, self.phone.model);
                 self.apps_view = AppsView::default();
diff --git a/src/gui/views/settings.rs b/src/gui/views/settings.rs
index c9bd90b..d10e59d 100644
--- a/src/gui/views/settings.rs
+++ b/src/gui/views/settings.rs
@@ -1,5 +1,5 @@
 use crate::gui::style;
-
+use crate::core::sync::get_android_sdk;
 use iced::{Checkbox, Column, Container, Element, Length, Text, Space};
 
 #[derive(Debug, Clone, Copy)]
@@ -13,8 +13,8 @@ impl Default for Settings {
     fn default() -> Self {
         Self {
             expert_mode: false,
-            disable_mode: false,
-            multi_user_mode: true,
+            disable_mode: get_android_sdk() < 26,
+            multi_user_mode: get_android_sdk() > 21,
         }
     }
 }