diff --git a/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java b/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java index 4d7c3b1a3190d16c173827757c6442ebe45c8c44..af0f6dbdfe9a5661cb892b725e23e6f7dcabfbad 100644 --- a/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java +++ b/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java @@ -8,7 +8,6 @@ import static android.widget.RelativeLayout.ALIGN_PARENT_TOP; import static android.widget.RelativeLayout.BELOW; import static android.widget.RelativeLayout.LEFT_OF; import static android.widget.RelativeLayout.RIGHT_OF; -import static java.text.DateFormat.SHORT; import java.util.ArrayList; @@ -56,8 +55,8 @@ class ConversationAdapter extends ArrayAdapter<ConversationItem> { date.setTextSize(14); date.setBackgroundColor(background); date.setPadding(pad, pad, pad, 0); - long then = header.getTimestamp(), now = System.currentTimeMillis(); - date.setText(DateUtils.formatSameDayTime(then, now, SHORT, SHORT)); + long timestamp = header.getTimestamp(); + date.setText(DateUtils.getRelativeTimeSpanString(ctx, timestamp)); View content; if(item.getBody() == null) { diff --git a/briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java b/briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java index 57d00c6e32a39b4baf947b38bfa4cc1bfdf65c41..5f2b2ba61cb3bb4a4d9d6858d4c77b24f7203db5 100644 --- a/briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java +++ b/briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java @@ -4,7 +4,6 @@ import static android.view.Gravity.CENTER; import static android.view.Gravity.CENTER_VERTICAL; import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.VERTICAL; -import static java.text.DateFormat.SHORT; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP; @@ -129,8 +128,7 @@ implements OnClickListener { TextView date = new TextView(this); date.setTextSize(14); date.setPadding(0, pad, pad, pad); - long now = System.currentTimeMillis(); - date.setText(DateUtils.formatSameDayTime(timestamp, now, SHORT, SHORT)); + date.setText(DateUtils.getRelativeTimeSpanString(this, timestamp)); header.addView(date); message.addView(header); diff --git a/briar-android/src/org/briarproject/android/groups/GroupAdapter.java b/briar-android/src/org/briarproject/android/groups/GroupAdapter.java index 5fef0bcdc1aad40e8e210d12911319f86568b4ff..df254e08cf309125c9185c904cd98c0684de4a4f 100644 --- a/briar-android/src/org/briarproject/android/groups/GroupAdapter.java +++ b/briar-android/src/org/briarproject/android/groups/GroupAdapter.java @@ -4,7 +4,6 @@ import static android.view.Gravity.CENTER_HORIZONTAL; import static android.view.Gravity.CENTER_VERTICAL; import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.VERTICAL; -import static java.text.DateFormat.SHORT; import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP_1; import java.util.ArrayList; @@ -65,8 +64,8 @@ class GroupAdapter extends ArrayAdapter<GroupItem> { TextView date = new TextView(ctx); date.setTextSize(14); date.setPadding(0, pad, pad, pad); - long then = header.getTimestamp(), now = System.currentTimeMillis(); - date.setText(DateUtils.formatSameDayTime(then, now, SHORT, SHORT)); + long timestamp = header.getTimestamp(); + date.setText(DateUtils.getRelativeTimeSpanString(ctx, timestamp)); headerLayout.addView(date); layout.addView(headerLayout); diff --git a/briar-android/src/org/briarproject/android/groups/GroupListAdapter.java b/briar-android/src/org/briarproject/android/groups/GroupListAdapter.java index 8e9f6c6741eb482cd3993c6208b2baee6b633366..c1618635ec0c7b5716fa24a1ba5fc3ae81141a90 100644 --- a/briar-android/src/org/briarproject/android/groups/GroupListAdapter.java +++ b/briar-android/src/org/briarproject/android/groups/GroupListAdapter.java @@ -3,7 +3,6 @@ package org.briarproject.android.groups; import static android.text.TextUtils.TruncateAt.END; import static android.view.Gravity.CENTER; import static android.widget.LinearLayout.HORIZONTAL; -import static java.text.DateFormat.SHORT; import static org.briarproject.android.groups.GroupListItem.MANAGE; import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP_1; @@ -104,8 +103,8 @@ class GroupListAdapter extends BaseAdapter { TextView date = new TextView(ctx); date.setTextSize(14); date.setPadding(pad, 0, pad, pad); - long then = item.getTimestamp(), now = System.currentTimeMillis(); - date.setText(DateUtils.formatSameDayTime(then, now, SHORT, SHORT)); + long timestamp = item.getTimestamp(); + date.setText(DateUtils.getRelativeTimeSpanString(ctx, timestamp)); layout.addView(date); } diff --git a/briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java b/briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java index 7178f879a4923a784df37946f303c973d154df1c..491be8e001f2e588a470dbfafb1bca16971db749 100644 --- a/briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java +++ b/briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java @@ -4,7 +4,6 @@ import static android.view.Gravity.CENTER; import static android.view.Gravity.CENTER_VERTICAL; import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.VERTICAL; -import static java.text.DateFormat.SHORT; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP; @@ -126,8 +125,7 @@ implements OnClickListener { TextView date = new TextView(this); date.setTextSize(14); date.setPadding(0, pad, pad, pad); - long now = System.currentTimeMillis(); - date.setText(DateUtils.formatSameDayTime(timestamp, now, SHORT, SHORT)); + date.setText(DateUtils.getRelativeTimeSpanString(this, timestamp)); header.addView(date); message.addView(header);