aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java3
-rw-r--r--src/main/res/values/arrays.xml2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java b/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java
index dd45d7e4..3b3ce08d 100644
--- a/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java
+++ b/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java
@@ -28,10 +28,11 @@ public class PresenceTemplate extends AbstractEntity {
@Override
public ContentValues getContentValues() {
+ final String show = status.toShowString();
ContentValues values = new ContentValues();
values.put(LAST_USED, lastUsed);
values.put(MESSAGE, statusMessage);
- values.put(STATUS, status.toShowString());
+ values.put(STATUS, show == null ? "" : show);
values.put(UUID, uuid);
return values;
}
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 5a635327..e887546a 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -5,7 +5,7 @@
<item>Mobile</item>
<item>Phone</item>
<item>Tablet</item>
- <item>Conversations</item>
+ <item>@string/app_name</item>
<item>Android</item>
</string-array>
<string-array name="filesizes">