narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

treat private, non-anonymous mucs like 1:1 chats notification wise

Browse source
This commit is contained in:
Daniel Gultsch 2015-07-22 15:31:00 +02:00
parent db05d26433
commit f7634a85be
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/eu/siacs/conversations/entities/Conversation.java
View file

@ -519,6 +519,13 @@ public class Conversation extends AbstractEntity implements Blockable {
return getContact().getOtrFingerprints().contains(getOtrFingerprint()); return getContact().getOtrFingerprints().contains(getOtrFingerprint());
} }
/**
* short for is Private and Non-anonymous
*/
public boolean isPnNA() {
return mode == MODE_SINGLE || (getMucOptions().membersOnly() && getMucOptions().nonanonymous());
}
public synchronized MucOptions getMucOptions() { public synchronized MucOptions getMucOptions() {
if (this.mucOptions == null) { if (this.mucOptions == null) {
this.mucOptions = new MucOptions(this); this.mucOptions = new MucOptions(this);

2
src/main/java/eu/siacs/conversations/services/NotificationService.java
View file

@ -64,7 +64,7 @@ public class NotificationService {
return (message.getStatus() == Message.STATUS_RECEIVED) return (message.getStatus() == Message.STATUS_RECEIVED)
&& notificationsEnabled() && notificationsEnabled()
&& !message.getConversation().isMuted() && !message.getConversation().isMuted()
&& (message.getConversation().getMode() == Conversation.MODE_SINGLE && (message.getConversation().isPnNA()
|| conferenceNotificationsEnabled() || conferenceNotificationsEnabled()
|| wasHighlightedOrPrivate(message) || wasHighlightedOrPrivate(message)
); );

4
src/main/res/values/strings.xml
View file

@ -108,8 +108,8 @@
<string name="pref_vibrate_summary">Also vibrate when a new message arrives</string> <string name="pref_vibrate_summary">Also vibrate when a new message arrives</string>
<string name="pref_sound">Sound</string> <string name="pref_sound">Sound</string>
<string name="pref_sound_summary">Play ringtone with notification</string> <string name="pref_sound_summary">Play ringtone with notification</string>
<string name="pref_conference_notifications">Conference notifications</string> <string name="pref_conference_notifications">Notifications in Public Conferences</string>
<string name="pref_conference_notifications_summary">Always notify when a new conference message arrives instead of only when highlighted</string> <string name="pref_conference_notifications_summary">Always notify when a message arrives in a public conference instead of only when highlighted</string>
<string name="pref_notification_grace_period">Notification grace period</string> <string name="pref_notification_grace_period">Notification grace period</string>
<string name="pref_notification_grace_period_summary">Disable notifications for a short time after a carbon copy was received</string> <string name="pref_notification_grace_period_summary">Disable notifications for a short time after a carbon copy was received</string>
<string name="pref_advanced_options">Advanced Options</string> <string name="pref_advanced_options">Advanced Options</string>

2
src/main/res/xml/preferences.xml
View file

@ -83,7 +83,7 @@
android:title="@string/pref_sound" /> android:title="@string/pref_sound" />
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="true" android:defaultValue="false"
android:dependency="show_notification" android:dependency="show_notification"
android:key="always_notify_in_conference" android:key="always_notify_in_conference"
android:summary="@string/pref_conference_notifications_summary" android:summary="@string/pref_conference_notifications_summary"