diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt index 4211571526..8011149a15 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt @@ -128,6 +128,16 @@ class InternalConversationSettingsFragment : DSLSettingsFragment( title = DSLSettingsText.from("Sealed Sender Mode"), summary = DSLSettingsText.from(recipient.unidentifiedAccessMode.toString()) ) + + textPref( + title = DSLSettingsText.from("Phone Number Sharing"), + summary = DSLSettingsText.from(recipient.phoneNumberSharing.name) + ) + + textPref( + title = DSLSettingsText.from("Phone Number Discoverability"), + summary = DSLSettingsText.from(SignalDatabase.recipients.getPhoneNumberDiscoverability(recipient.id)?.name ?: "null") + ) } textPref( diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt index 1591c9e8d1..e2c1d509e5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt @@ -26,6 +26,7 @@ import org.signal.core.util.readToList import org.signal.core.util.readToSet import org.signal.core.util.readToSingleBoolean import org.signal.core.util.readToSingleLong +import org.signal.core.util.readToSingleObject import org.signal.core.util.requireBlob import org.signal.core.util.requireInt import org.signal.core.util.requireLong @@ -1940,6 +1941,15 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da return 0 } + fun getPhoneNumberDiscoverability(id: RecipientId): PhoneNumberDiscoverableState? { + return readableDatabase + .select(PHONE_NUMBER_DISCOVERABLE) + .from(TABLE_NAME) + .where("$ID = ?", id) + .run() + .readToSingleObject { PhoneNumberDiscoverableState.fromId(it.requireInt(PHONE_NUMBER_DISCOVERABLE)) } + } + /** * @return True if setting the phone number resulted in changed recipientId, otherwise false. */