moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-30 20:52:21 -05:00
Code Issues Releases Wiki Activity

check if display is off for notifications

Browse Source
This commit is contained in:
iNPUTmice 2014-10-02 22:17:25 +02:00
parent f671938e84
commit facd15f037
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/eu/siacs/conversations/services/NotificationService.java
View File

@ -12,6 +12,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.net.Uri; import android.net.Uri;
import android.os.PowerManager;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.support.v4.app.TaskStackBuilder; import android.support.v4.app.TaskStackBuilder;
import android.text.Html; import android.text.Html;
@ -39,7 +40,12 @@ public class NotificationService {
} }
public synchronized void push(Message message) { public synchronized void push(Message message) {
if (this.mIsInForeground
PowerManager pm = (PowerManager) mXmppConnectionService
.getSystemService(Context.POWER_SERVICE);
boolean isScreenOn = pm.isScreenOn();
if (this.mIsInForeground && isScreenOn
&& this.mOpenConversation == message.getConversation()) { && this.mOpenConversation == message.getConversation()) {
return; // simply ignore return; // simply ignore
} }
@ -51,7 +57,7 @@ public class NotificationService {
mList.add(message); mList.add(message);
notifications.put(conversationUuid, mList); notifications.put(conversationUuid, mList);
} }
updateNotification(!(this.mIsInForeground && this.mOpenConversation == null)); updateNotification(!(this.mIsInForeground && this.mOpenConversation == null) || !isScreenOn);
} }
public void clear() { public void clear() {