From 5b3c462c1e5dd6b7d63f2b7c3ba6b71c4f4ca903 Mon Sep 17 00:00:00 2001
From: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Date: Tue, 24 May 2016 16:36:27 -0400
Subject: [PATCH] notification: prevent npe
Change-Id: I71dcf5aaee86c752400a52c5145438157e4eef9e
Reviewed-by: Thibault Wittemberg <thibault.wittemberg@savoirfairelinux.com>
---
.../main/java/cx/ring/service/LocalService.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/ring-android/app/src/main/java/cx/ring/service/LocalService.java b/ring-android/app/src/main/java/cx/ring/service/LocalService.java
index 93eb0a4af..6c541a409 100644
--- a/ring-android/app/src/main/java/cx/ring/service/LocalService.java
+++ b/ring-android/app/src/main/java/cx/ring/service/LocalService.java
@@ -1196,24 +1196,24 @@ public class LocalService extends Service implements SharedPreferences.OnSharedP
break;
}
case ACTION_CONV_READ: {
- String conv_id = intent.getData().getLastPathSegment();
- Conversation conversation = getConversation(conv_id);
+ String convId = intent.getData().getLastPathSegment();
+ Conversation conversation = getConversation(convId);
if (conversation != null) {
readConversation(conversation);
}
- sendBroadcast(new Intent(ACTION_CONF_UPDATE).setData(Uri.withAppendedPath(ConversationActivity.CONTENT_URI, conv_id)));
+ sendBroadcast(new Intent(ACTION_CONF_UPDATE).setData(Uri.withAppendedPath(ConversationActivity.CONTENT_URI, convId)));
break;
}
case ACTION_CALL_ACCEPT: {
- String call_id = intent.getData().getLastPathSegment();
+ String callId = intent.getData().getLastPathSegment();
try {
- mService.accept(call_id);
+ mService.accept(callId);
} catch (RemoteException e) {
e.printStackTrace();
}
updateAudioState();
- Conference conf = getConference(call_id);
- if (!conf.mVisible)
+ Conference conf = getConference(callId);
+ if (conf != null && !conf.mVisible)
startActivity(conf.getViewIntent(LocalService.this).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
break;
}
--
GitLab