diff options
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | src/org/connectbot/HostListActivity.java | 16 |
2 files changed, 3 insertions, 19 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 49c3af4..5f2d78a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -321,12 +321,6 @@ <!-- Displayed to indicate a host has never been connected to. --> <string name="bind_never">"Never connected"</string> - <!-- The time that has elapsed since a host was connected to when it has been less than an hour. --> - <string name="bind_minutes">"%1$s minutes ago"</string> - <!-- The time that has elapsed since a host was connected to when it has been less than a day. --> - <string name="bind_hours">"%1$s hours ago"</string> - <!-- The time that has elapsed since a host was connected to when it has been a day or more. --> - <string name="bind_days">"%1$s days ago"</string> <!-- Message given when user copies from the terminal. --> <string name="console_copy_done">"Copied %1$d bytes to clipboard"</string> diff --git a/src/org/connectbot/HostListActivity.java b/src/org/connectbot/HostListActivity.java index de2b5f1..265dd08 100644 --- a/src/org/connectbot/HostListActivity.java +++ b/src/org/connectbot/HostListActivity.java @@ -45,6 +45,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.Message; import android.preference.PreferenceManager; +import android.text.format.DateUtils; import android.util.Log; import android.view.ContextMenu; import android.view.KeyEvent; @@ -558,20 +559,9 @@ public class HostListActivity extends ListActivity { holder.caption.setTextAppearance(context, android.R.attr.textAppearanceSmall); } - long now = System.currentTimeMillis() / 1000; - - String nice = context.getString(R.string.bind_never); + CharSequence nice = context.getString(R.string.bind_never); if (host.getLastConnect() > 0) { - int minutes = (int)((now - host.getLastConnect()) / 60); - if (minutes >= 60) { - int hours = (minutes / 60); - if (hours >= 24) { - int days = (hours / 24); - nice = context.getString(R.string.bind_days, days); - } else - nice = context.getString(R.string.bind_hours, hours); - } else - nice = context.getString(R.string.bind_minutes, minutes); + nice = DateUtils.getRelativeTimeSpanString(host.getLastConnect() * 1000); } holder.caption.setText(nice); |