fix: Clean the old NotificationsEnabled and logs

`NotificationsEnabled` flag was previously used by the mobile legacy client. It's no longer used since status-desktop uses another, more granular config for push notifications.

This commit also removes the previously added fmt prints for logging and fixes the anonymous local notifications.

Author: alexjba

internal/db/multiaccounts/settings/columns.go

@@ -217,12 +217,6 @@ var (
 		dBColumnName:   "node_config",
 		valueHandler:   NodeConfigHandler,
 	}
-	// NotificationsEnabled - we should remove this and realated things once mobile team starts usign `settings_notifications` package
-	NotificationsEnabled = SettingField{
-		reactFieldName: "notifications-enabled?",
-		dBColumnName:   "notifications_enabled",
-		valueHandler:   BoolHandler,
-	}
 	OpenseaEnabled = SettingField{
 		reactFieldName: "opensea-enabled?",
 		dBColumnName:   "opensea_enabled",
@@ -544,7 +538,6 @@ var (
 		NetworksNetworks,
 		MessengerNotificationsEnabled,
 		NodeConfig,
-		NotificationsEnabled,
 		OpenseaEnabled,
 		PhotoPath,
 		PinnedMailservers,

internal/db/multiaccounts/settings/database.go

@@ -394,7 +394,7 @@ func (db *Database) GetSettings() (Settings, error) {
 		custom_bootnodes, custom_bootnodes_enabled, dapps_address, display_name, bio, eip1581_address, fleet,
 		hide_home_tooltip, installation_id, key_uid, keycard_instance_uid, keycard_paired_on, keycard_pairing,
 		last_updated, latest_derived_path, link_preview_request_enabled, link_previews_enabled_sites, log_level,
-		mnemonic, mnemonic_removed, name, networks, notifications_enabled,
+		mnemonic, mnemonic_removed, name, networks,
 		push_notifications_from_contacts_only, remote_push_notifications_enabled, messenger_notifications_enabled,
 		send_push_notifications, push_notifications_block_mentions, photo_path, pinned_mailservers, preferred_name, preview_privacy, public_key,
 		remember_syncing_choice, signing_phrase, stickers_packs_installed, stickers_packs_pending, stickers_recent_stickers,
@@ -437,7 +437,6 @@ func (db *Database) GetSettings() (Settings, error) {
 		&s.MnemonicRemoved,
 		&s.Name,
 		&s.Networks,
-		&s.NotificationsEnabled,
 		&s.PushNotificationsFromContactsOnly,
 		&s.RemotePushNotificationsEnabled,
 		&s.MessengerNotificationsEnabled,
@@ -501,15 +500,6 @@ func (db *Database) GetSettings() (Settings, error) {
 	return s, err
 }
 
-// We should remove this and realated things once mobile team starts usign `settings_notifications` package
-func (db *Database) GetNotificationsEnabled() (result bool, err error) {
-	err = db.makeSelectRow(NotificationsEnabled).Scan(&result)
-	if err == sql.ErrNoRows {
-		return result, nil
-	}
-	return result, err
-}
-
 func (db *Database) GetProfilePicturesVisibility() (result int, err error) {
 	err = db.makeSelectRow(ProfilePicturesVisibility).Scan(&result)
 	if err == sql.ErrNoRows {

internal/db/multiaccounts/settings/database_settings_manager.go

@@ -18,7 +18,6 @@ type DatabaseSettingsManager interface {
 	GetNotifier() Notifier
 	GetSettingLastSynced(setting SettingField) (result uint64, err error)
 	GetSettings() (Settings, error)
-	GetNotificationsEnabled() (result bool, err error)
 	GetProfilePicturesVisibility() (result int, err error)
 	GetPublicKey() (string, error)
 	GetFleet() (string, error)

internal/db/multiaccounts/settings/structs.go

@@ -155,8 +155,6 @@ type Settings struct {
 	MutualContactEnabled bool             `json:"mutual-contact-enabled?"`
 	Name                 string           `json:"name,omitempty"`
 	Networks             *json.RawMessage `json:"networks/networks"`
-	// NotificationsEnabled indicates whether local notifications should be enabled (android only)
-	NotificationsEnabled bool             `json:"notifications-enabled?,omitempty"`
 	PhotoPath            string           `json:"photo-path"`
 	PinnedMailserver     *json.RawMessage `json:"pinned-mailservers,omitempty"`
 	// PreferredName represents the user's preferred Ethereum Name Service (ENS) name.

protocol/local_notifications.go

@@ -3,7 +3,6 @@ package protocol
 import (
 	"crypto/ecdsa"
 	"encoding/json"
-	"fmt"
 	"strings"
 
 	gethcommon "github.com/ethereum/go-ethereum/common"
@@ -111,6 +110,17 @@ func applyMessagePreview(title, message string, messagePreview int) (displayTitl
 	}
 }
 
+// applyAuthorPrivacy clears identity-revealing fields from a notification when the privacy
+// level is anonymous. In anonymous mode the OS notification must not expose who sent
+// the message: no sender name, no sender/community/chat icon.
+func applyAuthorPrivacy(notif *localnotifications.Notification, messagePreview int) {
+	if messagePreview == messagePreviewAnonymous {
+		notif.Author = localnotifications.NotificationAuthor{}
+		notif.CommunityIcon = ""
+		notif.ChatIcon = ""
+	}
+}
+
 // NotificationSettingsProvider allows querying notification preferences for local notifications.
 // Implemented by *accounts.Database which embeds *NotificationsSettings.
 type NotificationSettingsProvider interface {
@@ -142,7 +152,6 @@ func showMessageNotification(settings NotificationSettingsProvider, publicKey ec
 	// For public/community chats, skip inactive (soft-deleted). For 1:1 and group,
 	// still notify — e.g. contact requests or new messages can arrive when Active=false.
 	if chat != nil && !chat.Active && !chat.OneToOne() && !chat.PrivateGroupChat() {
-		fmt.Printf("[local_notifications] showMessageNotification: false (chat !Active, not 1:1/group) msgId=%s\n", message.ID)
 		return false
 	}
 
@@ -168,7 +177,6 @@ func showMessageNotification(settings NotificationSettingsProvider, publicKey ec
 	// 1. Check per-chat/community exemptions first
 	exMuteAll, err := settings.GetExMuteAllMessages(chatID)
 	if err == nil && exMuteAll {
-		fmt.Printf("[local_notifications] showMessageNotification: false (exemption muteAll) msgId=%s\n", message.ID)
 		return false
 	}
 
@@ -179,21 +187,17 @@ func showMessageNotification(settings NotificationSettingsProvider, publicKey ec
 	if chat.OneToOne() {
 		val, err := settings.GetOneToOneChats()
 		if err == nil && !isNotificationAllowed(val) {
-			fmt.Printf("[local_notifications] showMessageNotification: false (1:1 TurnOff) msgId=%s\n", message.ID)
 			return false
 		}
-		fmt.Printf("[local_notifications] showMessageNotification: true (1:1) msgId=%s\n", message.ID)
 		return true
 	}
 
 	// 3. Private group chats
 	if chat.PrivateGroupChat() {
 		val, err := settings.GetGroupChats()
 		if err == nil && !isNotificationAllowed(val) {
-			fmt.Printf("[local_notifications] showMessageNotification: false (group TurnOff) msgId=%s\n", message.ID)
 			return false
 		}
-		fmt.Printf("[local_notifications] showMessageNotification: true (private group) msgId=%s\n", message.ID)
 		return true
 	}
 
@@ -210,9 +214,7 @@ func showMessageNotification(settings NotificationSettingsProvider, publicKey ec
 			exG, _ := settings.GetExGlobalMentions(chatID)
 			effPersonal, effGlobal = exP, exG
 		}
-		allowed := isNotificationAllowed(effPersonal) || isNotificationAllowed(effGlobal)
-		fmt.Printf("[local_notifications] showMessageNotification: %v (mention) msgId=%s\n", allowed, message.ID)
-		return allowed
+		return isNotificationAllowed(effPersonal) || isNotificationAllowed(effGlobal)
 	}
 
 	if isReplyToOwn {
@@ -222,9 +224,7 @@ func showMessageNotification(settings NotificationSettingsProvider, publicKey ec
 			exOther, _ := settings.GetExOtherMessages(chatID)
 			eff = exOther
 		}
-		allowed := isNotificationAllowed(eff)
-		fmt.Printf("[local_notifications] showMessageNotification: %v (reply to own) msgId=%s\n", allowed, message.ID)
-		return allowed
+		return isNotificationAllowed(eff)
 	}
 
 	// 5. Other messages in public/community chats
@@ -234,9 +234,7 @@ func showMessageNotification(settings NotificationSettingsProvider, publicKey ec
 		exOther, _ := settings.GetExOtherMessages(chatID)
 		eff = exOther
 	}
-	allowed := isNotificationAllowed(eff)
-	fmt.Printf("[local_notifications] showMessageNotification: %v (other) msgId=%s\n", allowed, message.ID)
-	return allowed
+	return isNotificationAllowed(eff)
 }
 
 func (n NotificationBody) MarshalJSON() ([]byte, error) {
@@ -385,14 +383,15 @@ func (n NotificationBody) toMessageNotification(id string, resolvePrimaryName fu
 		notif.ChatIcon = chatIconDataURI(n.Chat)
 	}
 
+	applyAuthorPrivacy(notif, messagePreview)
 	return notif, nil
 }
 
 func (n NotificationBody) toContactRequestNotification(id string, profilePicturesVisibility int, messagePreview int) (*localnotifications.Notification, error) {
 	title := n.Contact.PrimaryName() + " wants to connect"
 	message := n.Contact.PrimaryName() + " sent you a contact request"
 	displayTitle, displayMessage := applyMessagePreview(title, message, messagePreview)
-	return &localnotifications.Notification{
+	notif := &localnotifications.Notification{
 		ID:             gethcommon.HexToHash(id),
 		Body:           n,
 		Title:          title,
@@ -411,14 +410,16 @@ func (n NotificationBody) toContactRequestNotification(id string, profilePicture
 		Timestamp:      n.Message.WhisperTimestamp,
 		IsConversation: true,
 		Image:          "",
-	}, nil
+	}
+	applyAuthorPrivacy(notif, messagePreview)
+	return notif, nil
 }
 
 func (n NotificationBody) toPrivateGroupInviteNotification(id string, profilePicturesVisibility int, messagePreview int) *localnotifications.Notification {
 	title := n.Contact.PrimaryName() + " invited you to " + n.Chat.Name
 	message := n.Contact.PrimaryName() + " wants you to join group " + n.Chat.Name
 	displayTitle, displayMessage := applyMessagePreview(title, message, messagePreview)
-	return &localnotifications.Notification{
+	notif := &localnotifications.Notification{
 		ID:             gethcommon.HexToHash(id),
 		Body:           n,
 		Title:          title,
@@ -436,13 +437,15 @@ func (n NotificationBody) toPrivateGroupInviteNotification(id string, profilePic
 		ChatIcon: chatIconDataURI(n.Chat),
 		Image:    "",
 	}
+	applyAuthorPrivacy(notif, messagePreview)
+	return notif
 }
 
 func (n NotificationBody) toCommunityRequestToJoinNotification(id string, profilePicturesVisibility int, messagePreview int) *localnotifications.Notification {
 	title := n.Contact.PrimaryName() + " wants to join " + n.Community.Name()
-	message := n.Contact.PrimaryName() + " wants to join  message " + n.Community.Name()
+	message := n.Contact.PrimaryName() + " wants to join " + n.Community.Name()
 	displayTitle, displayMessage := applyMessagePreview(title, message, messagePreview)
-	return &localnotifications.Notification{
+	notif := &localnotifications.Notification{
 		ID:             gethcommon.HexToHash(id),
 		Body:           n,
 		Title:          title,
@@ -460,4 +463,6 @@ func (n NotificationBody) toCommunityRequestToJoinNotification(id string, profil
 		CommunityIcon: communityIconDataURI(n.Community),
 		Image:         "",
 	}
+	applyAuthorPrivacy(notif, messagePreview)
+	return notif
 }

protocol/messenger.go

@@ -2789,7 +2789,6 @@ func (r *ReceivedMessageState) addNewMessageNotification(messenger *Messenger, s
 	if !msg.New {
 		return nil
 	}
-	fmt.Printf("[messenger] addNewMessageNotification: considering msgId=%s chatId=%s (m.New=true)\n", msg.ID, msg.LocalChatID)
 
 	pubKey, err := msg.GetSenderPubKey()
 	if err != nil {
@@ -2831,13 +2830,8 @@ func (r *ReceivedMessageState) addNewMessageNotification(messenger *Messenger, s
 			if err != nil {
 				return err
 			}
-			fmt.Printf("[messenger] addNewMessageNotification: ADDING notification msgId=%s chatId=%s\n", msg.ID, msg.LocalChatID)
 			r.Response.AddNotification(notification)
-		} else {
-			fmt.Printf("[messenger] addNewMessageNotification: SKIP showMessageNotification=false msgId=%s chatId=%s\n", msg.ID, msg.LocalChatID)
 		}
-	} else {
-		fmt.Printf("[messenger] addNewMessageNotification: SKIP chat muted msgId=%s chatId=%s\n", msg.ID, msg.LocalChatID)
 	}
 
 	return nil

services/local-notifications/core.go

@@ -3,7 +3,6 @@ package localnotifications
 import (
 	"database/sql"
 	"encoding/json"
-	"fmt"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/rpc"
@@ -148,7 +147,6 @@ func PushMessages(ns []*Notification) {
 }
 
 func pushMessage(notification *Notification) {
-	fmt.Printf("[local-notifications] pushMessage: title=%q convId=%s deleted=%v\n", notification.Title, notification.ConversationID, notification.Deleted)
 	logutils.ZapLogger().Debug("Pushing a new push notification")
 	signal.SendLocalNotifications(notification)
 }

signal/events_pn.go

@@ -1,13 +1,10 @@
 package signal
 
-import "fmt"
-
 const (
 	notificationEvent = "local-notifications"
 )
 
 // SendLocalNotifications sends event with a local notification.
 func SendLocalNotifications(event interface{}) {
-	fmt.Printf("[signal] SendLocalNotifications: invoking send(%q, ...)\n", notificationEvent)
 	send(notificationEvent, event)
 }

signal/signals.go

@@ -10,7 +10,6 @@ extern void SetEventCallback(void *cb);
 import "C"
 import (
 	"encoding/json"
-	"fmt"
 	"sync"
 	"time"
 	"unsafe"
@@ -59,13 +58,9 @@ func send(typ string, event interface{}) {
 
 	// If a Go implementation of signal handler is set, let's use it.
 	if mobileSignalHandler != nil {
-		fmt.Printf("[signal] send(%q): using mobileSignalHandler\n", typ)
-		logger.Debug("signal.send using mobileSignalHandler", zap.String("type", typ))
 		mobileSignalHandler(data)
 	} else {
 		// ...and fallback to C implementation otherwise.
-		fmt.Printf("[signal] send(%q): using C StatusServiceSignalEvent, len=%d\n", typ, len(data))
-		logger.Debug("signal.send using C StatusServiceSignalEvent", zap.String("type", typ))
 		str := C.CString(string(data))
 		C.StatusServiceSignalEvent(str)
 		C.free(unsafe.Pointer(str))