Merge remote-tracking branch 'refs/remotes/siacs/master'

4 files changed, 10 insertions, 10 deletions

diff --git a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
index 571fee065..7370465c8 100644
--- a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
@@ -48,13 +48,13 @@ public abstract class AbstractParser {
 		return dateFormat.parse(timestamp);
 	}
 
-    protected void updateLastseen(final AbstractStanza packet, final Account account, final boolean presenceOverwrite) {
-        updateLastseen(getTimestamp(packet), account, packet.getFrom(), presenceOverwrite);
-    }
+  protected void updateLastseen(final AbstractStanza packet, final Account account, final boolean presenceOverwrite) {
+    updateLastseen(getTimestamp(packet), account, packet.getFrom(), presenceOverwrite);
+  }
 
-    protected void updateLastseen(long timestamp, final Account account, final Jid from, final boolean presenceOverwrite) {
-		final String presence = from == null || from.isBareJid() ? "" : from.getResourcepart();
-		final Contact contact = account.getRoster().getContact(from);
+  protected void updateLastseen(long timestamp, final Account account, final Jid from, final boolean presenceOverwrite) {
+	  final String presence = from == null || from.isBareJid() ? "" : from.getResourcepart();
+	  final Contact contact = account.getRoster().getContact(from);
 		if (timestamp >= contact.lastseen.time) {
 			contact.lastseen.time = timestamp;
 			if (!presence.isEmpty() && presenceOverwrite) {
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 137d60611..ce2de75a5 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -109,7 +109,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 	private Jid contactJid;
 	private TextView contactJidTv;
 	private TextView accountJidTv;
-    private TextView lastseen;
+  private TextView lastseen;
 	private TextView statusMessage;
 	private CheckBox send;
 	private CheckBox receive;
@@ -206,7 +206,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 
 		contactJidTv = (TextView) findViewById(R.id.details_contactjid);
 		accountJidTv = (TextView) findViewById(R.id.details_account);
-        lastseen = (TextView) findViewById(R.id.details_lastseen);
+    lastseen = (TextView) findViewById(R.id.details_lastseen);
 		statusMessage = (TextView) findViewById(R.id.status_message);
 		send = (CheckBox) findViewById(R.id.details_send_presence);
 		receive = (CheckBox) findViewById(R.id.details_receive_presence);
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 9b7f39415..599ec2c7d 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -80,7 +80,7 @@
                     android:id="@+id/status_message"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/black87"
+                    android:textColor="@color/black54"
                     android:textStyle="italic"
                     android:textSize="?attr/TextSizeBody"
                     android:layout_gravity="center_horizontal" />
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 9a96f7226..b9e7ca116 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -133,7 +133,7 @@
             android:title="@string/pref_expert_options">
             <PreferenceCategory android:title="@string/pref_general">
             <ListPreference
-                android:defaultValue="Mobile"
+                android:defaultValue="@string/default_resource"
                 android:entries="@array/resources"
                 android:entryValues="@array/resources"
                 android:key="resource"