From 71e911717697078141c3669134ad9268e9753ea0 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 4 Jun 2016 16:16:14 +0200
Subject: opt-in to send last userinteraction in presence

---
 src/main/res/layout/activity_contact_details.xml | 10 +++++++++-
 src/main/res/values/strings.xml                  |  3 +++
 src/main/res/xml/preferences.xml                 | 17 ++++++++++-------
 3 files changed, 22 insertions(+), 8 deletions(-)

(limited to 'src/main/res')

diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 0facc6515..3c9d203b7 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -53,12 +53,20 @@
                     android:orientation="horizontal">
                 </LinearLayout>
 
+                <TextView
+                    android:id="@+id/details_lastseen"
+                    android:layout_marginTop="4dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black54"
+                    android:textSize="?attr/TextSizeBody" />
+
                 <TextView
                     android:layout_marginTop="8dp"
                     android:id="@+id/status_message"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/black54"
+                    android:textColor="@color/black87"
                     android:textStyle="italic"
                     android:textSize="?attr/TextSizeBody" />
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 757ebb0a3..7f4ac0056 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -653,4 +653,7 @@
 	<string name="gp_short">Short</string>
 	<string name="gp_medium">Medium</string>
 	<string name="gp_long">Long</string>
+	<string name="pref_broadcast_last_activity">Broadcast last activity</string>
+	<string name="pref_broadcast_last_activity_summary">Let all your contacts know when use Conversations</string>
+	<string name="pref_privacy">Privacy</string>
 </resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index fb0103edd..eb1ff5712 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -15,6 +15,8 @@
             android:key="resource"
             android:summary="@string/pref_xmpp_resource_summary"
             android:title="@string/pref_xmpp_resource"/>
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/pref_privacy">
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="confirm_messages"
@@ -26,11 +28,13 @@
             android:key="chat_states"
             android:summary="@string/pref_chat_states_summary"
             android:title="@string/pref_chat_states"/>
-
-    </PreferenceCategory>
-    <PreferenceCategory
-        android:key="notifications"
-        android:title="@string/pref_notification_settings">
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="last_activity"
+            android:title="@string/pref_broadcast_last_activity"
+            android:summary="@string/pref_broadcast_last_activity_summary"/>
+        </PreferenceCategory>
+    <PreferenceCategory android:title="@string/pref_notification_settings">
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="show_notification"
@@ -88,8 +92,7 @@
             android:entryValues="@array/grace_periods_values"
             />
     </PreferenceCategory>
-    <PreferenceCategory
-        android:title="@string/pref_attachments">
+    <PreferenceCategory android:title="@string/pref_attachments">
         <ListPreference
             android:defaultValue="524288"
             android:entries="@array/filesizes"
-- 
cgit v1.2.3


From 794353ad0c8b6a0a3f854fd37f12f441915a26f5 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 4 Jun 2016 22:37:14 +0200
Subject: renamed last activity to last user interaction

---
 src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/res')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 7f4ac0056..dee7502fd 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -653,7 +653,7 @@
 	<string name="gp_short">Short</string>
 	<string name="gp_medium">Medium</string>
 	<string name="gp_long">Long</string>
-	<string name="pref_broadcast_last_activity">Broadcast last activity</string>
+	<string name="pref_broadcast_last_activity">Broadcast Last User Interaction</string>
 	<string name="pref_broadcast_last_activity_summary">Let all your contacts know when use Conversations</string>
 	<string name="pref_privacy">Privacy</string>
 </resources>
-- 
cgit v1.2.3