Updated to use libsession's lastProfileUpdated (#1520)

Author: SessionHero01

app/src/main/java/org/session/libsession/messaging/messages/ProfileUpdateHandler.kt

@@ -54,7 +54,7 @@ class ProfileUpdateHandler @Inject constructor(
         // If the sender has standard address (either as unblinded, or as is), we will check if
         // they are a contact and update their contact information accordingly.
         val standardSender = unblinded ?: (senderAddress as? Address.Standard)
-        if (standardSender != null && (updates.name != null || updates.pic != null || updates.profileUpdateTime != null)) {
+        if (standardSender != null && (!updates.name.isNullOrBlank() || updates.pic != null)) {
             configFactory.withMutableUserConfigs { configs ->
                 configs.contacts.updateContact(standardSender) {
                     if (shouldUpdateProfile(
@@ -96,6 +96,10 @@ class ProfileUpdateHandler @Inject constructor(
                             c.name = updates.name
                         }
 
+                        if (updates.profileUpdateTime != null) {
+                            c.profileUpdatedEpochSeconds = updates.profileUpdateTime.toEpochSeconds()
+                        }
+
                         configs.contacts.setBlinded(c)
                     }
                 }
@@ -136,7 +140,8 @@ class ProfileUpdateHandler @Inject constructor(
         lastUpdated: Instant?,
         newUpdateTime: Instant?
     ): Boolean {
-        return (lastUpdated == null || newUpdateTime == null) || (newUpdateTime > lastUpdated)
+        return (lastUpdated == null && newUpdateTime == null) ||
+                (newUpdateTime != null && lastUpdated != null && newUpdateTime > lastUpdated)
     }
 
     class Updates private constructor(

app/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt

@@ -7,6 +7,8 @@ import org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile
 import org.thoughtcrime.securesms.util.DateUtils.Companion.asEpochMillis
 import org.thoughtcrime.securesms.util.DateUtils.Companion.asEpochSeconds
 import org.thoughtcrime.securesms.util.DateUtils.Companion.millsToInstant
+import org.thoughtcrime.securesms.util.DateUtils.Companion.secondsToInstant
+import org.thoughtcrime.securesms.util.DateUtils.Companion.toEpochSeconds
 import java.time.Instant
 import java.time.ZonedDateTime
 
@@ -25,9 +27,9 @@ class Profile(
             val displayName = profileProto.displayName ?: return null
             val profileKey = proto.profileKey
             val profilePictureURL = profileProto.profilePicture
-            val profileUpdated = profileProto.lastProfileUpdateMs.takeIf {
-                profileProto.hasLastProfileUpdateMs()
-            }?.millsToInstant()
+            val profileUpdated = profileProto.lastProfileUpdateSeconds
+                .takeIf { profileProto.hasLastProfileUpdateSeconds() }
+                ?.secondsToInstant()
 
             if (profileKey != null && profilePictureURL != null) {
                 return Profile(displayName, profileKey.toByteArray(), profilePictureURL, profileUpdated = profileUpdated)
@@ -48,7 +50,7 @@ class Profile(
         profileProto.displayName = displayName
         profileKey?.let { dataMessageProto.profileKey = ByteString.copyFrom(it) }
         profilePictureURL?.let { profileProto.profilePicture = it }
-        profileUpdated?.let { profileProto.lastProfileUpdateMs = it.toEpochMilli() }
+        profileUpdated?.let { profileProto.lastProfileUpdateSeconds = it.toEpochSeconds() }
         // Build
         try {
             dataMessageProto.profile = profileProto.build()

app/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt

@@ -444,7 +444,7 @@ class ReceivedMessageHandler @Inject constructor(
                     picKey = message.profile?.profileKey,
                     blocksCommunityMessageRequests = message.blocksMessageRequests,
                     proStatus = null,
-                    profileUpdateTime = null,
+                    profileUpdateTime = message.profile?.profileUpdated,
                 )
 
                 if (updates != null) {

app/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt

@@ -47,10 +47,7 @@ import org.session.libsession.utilities.TextSecurePreferences.Companion._events
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.debugmenu.DebugMenuViewModel
 import org.thoughtcrime.securesms.pro.ProStatusManager
-import org.thoughtcrime.securesms.util.DateUtils.Companion.secondsToInstant
-import org.thoughtcrime.securesms.util.DateUtils.Companion.toEpochSeconds
 import java.io.IOException
-import java.time.Instant
 import java.time.ZonedDateTime
 import java.util.Arrays
 import java.util.Date
@@ -231,7 +228,6 @@ interface TextSecurePreferences {
 
     var inAppReviewState: String?
 
-    var lastProfileUpdated: Instant?
 
     companion object {
         val TAG = TextSecurePreferences::class.simpleName
@@ -304,7 +300,6 @@ interface TextSecurePreferences {
         const val GIF_GRID_LAYOUT = "pref_gif_grid_layout"
         val IS_PUSH_ENABLED get() = "pref_is_using_fcm$pushSuffix"
         const val CONFIGURATION_SYNCED = "pref_configuration_synced"
-        const val LAST_PROFILE_UPDATE_TIME = "pref_last_profile_update_time"
         const val PROFILE_PIC_EXPIRY = "profile_pic_expiry"
         const val LAST_OPEN_DATE = "pref_last_open_date"
         const val HAS_HIDDEN_MESSAGE_REQUESTS = "pref_message_requests_hidden"
@@ -873,17 +868,6 @@ interface TextSecurePreferences {
         fun setLastSnodePoolRefreshDate(context: Context?, date: Date) {
             setLongPreference(context!!, "last_snode_pool_refresh_date", date.time)
         }
-
-        @JvmStatic
-        fun shouldUpdateProfile(context: Context, profileUpdateTime: Long): Boolean {
-            return profileUpdateTime > getLongPreference(context, LAST_PROFILE_UPDATE_TIME, 0)
-        }
-
-        @JvmStatic
-        fun setLastProfileUpdateTime(context: Context, profileUpdateTime: Long) {
-            setLongPreference(context, LAST_PROFILE_UPDATE_TIME, profileUpdateTime)
-        }
-
         fun getLastOpenTimeDate(context: Context): Long {
             return getLongPreference(context, LAST_OPEN_DATE, 0)
         }
@@ -1740,13 +1724,6 @@ class AppTextSecurePreferences @Inject constructor(
                 setStringPreference(TextSecurePreferences.DEPRECATING_START_TIME_OVERRIDE, value.toString())
             }
         }
-
-    override var lastProfileUpdated: Instant?
-        get() = getLongPreference(TextSecurePreferences.LAST_PROFILE_UPDATE_TIME, 0).secondsToInstant()
-        set(value) {
-            setLongPreference(TextSecurePreferences.LAST_PROFILE_UPDATE_TIME, value?.toEpochSeconds() ?: 0L)
-        }
-
     override fun getDebugMessageFeatures(): Set<ProStatusManager.MessageProFeature> {
         return getStringSetPreference( TextSecurePreferences.DEBUG_MESSAGE_FEATURES, emptySet())
             ?.map { ProStatusManager.MessageProFeature.valueOf(it) }?.toSet() ?: emptySet()

app/src/main/java/org/thoughtcrime/securesms/attachments/AvatarUploadManager.kt

@@ -97,7 +97,8 @@ class AvatarUploadManager @Inject constructor(
                         Log.d(TAG, "Avatar expired, re-uploading")
                         uploadAvatar(
                             pictureData = localEncryptedFileInputStreamFactory.create(localFile)
-                                .use { it.readBytes() }
+                                .use { it.readBytes() },
+                            isReupload = true,
                         )
                     }
             } else {
@@ -137,7 +138,8 @@ class AvatarUploadManager @Inject constructor(
 
 
     suspend fun uploadAvatar(
-        pictureData: ByteArray
+        pictureData: ByteArray,
+        isReupload: Boolean, // Whether this is a re-upload of an existing avatar
     ) = withContext(Dispatchers.IO) {
         check(pictureData.isNotEmpty()) {
             "Should not upload an empty avatar"
@@ -187,7 +189,13 @@ class AvatarUploadManager @Inject constructor(
         // Now that we have the file both locally and remotely, we can update the user profile
         val oldPic = configFactory.withMutableUserConfigs {
             val result = it.userProfile.getPic()
-            it.userProfile.setPic(remoteFile.toUserPic())
+            val userPic = remoteFile.toUserPic()
+            if (isReupload) {
+                it.userProfile.setReuploadedPic(userPic)
+            } else {
+                it.userProfile.setPic(userPic)
+            }
+
             result.toRemoteFile()
         }
 
@@ -199,8 +207,6 @@ class AvatarUploadManager @Inject constructor(
                 oldFile.delete()
             }
         }
-
-        prefs.lastProfileUpdated = Instant.now()
     }
 
     companion object {

app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt

@@ -70,8 +70,10 @@ import org.thoughtcrime.securesms.database.model.ReactionRecord
 import org.thoughtcrime.securesms.dependencies.ConfigFactory
 import org.thoughtcrime.securesms.groups.OpenGroupManager
 import org.thoughtcrime.securesms.mms.PartAuthority
+import org.thoughtcrime.securesms.util.DateUtils.Companion.secondsToInstant
 import org.thoughtcrime.securesms.util.FilenameUtils
 import org.thoughtcrime.securesms.util.SessionMetaProtocol
+import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Provider
 import javax.inject.Singleton
@@ -122,7 +124,7 @@ open class Storage @Inject constructor(
                 displayName = configs.userProfile.getName(),
                 profilePictureURL = pic.url.takeIf { it.isNotBlank() },
                 profileKey = pic.key.data.takeIf { pic.url.isNotBlank() },
-                profileUpdated = preferences.lastProfileUpdated,
+                profileUpdated = configs.userProfile.getProfileUpdatedSeconds().secondsToInstant(),
             )
         }
     }

app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.kt

@@ -69,7 +69,6 @@ class PrivacySettingsPreferenceFragment : CorrectedPreferenceFragment() {
                                 it.userProfile.setCommunityMessageRequests(value)
                             }
 
-                            textSecurePreferences.lastProfileUpdated = Instant.now()
                             return
                         }
                         super.putBoolean(key, value)

app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsViewModel.kt

@@ -56,7 +56,6 @@ import org.thoughtcrime.securesms.util.NetworkConnectivity
 import org.thoughtcrime.securesms.util.mapToStateFlow
 import java.io.File
 import java.io.IOException
-import java.time.Instant
 import javax.inject.Inject
 
 @OptIn(ExperimentalCoroutinesApi::class)
@@ -312,12 +311,10 @@ class SettingsViewModel @Inject constructor(
                         it.userProfile.setPic(UserPic.DEFAULT)
                     }
 
-                    prefs.lastProfileUpdated = Instant.now()
-
                     // update dialog state
                     _uiState.update { it.copy(avatarDialogState = AvatarDialogState.NoAvatar) }
                 } else {
-                    avatarUploadManager.uploadAvatar(profilePicture)
+                    avatarUploadManager.uploadAvatar(profilePicture, isReupload = false)
 
                     // We'll have to refetch the recipient to get the new avatar
                     val selfRecipient = recipientRepository.getSelf()
@@ -444,8 +441,6 @@ class SettingsViewModel @Inject constructor(
         configFactory.withMutableUserConfigs {
             it.userProfile.setName(name)
         }
-
-        prefs.lastProfileUpdated = Instant.now()
     }
 
     fun onCommand(command: Commands) {

app/src/main/proto/SignalService.proto

@@ -122,7 +122,7 @@ message DataMessage {
   message LokiProfile {
     optional string displayName = 1;
     optional string profilePicture = 2;
-    optional uint64 lastProfileUpdateMs = 3;
+    optional uint64 lastProfileUpdateSeconds = 3;
   }
 
   message OpenGroupInvitation {

gradle/libs.versions.toml

@@ -29,7 +29,7 @@ kotlinVersion = "2.2.10"
 kryoVersion = "5.6.2"
 kspVersion = "2.2.10-2.0.2"
 legacySupportV13Version = "1.0.0"
-libsessionUtilAndroidVersion = "1.0.7"
+libsessionUtilAndroidVersion = "1.0.7-1-g5481c06"
 media3ExoplayerVersion = "1.8.0"
 mockitoCoreVersion = "5.19.0"
 navVersion = "2.9.3"