small bug fixes for the conversation activity
This commit is contained in:
parent
62b0fc3fda
commit
c067bf96b0
|
@ -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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue