From 170f632c0715437f14d6f6ef7ac3eaf2336c99e7 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Sun, 24 Mar 2013 21:47:38 -0400
Subject: [PATCH] Add an option to show seconds in the timestamp

---
 application/res/values/settings.xml           |  3 +++
 application/res/values/strings.xml            |  2 ++
 application/res/xml/preferences.xml           |  6 ++++++
 application/src/org/yaaic/model/Message.java  | 18 +++++++++++++++---
 application/src/org/yaaic/model/Settings.java | 14 ++++++++++++++
 5 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/application/res/values/settings.xml b/application/res/values/settings.xml
index ad9ed75..2d3b2c0 100644
--- a/application/res/values/settings.xml
+++ b/application/res/values/settings.xml
@@ -15,6 +15,9 @@
     <string name="key_24h_format" translatable="false">24h_format</string>
     <string name="default_24h_format" translatable="false">true</string>
     
+    <string name="key_include_seconds" translatable="false">include_seconds</string>
+    <string name="default_include_seconds" translatable="false">true</string>
+
     <string name="key_reconnect" translatable="false">reconnect</string>
     <string name="default_reconnect" translatable="false">false</string>
     
diff --git a/application/res/values/strings.xml b/application/res/values/strings.xml
index 467ab93..d43778c 100644
--- a/application/res/values/strings.xml
+++ b/application/res/values/strings.xml
@@ -199,6 +199,8 @@
     <string name="settings_timestamp_desc">Prefix all messages with a timestamp</string>
     <string name="settings_24h_title">24 hour format</string>
     <string name="settings_24h_desc">Use 24 hour format for timestamps</string>
+    <string name="settings_include_seconds_title">Show seconds</string>
+    <string name="settings_include_seconds_desc">Include seconds in timestamps</string>
 
     <string name="settings_highlight">Highlight</string>
     <string name="settings_sound_highlight_title">Play sound on highlight</string>
diff --git a/application/res/xml/preferences.xml b/application/res/xml/preferences.xml
index 19c961a..51feba4 100644
--- a/application/res/xml/preferences.xml
+++ b/application/res/xml/preferences.xml
@@ -80,6 +80,12 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
             android:key="@string/key_24h_format"
             android:defaultValue="@string/default_24h_format"
             android:dependency="@string/key_show_timestamp" />
+        <CheckBoxPreference
+            android:title="@string/settings_include_seconds_title"
+            android:summary="@string/settings_include_seconds_desc"
+            android:key="@string/key_include_seconds"
+            android:defaultValue="@string/default_include_seconds"
+            android:dependency="@string/key_show_timestamp" />
         <CheckBoxPreference
             android:title="@string/settings_joinpartquit_title"
             android:summary="@string/settings_joinpartquit_desc"
diff --git a/application/src/org/yaaic/model/Message.java b/application/src/org/yaaic/model/Message.java
index 74693ce..dfd9d30 100644
--- a/application/src/org/yaaic/model/Message.java
+++ b/application/src/org/yaaic/model/Message.java
@@ -232,7 +232,7 @@ public class Message
         if (canvas == null) {
             String prefix    = hasIcon() && settings.showIcons() ? "  " : "";
             String nick      = hasSender() ? "<" + sender + "> " : "";
-            String timestamp = settings.showTimestamp() ? renderTimeStamp(settings.use24hFormat()) : "";
+            String timestamp = settings.showTimestamp() ? renderTimeStamp(settings.use24hFormat(), settings.includeSeconds()) : "";
 
             canvas = new SpannableString(prefix + timestamp + nick);
             SpannableString renderedText;
@@ -353,12 +353,13 @@ public class Message
      * @param use24hFormat
      * @return
      */
-    public String renderTimeStamp(boolean use24hFormat)
+    public String renderTimeStamp(boolean use24hFormat, boolean includeSeconds)
     {
         Date date = new Date(timestamp);
 
         int hours = date.getHours();
         int minutes = date.getMinutes();
+        int seconds = date.getSeconds();
 
         if (!use24hFormat) {
             hours = Math.abs(12 - hours);
@@ -367,6 +368,17 @@ public class Message
             }
         }
 
-        return "[" + (hours < 10 ? "0" + hours : hours) + ":" + (minutes < 10 ? "0" + minutes : minutes) + "] ";
+        if (includeSeconds) {
+            return String.format(
+                "[%02d:%02d:%02d]",
+                hours,
+                minutes,
+                seconds);
+        } else {
+            return String.format(
+                "[%02d:%02d]",
+                hours,
+                minutes);
+        }
     }
 }
diff --git a/application/src/org/yaaic/model/Settings.java b/application/src/org/yaaic/model/Settings.java
index bc63902..b2ff56d 100644
--- a/application/src/org/yaaic/model/Settings.java
+++ b/application/src/org/yaaic/model/Settings.java
@@ -119,6 +119,20 @@ public class Settings
         );
     }
 
+    /**
+     * Include seconds in timestamps?
+     *
+     * @return
+     */
+    public boolean includeSeconds()
+    {
+        return preferences.getBoolean(
+            resources.getString(R.string.key_include_seconds),
+            Boolean.parseBoolean(resources.getString(R.string.default_include_seconds))
+        );
+    }
+
+
     /**
      * Is reconnect on disconnect enabled?
      *