aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs
diff options
context:
space:
mode:
Diffstat (limited to 'src/eu/siacs')
-rw-r--r--src/eu/siacs/conversations/entities/Presences.java2
-rw-r--r--src/eu/siacs/conversations/ui/ConversationActivity.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/entities/Presences.java b/src/eu/siacs/conversations/entities/Presences.java
index 77891648..acd80735 100644
--- a/src/eu/siacs/conversations/entities/Presences.java
+++ b/src/eu/siacs/conversations/entities/Presences.java
@@ -44,7 +44,7 @@ public class Presences {
}
public static int parseShow(Element show) {
- if (show == null) {
+ if ((show == null)||(show.getContent() == null)) {
return Presences.ONLINE;
} else if (show.getContent().equals("away")) {
return Presences.AWAY;
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index d4836719..03ced289 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -647,7 +647,7 @@ public class ConversationActivity extends XmppActivity {
.beginTransaction();
transaction.replace(R.id.selected_conversation, selectedFragment,
"conversation");
- transaction.commit();
+ transaction.commitAllowingStateLoss();
return selectedFragment;
}