@ -22,13 +22,16 @@ import android.view.inputmethod.InputMethodManager
import android.widget.Toast
import androidx.core.view.isVisible
import dagger.hilt.android.AndroidEntryPoint
import java.io.File
import java.security.SecureRandom
import javax.inject.Inject
import network.loki.messenger.BuildConfig
import network.loki.messenger.R
import network.loki.messenger.databinding.ActivitySettingsBinding
import network.loki.messenger.libsession_util.util.UserPic
import nl.komponents.kovenant.Promise
import nl.komponents.kovenant.all
import nl.komponents.kovenant.ui.alwaysUi
import nl.komponents.kovenant.ui.failUi
import nl.komponents.kovenant.ui.successUi
import org.session.libsession.avatars.AvatarHelper
import org.session.libsession.avatars.ProfileContactPhoto
@ -37,7 +40,7 @@ import org.session.libsession.snode.SnodeAPI
import org.session.libsession.utilities.*
import org.session.libsession.utilities.SSKEnvironment.ProfileManagerProtocol
import org.session.libsession.utilities.recipients.Recipient
import org.session.libsignal.utilities. getProperty
import org.session.libsignal.utilities. Log
import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
import org.thoughtcrime.securesms.avatar.AvatarSelection
import org.thoughtcrime.securesms.components.ProfilePictureView
@ -56,12 +59,10 @@ import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
import org.thoughtcrime.securesms.util.disableClipping
import org.thoughtcrime.securesms.util.push
import org.thoughtcrime.securesms.util.show
import java.io.File
import java.security.SecureRandom
import javax.inject.Inject
@AndroidEntryPoint
class SettingsActivity : PassphraseRequiredActionBarActivity ( ) {
private val TAG = " SettingsActivity "
@Inject
lateinit var configFactory : ConfigFactory
@ -233,41 +234,78 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
displayName : String ? = null
) {
binding . loader . isVisible = true
val promises = mutableListOf < Promise < * , Exception > > ( )
if ( displayName != null ) {
TextSecurePreferences . setProfileName ( this , displayName )
configFactory . user ?. setName ( displayName )
}
// Bail if we're not updating the profile picture in any way
if ( !is UpdatingProfilePicture ) return
val encodedProfileKey = ProfileKeyUtil . generateEncodedProfileKey ( this )
if ( isUpdatingProfilePicture ) {
if ( profilePicture != null ) {
promises . add ( ProfilePictureUtilities . upload ( profilePicture , encodedProfileKey , this ) )
} else {
val uploadProfilePicturePromise : Promise < * , Exception >
var removingProfilePic = false
// Adding a new profile picture?
if ( profilePicture != null ) {
uploadProfilePicturePromise = ProfilePictureUtilities . upload ( profilePicture , encodedProfileKey , this )
} else {
// If not then we must be removing the existing one.
// Note: To get a promise that will resolve / sync correctly we overwrite the existing profile picture with
// a 0 byte image.
removingProfilePic = true
val emptyByteArray = ByteArray ( 0 )
uploadProfilePicturePromise = ProfilePictureUtilities . upload ( emptyByteArray , encodedProfileKey , this )
}
// If the upload picture promise succeeded then we hit this successUi block
uploadProfilePicturePromise . successUi {
// If we successfully removed the profile picture on the network then we can clear the
// local data - otherwise it's weird to fail the online section but it _looks_ like it
// worked because we cleared the local image (also it denies them the chance to retry
// removal if we do it locally, and may result in them having a visible profile picture
// everywhere EXCEPT on their own device!).
if ( removingProfilePic ) {
MessagingModuleConfiguration . shared . storage . clearUserPic ( )
}
}
val compoundPromise = all ( promises )
compoundPromise . successUi { // Do this on the UI thread so that it happens before the alwaysUi clause below
val userConfig = configFactory . user
if ( isUpdatingProfilePicture ) {
AvatarHelper . setAvatar ( this , Address . fromSerialized ( TextSecurePreferences . getLocalNumber ( this ) !! ) , profilePicture )
TextSecurePreferences . setProfileAvatarId ( this , profilePicture ?. let { SecureRandom ( ) . nextInt ( ) } ?: 0 )
ProfileKeyUtil . setEncodedProfileKey ( this , encodedProfileKey )
// new config
val url = TextSecurePreferences . getProfilePictureURL ( this )
val profileKey = ProfileKeyUtil . getProfileKey ( this )
if ( profilePicture == null ) {
userConfig ?. setPic ( UserPic . DEFAULT )
} else if ( ! url . isNullOrEmpty ( ) && profileKey . isNotEmpty ( ) ) {
userConfig ?. setPic ( UserPic ( url , profileKey ) )
}
AvatarHelper . setAvatar ( this , Address . fromSerialized ( TextSecurePreferences . getLocalNumber ( this ) !! ) , profilePicture )
TextSecurePreferences . setProfileAvatarId ( this , profilePicture ?. let { SecureRandom ( ) . nextInt ( ) } ?: 0 )
ProfileKeyUtil . setEncodedProfileKey ( this , encodedProfileKey )
// new config
val url = TextSecurePreferences . getProfilePictureURL ( this )
val profileKey = ProfileKeyUtil . getProfileKey ( this )
// If we have a URL and a profile key then set the user's profile picture
if ( ! url . isNullOrEmpty ( ) && profileKey . isNotEmpty ( ) ) {
userConfig ?. setPic ( UserPic ( url , profileKey ) )
}
if ( userConfig != null && userConfig . needsDump ( ) ) {
configFactory . persist ( userConfig , SnodeAPI . nowWithOffset )
}
ConfigurationMessageUtilities . forceSyncConfigurationNowIfNeeded ( this @SettingsActivity )
}
compoundPromise . alwaysUi {
// Or if the promise failed to upload the new profile picture then we hit this failUi block
uploadProfilePicturePromise . failUi {
if ( removingProfilePic ) {
Log . e ( TAG , " Failed to remove profile picture " )
Toast . makeText ( this @SettingsActivity , R . string . profileDisplayPictureRemoveError , Toast . LENGTH _LONG ) . show ( )
} else {
Log . e ( TAG , " Failed to upload profile picture " )
Toast . makeText ( this @SettingsActivity , R . string . profileErrorUpdate , Toast . LENGTH _LONG ) . show ( )
}
}
// Finally, regardless of whether the promise succeeded or failed, we always hit this `alwaysUi` block
uploadProfilePicturePromise . alwaysUi {
if ( displayName != null ) {
binding . btnGroupNameDisplay . text = displayName
}
AL-Session
10 months ago
committed by
GitHub