aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-10-22 17:32:59 +0200
committeriNPUTmice <daniel@gultsch.de>2014-10-22 17:32:59 +0200
commitc067bf96b032e1bef3b021df246dadccbb1b5fd7 (patch)
tree2d4fe5027b964065326dea548349cf79c140ab61 /src/eu
parent62b0fc3fdac1af440d61bb6d197dcd7fc34372b4 (diff)
small bug fixes for the conversation activity
Diffstat (limited to 'src/eu')
-rw-r--r--src/eu/siacs/conversations/ui/ConversationActivity.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 24ef9a6f..91e1c81f 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -605,8 +605,11 @@ public class ConversationActivity extends XmppActivity implements
.beginTransaction();
transaction.replace(R.id.selected_conversation, selectedFragment,
"conversation");
-
- transaction.commitAllowingStateLoss();
+ try {
+ transaction.commitAllowingStateLoss();
+ } catch (IllegalStateException e) {
+ return selectedFragment;
+ }
}
return selectedFragment;
}
@@ -786,6 +789,10 @@ public class ConversationActivity extends XmppActivity implements
attachAudioToConversation(getSelectedConversation(),
data.getData());
}
+ } else {
+ if (requestCode == REQUEST_IMAGE_CAPTURE) {
+ pendingImageUri = null;
+ }
}
}