Set ShowOnSystem correctly for prompts

This commit is contained in:
Daniel
2021-05-18 14:12:03 +02:00
parent 6b83af197f
commit 592605b0d4
2 changed files with 9 additions and 5 deletions

View File

@@ -3,6 +3,7 @@ package firewall
import (
"github.com/safing/portbase/api"
"github.com/safing/portbase/config"
"github.com/safing/portbase/notifications"
"github.com/safing/portmaster/core"
)
@@ -12,6 +13,7 @@ var (
CfgOptionAskWithSystemNotificationsKey = "filter/askWithSystemNotifications"
cfgOptionAskWithSystemNotificationsOrder = 2
askWithSystemNotifications config.BoolOption
CfgOptionAskTimeoutKey = "filter/askTimeout"
cfgOptionAskTimeoutOrder = 3
@@ -55,7 +57,7 @@ func registerConfig() error {
config.DisplayOrderAnnotation: cfgOptionAskWithSystemNotificationsOrder,
config.CategoryAnnotation: "General",
config.RequiresAnnotation: config.ValueRequirement{
Key: core.CfgUseSystemNotificationsKey,
Key: notifications.CfgUseSystemNotificationsKey,
Value: true,
},
},
@@ -63,6 +65,7 @@ func registerConfig() error {
if err != nil {
return err
}
askWithSystemNotifications = config.Concurrent.GetAsBool(CfgOptionAskWithSystemNotificationsKey, true)
err = config.Register(&config.Option{
Name: "Prompt Timeout",

View File

@@ -169,10 +169,11 @@ func createPrompt(ctx context.Context, conn *network.Connection, pkt packet.Pack
// Create new notification.
n = &notifications.Notification{
EventID: nID,
Type: notifications.Prompt,
Title: "Connection Prompt",
Category: "Privacy Filter",
EventID: nID,
Type: notifications.Prompt,
Title: "Connection Prompt",
Category: "Privacy Filter",
ShowOnSystem: askWithSystemNotifications(),
EventData: &promptData{
Entity: entity,
Profile: promptProfile{