fix(tauri) notification body optional, requestPermission() regression, closes #793 (#844)

* fix(tauri) notification body optional, title required

* fix(tauri) regression on requestPermission()
This commit is contained in:
Lucas Fernandes Nogueira
2020-07-16 19:17:41 -03:00
committed by GitHub
parent 0591f1f945
commit dac1db3983
5 changed files with 21 additions and 10 deletions

View File

@@ -0,0 +1,6 @@
---
"tauri.js": patch
"tauri": patch
---
The notification's `body` is now optional, closes #793.

View File

@@ -0,0 +1,6 @@
---
"tauri": patch
---
Fixes a regression on the storage of requestPermission response.
ß

View File

@@ -220,7 +220,7 @@ switch (navigator.platform) {
return window.__TAURI__.promisified({
cmd: 'notification',
options: typeof options === 'string' ? {
body: options
title: options
} : options
})
}

View File

@@ -53,9 +53,9 @@ pub struct SaveDialogOptions {
#[derive(Deserialize)]
pub struct NotificationOptions {
/// The notification title.
pub title: Option<String>,
pub title: String,
/// The notification body.
pub body: String,
pub body: Option<String>,
/// The notification icon.
pub icon: Option<String>,
}

View File

@@ -11,10 +11,9 @@ pub fn send<T: 'static>(
crate::execute_promise(
webview,
move || {
let mut notification = tauri_api::notification::Notification::new();
notification = notification.body(options.body);
if let Some(title) = options.title {
notification = notification.title(title);
let mut notification = tauri_api::notification::Notification::new().title(options.title);
if let Some(body) = options.body {
notification = notification.body(body);
}
if let Some(icon) = options.icon {
notification = notification.icon(icon);
@@ -56,8 +55,8 @@ pub fn request_permission<T: 'static>(
webview,
move || {
let mut settings = crate::settings::read_settings()?;
let granted = r#""granted""#.to_string();
let denied = r#""denied""#.to_string();
let granted = "granted".to_string();
let denied = "denied".to_string();
if let Some(allow_notification) = settings.allow_notification {
return Ok(if allow_notification { granted } else { denied });
}
@@ -76,7 +75,7 @@ pub fn request_permission<T: 'static>(
crate::settings::write_settings(settings)?;
Ok(denied)
}
_ => Ok(r#""default""#.to_string()),
_ => Ok("default".to_string()),
}
},
callback,