Feature/username cleanup (#957)
* Centralising username access * Centralising username logic * Removing ContactUtil * Cleaning up shortString * Making sure the name doesn't overflow in a message view * Using Lazy to avoid dependency cyclepull/1710/head
ThomasSession
1 month ago
committed by
GitHub
parent
e10054c4ee
commit
92f1390fad
@ -1,5 +0,0 @@
|
||||
package org.thoughtcrime.securesms.components.emoji;
|
||||
|
||||
public final class EmojiStrings {
|
||||
public static final String BUST_IN_SILHOUETTE = "\uD83D\uDC64";
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
package org.thoughtcrime.securesms.contacts;
|
||||
|
||||
import android.content.Context;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import org.session.libsession.utilities.Contact;
|
||||
|
||||
import org.thoughtcrime.securesms.components.emoji.EmojiStrings;
|
||||
import org.thoughtcrime.securesms.util.SpanUtil;
|
||||
|
||||
import network.loki.messenger.R;
|
||||
|
||||
public final class ContactUtil {
|
||||
|
||||
public static @NonNull CharSequence getStringSummary(@NonNull Context context, @NonNull Contact contact) {
|
||||
String contactName = ContactUtil.getDisplayName(contact);
|
||||
|
||||
if (!TextUtils.isEmpty(contactName)) {
|
||||
return EmojiStrings.BUST_IN_SILHOUETTE + " " + contactName;
|
||||
}
|
||||
|
||||
return SpanUtil.italic(context.getString(R.string.unknown));
|
||||
}
|
||||
|
||||
private static @NonNull String getDisplayName(@Nullable Contact contact) {
|
||||
if (contact == null) {
|
||||
return "";
|
||||
}
|
||||
|
||||
if (!TextUtils.isEmpty(contact.getName().getDisplayName())) {
|
||||
return contact.getName().getDisplayName();
|
||||
}
|
||||
|
||||
if (!TextUtils.isEmpty(contact.getOrganization())) {
|
||||
return contact.getOrganization();
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,51 @@
|
||||
package org.thoughtcrime.securesms.util
|
||||
|
||||
import network.loki.messenger.libsession_util.getOrNull
|
||||
import org.session.libsession.messaging.contacts.Contact
|
||||
import org.session.libsession.utilities.TextSecurePreferences
|
||||
import org.session.libsession.utilities.UsernameUtils
|
||||
import org.session.libsession.utilities.truncateIdForDisplay
|
||||
import org.session.libsignal.utilities.AccountId
|
||||
import org.thoughtcrime.securesms.database.SessionContactDatabase
|
||||
import org.thoughtcrime.securesms.dependencies.ConfigFactory
|
||||
|
||||
class UsernameUtilsImpl(
|
||||
private val prefs: TextSecurePreferences,
|
||||
private val configFactory: ConfigFactory,
|
||||
private val sessionContactDatabase: SessionContactDatabase,
|
||||
): UsernameUtils {
|
||||
override fun getCurrentUsernameWithAccountIdFallback(): String = prefs.getProfileName()
|
||||
?: truncateIdForDisplay( prefs.getLocalNumber() ?: "")
|
||||
|
||||
override fun getCurrentUsername(): String? = prefs.getProfileName()
|
||||
|
||||
override fun saveCurrentUserName(name: String) {
|
||||
configFactory.withMutableUserConfigs {
|
||||
it.userProfile.setName(name)
|
||||
}
|
||||
}
|
||||
|
||||
override fun getContactNameWithAccountID(
|
||||
accountID: String,
|
||||
groupId: AccountId?,
|
||||
contactContext: Contact.ContactContext
|
||||
): String {
|
||||
val contact = sessionContactDatabase.getContactWithAccountID(accountID)
|
||||
return getContactNameWithAccountID(contact, accountID, groupId, contactContext)
|
||||
}
|
||||
|
||||
override fun getContactNameWithAccountID(
|
||||
contact: Contact?,
|
||||
accountID: String,
|
||||
groupId: AccountId?,
|
||||
contactContext: Contact.ContactContext)
|
||||
: String {
|
||||
// first attempt to get the name from the contact
|
||||
val userName: String? = contact?.displayName(contactContext)
|
||||
?: if(groupId != null){
|
||||
configFactory.withGroupConfigs(groupId) { it.groupMembers.getOrNull(accountID)?.name }
|
||||
} else null
|
||||
|
||||
return userName ?: truncateIdForDisplay(accountID)
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
package org.session.libsession.utilities
|
||||
|
||||
import org.session.libsession.messaging.contacts.Contact
|
||||
import org.session.libsignal.utilities.AccountId
|
||||
|
||||
interface UsernameUtils {
|
||||
fun getCurrentUsernameWithAccountIdFallback(): String
|
||||
|
||||
fun getCurrentUsername(): String?
|
||||
|
||||
fun saveCurrentUserName(name: String)
|
||||
|
||||
fun getContactNameWithAccountID(
|
||||
accountID: String,
|
||||
groupId: AccountId? = null,
|
||||
contactContext: Contact.ContactContext = Contact.ContactContext.REGULAR
|
||||
): String
|
||||
|
||||
fun getContactNameWithAccountID(
|
||||
contact: Contact?,
|
||||
accountID: String,
|
||||
groupId: AccountId? = null,
|
||||
contactContext: Contact.ContactContext = Contact.ContactContext.REGULAR
|
||||
): String
|
||||
}
|
||||
Loading…
Reference in New Issue