From 86d9abdc99517697fa8c625e96e594f9f831dfe7 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Thu, 12 Sep 2024 17:36:44 -0300 Subject: [PATCH 1/4] fix(core): plugin::PermissionState::Unknown wrong display impl --- .changes/fix-permission-state-unknown-case.md | 5 +++++ crates/tauri/src/plugin.rs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changes/fix-permission-state-unknown-case.md diff --git a/.changes/fix-permission-state-unknown-case.md b/.changes/fix-permission-state-unknown-case.md new file mode 100644 index 00000000000..43b026aa8d8 --- /dev/null +++ b/.changes/fix-permission-state-unknown-case.md @@ -0,0 +1,5 @@ +--- +"tauri": patch:bug +--- + +Fix display implementation of `PermissionState::Unknown` not generating the lowercased `unknown` string. diff --git a/crates/tauri/src/plugin.rs b/crates/tauri/src/plugin.rs index 5d874bd6980..d5f367dcffd 100644 --- a/crates/tauri/src/plugin.rs +++ b/crates/tauri/src/plugin.rs @@ -923,7 +923,7 @@ impl std::fmt::Display for PermissionState { Self::Granted => write!(f, "granted"), Self::Denied => write!(f, "denied"), Self::PromptWithRationale => write!(f, "prompt-with-rationale"), - Self::Unknown => write!(f, "Unknown"), + Self::Unknown => write!(f, "unknown"), } } } From 58ab80881514cd63f72815655cdd0accc81bab39 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Thu, 12 Sep 2024 17:38:51 -0300 Subject: [PATCH 2/4] prompt --- ...-unknown-case.md => fix-permission-state-unknown-display.md} | 2 +- crates/tauri/src/plugin.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename .changes/{fix-permission-state-unknown-case.md => fix-permission-state-unknown-display.md} (69%) diff --git a/.changes/fix-permission-state-unknown-case.md b/.changes/fix-permission-state-unknown-display.md similarity index 69% rename from .changes/fix-permission-state-unknown-case.md rename to .changes/fix-permission-state-unknown-display.md index 43b026aa8d8..4d21c2b05af 100644 --- a/.changes/fix-permission-state-unknown-case.md +++ b/.changes/fix-permission-state-unknown-display.md @@ -2,4 +2,4 @@ "tauri": patch:bug --- -Fix display implementation of `PermissionState::Unknown` not generating the lowercased `unknown` string. +Fix display implementation of `PermissionState::Unknown` not generating the `prompt` string. diff --git a/crates/tauri/src/plugin.rs b/crates/tauri/src/plugin.rs index d5f367dcffd..a504754d7d2 100644 --- a/crates/tauri/src/plugin.rs +++ b/crates/tauri/src/plugin.rs @@ -923,7 +923,7 @@ impl std::fmt::Display for PermissionState { Self::Granted => write!(f, "granted"), Self::Denied => write!(f, "denied"), Self::PromptWithRationale => write!(f, "prompt-with-rationale"), - Self::Unknown => write!(f, "unknown"), + Self::Unknown => write!(f, "prompt"), } } } From 45755c9198675524af2d793b9ec7734ca9c1a515 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Fri, 13 Sep 2024 08:15:26 -0300 Subject: [PATCH 3/4] rename variant --- .changes/fix-permission-state-unknown-display.md | 4 ++-- crates/tauri/src/plugin.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.changes/fix-permission-state-unknown-display.md b/.changes/fix-permission-state-unknown-display.md index 4d21c2b05af..39564d7e73a 100644 --- a/.changes/fix-permission-state-unknown-display.md +++ b/.changes/fix-permission-state-unknown-display.md @@ -1,5 +1,5 @@ --- -"tauri": patch:bug +"tauri": patch:breaking --- -Fix display implementation of `PermissionState::Unknown` not generating the `prompt` string. +Rename `PermissionState::Unknown` to `PermissionState::Prompt`. diff --git a/crates/tauri/src/plugin.rs b/crates/tauri/src/plugin.rs index a504754d7d2..fb701ebae12 100644 --- a/crates/tauri/src/plugin.rs +++ b/crates/tauri/src/plugin.rs @@ -923,7 +923,7 @@ impl std::fmt::Display for PermissionState { Self::Granted => write!(f, "granted"), Self::Denied => write!(f, "denied"), Self::PromptWithRationale => write!(f, "prompt-with-rationale"), - Self::Unknown => write!(f, "prompt"), + Self::Prompt => write!(f, "prompt"), } } } @@ -947,7 +947,7 @@ impl<'de> Deserialize<'de> for PermissionState { "granted" => Ok(Self::Granted), "denied" => Ok(Self::Denied), "prompt-with-rationale" => Ok(Self::PromptWithRationale), - "prompt" => Ok(Self::Unknown), + "prompt" => Ok(Self::Prompt), _ => Err(DeError::custom(format!("unknown permission state '{s}'"))), } } From 68d12f80336141d8ac8192e12169848633f54303 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Fri, 13 Sep 2024 08:17:07 -0300 Subject: [PATCH 4/4] fix --- crates/tauri/src/plugin.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/tauri/src/plugin.rs b/crates/tauri/src/plugin.rs index fb701ebae12..8bdbb721c22 100644 --- a/crates/tauri/src/plugin.rs +++ b/crates/tauri/src/plugin.rs @@ -910,11 +910,11 @@ pub enum PermissionState { Granted, /// Permission access has been denied. Denied, + /// Permission must be requested. + #[default] + Prompt, /// Permission must be requested, but you must explain to the user why your app needs that permission. **Android only**. PromptWithRationale, - /// Unknown state. Must request permission. - #[default] - Unknown, } impl std::fmt::Display for PermissionState { @@ -922,8 +922,8 @@ impl std::fmt::Display for PermissionState { match self { Self::Granted => write!(f, "granted"), Self::Denied => write!(f, "denied"), - Self::PromptWithRationale => write!(f, "prompt-with-rationale"), Self::Prompt => write!(f, "prompt"), + Self::PromptWithRationale => write!(f, "prompt-with-rationale"), } } } @@ -946,8 +946,8 @@ impl<'de> Deserialize<'de> for PermissionState { match s.to_lowercase().as_str() { "granted" => Ok(Self::Granted), "denied" => Ok(Self::Denied), - "prompt-with-rationale" => Ok(Self::PromptWithRationale), "prompt" => Ok(Self::Prompt), + "prompt-with-rationale" => Ok(Self::PromptWithRationale), _ => Err(DeError::custom(format!("unknown permission state '{s}'"))), } }