mark silent notifications as local only
this will prevent silent notifications (for example those supressed by grace period) showing up on my smart watch
This commit is contained in:
parent
ecad9cbe3c
commit
adfbe59e57
|
@ -827,6 +827,9 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
|
||||||
final Jid sender = InvalidJid.getNullForInvalid(displayed.getAttributeAsJid("sender"));
|
final Jid sender = InvalidJid.getNullForInvalid(displayed.getAttributeAsJid("sender"));
|
||||||
if (packet.fromAccount(account) && !selfAddressed) {
|
if (packet.fromAccount(account) && !selfAddressed) {
|
||||||
dismissNotification(account, counterpart, query);
|
dismissNotification(account, counterpart, query);
|
||||||
|
if (query == null) {
|
||||||
|
activateGracePeriod(account);
|
||||||
|
}
|
||||||
} else if (isTypeGroupChat) {
|
} else if (isTypeGroupChat) {
|
||||||
Conversation conversation = mXmppConnectionService.find(account, counterpart.asBareJid());
|
Conversation conversation = mXmppConnectionService.find(account, counterpart.asBareJid());
|
||||||
if (conversation != null && id != null && sender != null) {
|
if (conversation != null && id != null && sender != null) {
|
||||||
|
|
|
@ -442,6 +442,8 @@ public class NotificationService {
|
||||||
} catch (SecurityException e) {
|
} catch (SecurityException e) {
|
||||||
Log.d(Config.LOGTAG, "unable to use custom notification sound " + uri.toString());
|
Log.d(Config.LOGTAG, "unable to use custom notification sound " + uri.toString());
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
mBuilder.setLocalOnly(true);
|
||||||
}
|
}
|
||||||
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
||||||
mBuilder.setCategory(Notification.CATEGORY_MESSAGE);
|
mBuilder.setCategory(Notification.CATEGORY_MESSAGE);
|
||||||
|
|
Loading…
Reference in a new issue