gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-12 10:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent crash if call intent is null

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-05-16 08:16:20 +02:00
parent ec7aecef46
commit 6c5860ac97
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

@ -91,6 +91,7 @@ import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import javax.inject.Inject; import javax.inject.Inject;
@ -566,10 +567,10 @@ public class ChatController extends BaseController implements MessagesListAdapte
return true; return true;
case R.id.conversation_video_call: case R.id.conversation_video_call:
startActivity(getIntentForCall(false)); startActivity(Objects.requireNonNull(getIntentForCall(false)));
return true; return true;
case R.id.conversation_voice_call: case R.id.conversation_voice_call:
startActivity(getIntentForCall(true)); startActivity(Objects.requireNonNull(getIntentForCall(true)));
return true; return true;
default: default:
@ -578,6 +579,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
} }
private Intent getIntentForCall(boolean isVoiceOnlyCall) { private Intent getIntentForCall(boolean isVoiceOnlyCall) {
if (currentCall != null && !TextUtils.isEmpty(currentCall.getSessionId())) {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString(BundleKeys.KEY_ROOM_TOKEN, roomToken); bundle.putString(BundleKeys.KEY_ROOM_TOKEN, roomToken);
bundle.putParcelable(BundleKeys.KEY_USER_ENTITY, Parcels.wrap(currentUser)); bundle.putParcelable(BundleKeys.KEY_USER_ENTITY, Parcels.wrap(currentUser));
@ -591,6 +593,9 @@ public class ChatController extends BaseController implements MessagesListAdapte
callIntent.putExtras(bundle); callIntent.putExtras(bundle);
return callIntent; return callIntent;
} else {
return null;
}
} }