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

small bug fixes for the conversation activity

Browse source
This commit is contained in:
iNPUTmice 2014-10-22 17:32:59 +02:00
parent 62b0fc3fda
commit c067bf96b0
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -605,8 +605,11 @@ public class ConversationActivity extends XmppActivity implements
.beginTransaction(); .beginTransaction();
transaction.replace(R.id.selected_conversation, selectedFragment, transaction.replace(R.id.selected_conversation, selectedFragment,
"conversation"); "conversation");
try {
transaction.commitAllowingStateLoss(); transaction.commitAllowingStateLoss();
} catch (IllegalStateException e) {
return selectedFragment;
}
} }
return selectedFragment; return selectedFragment;
} }
@ -786,6 +789,10 @@ public class ConversationActivity extends XmppActivity implements
attachAudioToConversation(getSelectedConversation(), attachAudioToConversation(getSelectedConversation(),
data.getData()); data.getData());
} }
} else {
if (requestCode == REQUEST_IMAGE_CAPTURE) {
pendingImageUri = null;
}
} }
} }