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

additional null checks around 'read by' intent

Browse source
This commit is contained in:
Daniel Gultsch 2017-09-11 09:23:14 +02:00
parent 60d97e70f0
commit 32b1e5b306
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -644,7 +644,8 @@ public class XmppConnectionService extends Service {
String pushedAccountHash = null; String pushedAccountHash = null;
boolean interactive = false; boolean interactive = false;
if (action != null) { if (action != null) {
final Conversation c = findConversationByUuid(intent.getStringExtra("uuid")); final String uuid = intent.getStringExtra("uuid");
final Conversation c = findConversationByUuid(uuid);
switch (action) { switch (action) {
case ConnectivityManager.CONNECTIVITY_ACTION: case ConnectivityManager.CONNECTIVITY_ACTION:
if (hasInternetConnection() && Config.RESET_ATTEMPT_COUNT_ON_NETWORK_CHANGE) { if (hasInternetConnection() && Config.RESET_ATTEMPT_COUNT_ON_NETWORK_CHANGE) {
@ -687,7 +688,11 @@ public class XmppConnectionService extends Service {
} }
break; break;
case ACTION_MARK_AS_READ: case ACTION_MARK_AS_READ:
sendReadMarker(c); if (c != null) {
sendReadMarker(c);
} else {
Log.d(Config.LOGTAG,"received mark read intent for unknown conversation ("+uuid+")");
}
break; break;
case AudioManager.RINGER_MODE_CHANGED_ACTION: case AudioManager.RINGER_MODE_CHANGED_ACTION:
if (dndOnSilentMode()) { if (dndOnSilentMode()) {