notificationSettings #354

Merged
dan merged 9 commits from notificationSettings into trunk 2022-02-08 23:21:28 +00:00
3 changed files with 5 additions and 5 deletions
Showing only changes of commit 706d1da518 - Show all commits

View File

@ -1 +1 @@
2022-02-08-16-19-v1.5.4-36-g4467c40
2022-02-08-22-37-v1.5.4-41-gd0d5300

View File

@ -1 +1 @@
2022-02-08-21-19-v1.5.4-36-g4467c40
2022-02-08-22-37-v1.5.4-41-gd0d5300

View File

@ -33,7 +33,7 @@ class CwtchNotifier {
String? notificationConversationInfo;
CwtchNotifier(
ProfileListState pcn, Settings settingsCN, ErrorHandler errorCN, TorStatus torStatusCN, NotificationsManager notificationManagerP, AppState appStateCN, ServerListState serverListStateCN) {
ProfileListState pcn, Settings settingsCN, ErrorHandler errorCN, TorStatus torStatusCN, NotificationsManager notificationManagerP, AppState appStateCN, ServerListState serverListStateCN) {
profileCN = pcn;
settings = settingsCN;
error = errorCN;
@ -172,7 +172,7 @@ class CwtchNotifier {
notificationManager.notify(notificationSimple ?? "New Message");
} else if (notification == "ContactInfo") {
var contact = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier);
notificationManager.notify((notificationConversationInfo ?? "New Message from %1").replaceFirst("%1", (contact?.nickname ?? senderHandle.toString())));
notificationManager.notify((notificationConversationInfo ?? "New Message from %1").replaceFirst("%1", (contact?.nickname ?? senderHandle.toString())));
}
profileCN.getProfile(data["ProfileOnion"])?.newMessage(
@ -249,7 +249,7 @@ class CwtchNotifier {
notificationManager.notify(notificationSimple ?? "New Message");
} else if (notification == "ContactInfo") {
var contact = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier);
notificationManager.notify( (notificationConversationInfo ?? "New Message from %1").replaceFirst("%1", (contact?.nickname ?? senderHandle.toString())));
notificationManager.notify((notificationConversationInfo ?? "New Message from %1").replaceFirst("%1", (contact?.nickname ?? senderHandle.toString())));
}
appState.notifyProfileUnread();
}