diff options
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/entities/Presences.java | 2 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConversationActivity.java | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d59eea2c8..15f9746a7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.siacs.conversations" - android:versionCode="18" - android:versionName="0.4" > + android:versionCode="19" + android:versionName="0.4.1" > <uses-sdk android:minSdkVersion="14" diff --git a/src/eu/siacs/conversations/entities/Presences.java b/src/eu/siacs/conversations/entities/Presences.java index 778916487..acd80735a 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 d48367194..03ced2895 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; } |