sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clear pending photo uri only when also clearing activity result 

on some phones the onBackendConnected finishes prior to the onActivityResult()
leading to the pending photo uri being cleared before processing the result.

this leads to 'Take photo' not working.

but we probably don’t need to clear the photo uri if there is to activiyResult
to clear as well
This commit is contained in:
Daniel Gultsch 2020-06-17 17:56:19 +02:00
parent 4493f6cc13
commit 47804205b6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -2879,13 +2879,13 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
private void clearPending() { private void clearPending() {
if (postponedActivityResult.clear()) { if (postponedActivityResult.clear()) {
Log.e(Config.LOGTAG, "cleared pending intent with unhandled result left"); Log.e(Config.LOGTAG, "cleared pending intent with unhandled result left");
if (pendingTakePhotoUri.clear()) {
Log.e(Config.LOGTAG, "cleared pending photo uri");
}
} }
if (pendingScrollState.clear()) { if (pendingScrollState.clear()) {
Log.e(Config.LOGTAG, "cleared scroll state"); Log.e(Config.LOGTAG, "cleared scroll state");
} }
if (pendingTakePhotoUri.clear()) {
Log.e(Config.LOGTAG, "cleared pending photo uri");
}
if (pendingConversationsUuid.clear()) { if (pendingConversationsUuid.clear()) {
Log.e(Config.LOGTAG, "cleared pending conversations uuid"); Log.e(Config.LOGTAG, "cleared pending conversations uuid");
} }