From 22fced3fa5401fbf19b00790d825653e16b17bf7 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Mon, 22 Nov 2021 21:16:54 -0500 Subject: [PATCH 1/5] add DcContact.getLastSeen() --- jni/dc_wrapper.c | 6 ++++++ src/com/b44t/messenger/DcContact.java | 1 + 2 files changed, 7 insertions(+) diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c index 6bbdb2f9d..8e6d3cbc0 100644 --- a/jni/dc_wrapper.c +++ b/jni/dc_wrapper.c @@ -1722,6 +1722,12 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getStatus(JNIEnv *env, jobje } +JNIEXPORT jlong Java_com_b44t_messenger_DcContact_getLastSeen(JNIEnv *env, jobject obj) +{ + return JTIMESTAMP(dc_contact_get_last_seen(get_dc_contact(env, obj))); +} + + JNIEXPORT jboolean Java_com_b44t_messenger_DcContact_isBlocked(JNIEnv *env, jobject obj) { return (jboolean)(dc_contact_is_blocked(get_dc_contact(env, obj))!=0); diff --git a/src/com/b44t/messenger/DcContact.java b/src/com/b44t/messenger/DcContact.java index 8369ac4a5..f00aaf01c 100644 --- a/src/com/b44t/messenger/DcContact.java +++ b/src/com/b44t/messenger/DcContact.java @@ -54,6 +54,7 @@ public class DcContact { public native String getProfileImage(); public native int getColor (); public native String getStatus (); + public native long getLastSeen (); public native boolean isBlocked (); public native boolean isVerified (); From c7956abbaf48271d60f131b91eead2f902f6b282 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Mon, 22 Nov 2021 23:11:42 -0500 Subject: [PATCH 2/5] show last-seen info in profile --- res/values/strings.xml | 2 ++ .../securesms/ProfileSettingsAdapter.java | 8 ++++--- .../securesms/util/DateUtils.java | 24 +++++++++++-------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 65b999469..a0a7e77fe 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -85,6 +85,8 @@ This month Last week Last month + Last seen at %1$s + Last seen: never %d min diff --git a/src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java b/src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java index 846b44459..272a2e775 100644 --- a/src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java +++ b/src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java @@ -19,6 +19,7 @@ import com.b44t.messenger.DcLot; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.contacts.ContactSelectionListItem; import org.thoughtcrime.securesms.mms.GlideRequests; +import org.thoughtcrime.securesms.util.DateUtils; import org.thoughtcrime.securesms.util.StickyHeaderDecoration.StickyHeaderAdapter; import java.util.ArrayList; @@ -235,11 +236,12 @@ public class ProfileSettingsAdapter extends RecyclerView.Adapter txt = context.getString(R.string.profile_shared_chats); break; case ItemData.TYPE_PRIMARY_SETTING: - if(itemDataContact!=null && itemDataContact.isVerified()) { - txt = context.getString(R.string.verified_contact); + long lastSeen = (itemDataContact!=null? itemDataContact.getLastSeen() : 0); + if(lastSeen==0) { + txt = context.getString(R.string.last_seen_never); } else { - txt = context.getString(R.string.contact); + txt = context.getString(R.string.last_seen_at, DateUtils.getExtendedTimeSpanString(context, locale, lastSeen)); } break; case ItemData.TYPE_STATUS: diff --git a/src/org/thoughtcrime/securesms/util/DateUtils.java b/src/org/thoughtcrime/securesms/util/DateUtils.java index 6dabc0373..6173f3d96 100644 --- a/src/org/thoughtcrime/securesms/util/DateUtils.java +++ b/src/org/thoughtcrime/securesms/util/DateUtils.java @@ -77,6 +77,19 @@ public class DateUtils extends android.text.format.DateUtils { } } + public static String getExtendedTimeSpanString(final Context c, final Locale locale, final long timestamp) { + StringBuilder format = new StringBuilder(); + if (DateUtils.isToday(timestamp)) {} + else if (isWithin(timestamp, 6, TimeUnit.DAYS)) format.append("EEE "); + else if (isWithin(timestamp, 365, TimeUnit.DAYS)) format.append("MMM d, "); + else format.append("MMM d, yyyy, "); + + if (DateFormat.is24HourFormat(c)) format.append("HH:mm"); + else format.append("hh:mm a"); + + return getFormattedDateTime(timestamp, format.toString(), locale); + } + public static String getExtendedRelativeTimeSpanString(final Context c, final Locale locale, final long timestamp) { if (isWithin(timestamp, 1, TimeUnit.MINUTES)) { return c.getString(R.string.now); @@ -84,16 +97,7 @@ public class DateUtils extends android.text.format.DateUtils { int mins = (int)TimeUnit.MINUTES.convert(System.currentTimeMillis() - timestamp, TimeUnit.MILLISECONDS); return c.getResources().getQuantityString(R.plurals.n_minutes, mins, mins); } else { - StringBuilder format = new StringBuilder(); - if (DateUtils.isToday(timestamp)) {} - else if (isWithin(timestamp, 6, TimeUnit.DAYS)) format.append("EEE "); - else if (isWithin(timestamp, 365, TimeUnit.DAYS)) format.append("MMM d, "); - else format.append("MMM d, yyyy, "); - - if (DateFormat.is24HourFormat(c)) format.append("HH:mm"); - else format.append("hh:mm a"); - - return getFormattedDateTime(timestamp, format.toString(), locale); + return getExtendedTimeSpanString(c, locale, timestamp); } } From b96560b19a063a17705fe6898d41e428ab27f3e9 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Mon, 22 Nov 2021 23:48:52 -0500 Subject: [PATCH 3/5] show verification status in title --- .../securesms/ConversationTitleView.java | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationTitleView.java b/src/org/thoughtcrime/securesms/ConversationTitleView.java index 1d01ff649..a3b0c2ab3 100644 --- a/src/org/thoughtcrime/securesms/ConversationTitleView.java +++ b/src/org/thoughtcrime/securesms/ConversationTitleView.java @@ -69,6 +69,17 @@ public class ConversationTitleView extends RelativeLayout { title.setText(dcChat.getName()); String subtitleStr = "ErrSubtitle"; + // set icons etc. + int imgLeft = 0; + int imgRight = 0; + + if (dcChat.isMuted()) { + imgLeft = R.drawable.ic_volume_off_white_18dp; + } + if (dcChat.isProtected()) { + imgRight = R.drawable.ic_verified; + } + int[] chatContacts = dcContext.getChatContacts(chatId); if (dcChat.isMailingList()) { subtitleStr = context.getString(R.string.mailing_list); @@ -84,23 +95,16 @@ public class ConversationTitleView extends RelativeLayout { subtitleStr = context.getString(R.string.device_talk_subtitle); } else { - subtitleStr = dcContext.getContact(chatContacts[0]).getAddr(); + DcContact dcContact = dcContext.getContact(chatContacts[0]); + subtitleStr = dcContact.getAddr(); + if (dcContact.isVerified()) { + imgRight = R.drawable.ic_verified; + } } } subtitle.setText(subtitleStr); - // set icons etc. - int imgLeft = 0; - int imgRight = 0; - - if (dcChat.isMuted()) { - imgLeft = R.drawable.ic_volume_off_white_18dp; - } - if (dcChat.isProtected()) { - imgRight = R.drawable.ic_verified; - } - avatar.setAvatar(glideRequests, new Recipient(getContext(), dcChat), false); title.setCompoundDrawablesWithIntrinsicBounds(imgLeft, 0, imgRight, 0); subtitle.setVisibility(showAddInfo? View.VISIBLE : View.GONE); From d798571786ac1d1610cd2b64a86f11ea01831b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asiel=20D=C3=ADaz=20Ben=C3=ADtez?= Date: Tue, 23 Nov 2021 11:41:19 -0500 Subject: [PATCH 4/5] Update src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java Co-authored-by: bjoern --- src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java b/src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java index 272a2e775..e3b317aef 100644 --- a/src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java +++ b/src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java @@ -237,7 +237,7 @@ public class ProfileSettingsAdapter extends RecyclerView.Adapter break; case ItemData.TYPE_PRIMARY_SETTING: long lastSeen = (itemDataContact!=null? itemDataContact.getLastSeen() : 0); - if(lastSeen==0) { + if (lastSeen == 0) { txt = context.getString(R.string.last_seen_never); } else { From a79912109c73c5bef4db956f44ed7fbc093c1a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asiel=20D=C3=ADaz=20Ben=C3=ADtez?= Date: Tue, 23 Nov 2021 11:41:27 -0500 Subject: [PATCH 5/5] Update res/values/strings.xml Co-authored-by: bjoern --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index a0a7e77fe..fb889012d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -86,7 +86,7 @@ Last week Last month Last seen at %1$s - Last seen: never + Last seen: Never %d min