TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-11 15:07:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into on

Browse Source
This commit is contained in:
Andrew
2024-03-16 14:27:18 +10:30
parent a000ad3cbc 36edca855c
commit d083b19a12
5 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt
View File

@@ -10,7 +10,7 @@ data class ExpirationConfiguration(
val isEnabled = expiryMode.expirySeconds > 0
companion object {
val isNewConfigEnabled = true /* TODO: System.currentTimeMillis() > 1_676_851_200_000 // 13/02/2023 */
val isNewConfigEnabled = true
}
}

13
libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt
View File

@@ -4,10 +4,11 @@ import com.google.protobuf.ByteString
import org.session.libsignal.utilities.Log
import org.session.libsignal.protos.SignalServiceProtos
class Profile() {
var displayName: String? = null
var profileKey: ByteArray? = null
class Profile(
var displayName: String? = null,
var profileKey: ByteArray? = null,
var profilePictureURL: String? = null
) {
companion object {
const val TAG = "Profile"
@@ -25,12 +26,6 @@ class Profile() {
}
}
constructor(displayName: String, profileKey: ByteArray? = null, profilePictureURL: String? = null) : this() {
this.displayName = displayName
this.profileKey = profileKey
this.profilePictureURL = profilePictureURL
}
fun toProto(): SignalServiceProtos.DataMessage? {
val displayName = displayName
if (displayName == null) {