| commit | ca0436ceb599dcf7bd61b2c78caebba8d7bee6fa | [log] [tgz] |
|---|---|---|
| author | Rayan Osseiran <rayan.osseiran@savoirfairelinux.com> | Tue Jul 16 10:11:06 2019 -0400 |
| committer | Rayan Osseiran <rayan.osseiran@savoirfairelinux.com> | Wed Jul 17 16:41:44 2019 -0400 |
| tree | d337c728c9e5526e579d59d52bece5823e351cfb | |
| parent | e13e3c70d3253311ad5826aac977541179543e8d [diff] |
android: bug fixes > NPE: ConversationFacade.readMessages called by DRing > NPE: CallPresenter.switchVideoInputClick Change-Id: Iec2b8a26dac3635f81051311726a13d9a56d1af5
diff --git a/ring-android/libringclient/src/main/java/cx/ring/call/CallPresenter.java b/ring-android/libringclient/src/main/java/cx/ring/call/CallPresenter.java index 30c18e2..6c7a612 100644 --- a/ring-android/libringclient/src/main/java/cx/ring/call/CallPresenter.java +++ b/ring-android/libringclient/src/main/java/cx/ring/call/CallPresenter.java
@@ -222,6 +222,9 @@ } public void switchVideoInputClick() { + if(mSipCall == null) + return; + mHardwareService.switchInput(mSipCall.getCallId(), false); getView().switchCameraIcon(mHardwareService.isPreviewFromFrontCamera()); }
diff --git a/ring-android/libringclient/src/main/java/cx/ring/facades/ConversationFacade.java b/ring-android/libringclient/src/main/java/cx/ring/facades/ConversationFacade.java index 12c73f6..c563759 100644 --- a/ring-android/libringclient/src/main/java/cx/ring/facades/ConversationFacade.java +++ b/ring-android/libringclient/src/main/java/cx/ring/facades/ConversationFacade.java
@@ -156,7 +156,8 @@ public void readMessages(String accountId, Uri contact) { Account account = mAccountService.getAccount(accountId); - readMessages(account, account.getByUri(contact)); + if(account != null) + readMessages(account, account.getByUri(contact)); } public void readMessages(Account account, Conversation conversation) {