SES-2651 - New avatar picker
Updated the avatar picker to match the designs. Had to rewrite it in Compose and moved the logic to the VM. We could moev the whole settings page to compose in another step now that we have the VM set up.pull/1659/head
ThomasSession
8 months ago
parent
c6333384da
commit
c0bf015049
@ -1,45 +1,111 @@
|
|||||||
package org.session.libsession.utilities
|
package org.session.libsession.utilities
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import nl.komponents.kovenant.Promise
|
import kotlinx.coroutines.DelicateCoroutinesApi
|
||||||
import nl.komponents.kovenant.deferred
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.GlobalScope
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
import okio.Buffer
|
import okio.Buffer
|
||||||
|
import org.session.libsession.avatars.AvatarHelper
|
||||||
import org.session.libsession.messaging.file_server.FileServerApi
|
import org.session.libsession.messaging.file_server.FileServerApi
|
||||||
import org.session.libsignal.streams.ProfileCipherOutputStream
|
import org.session.libsession.utilities.Address.Companion.fromSerialized
|
||||||
import org.session.libsignal.utilities.ProfileAvatarData
|
import org.session.libsession.utilities.TextSecurePreferences.Companion.getLastProfilePictureUpload
|
||||||
|
import org.session.libsession.utilities.TextSecurePreferences.Companion.getLocalNumber
|
||||||
|
import org.session.libsession.utilities.TextSecurePreferences.Companion.getProfileKey
|
||||||
|
import org.session.libsession.utilities.TextSecurePreferences.Companion.setLastProfilePictureUpload
|
||||||
import org.session.libsignal.streams.DigestingRequestBody
|
import org.session.libsignal.streams.DigestingRequestBody
|
||||||
|
import org.session.libsignal.streams.ProfileCipherOutputStream
|
||||||
import org.session.libsignal.streams.ProfileCipherOutputStreamFactory
|
import org.session.libsignal.streams.ProfileCipherOutputStreamFactory
|
||||||
|
import org.session.libsignal.utilities.Log
|
||||||
|
import org.session.libsignal.utilities.ProfileAvatarData
|
||||||
|
import org.session.libsignal.utilities.ThreadUtils.queue
|
||||||
import org.session.libsignal.utilities.retryIfNeeded
|
import org.session.libsignal.utilities.retryIfNeeded
|
||||||
import org.session.libsignal.utilities.ThreadUtils
|
|
||||||
import java.io.ByteArrayInputStream
|
import java.io.ByteArrayInputStream
|
||||||
|
import java.io.ByteArrayOutputStream
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
object ProfilePictureUtilities {
|
object ProfilePictureUtilities {
|
||||||
|
|
||||||
fun upload(profilePicture: ByteArray, encodedProfileKey: String, context: Context): Promise<Unit, Exception> {
|
@OptIn(DelicateCoroutinesApi::class)
|
||||||
val deferred = deferred<Unit, Exception>()
|
fun resubmitProfilePictureIfNeeded(context: Context) {
|
||||||
ThreadUtils.queue {
|
GlobalScope.launch(Dispatchers.IO) {
|
||||||
|
// Files expire on the file server after a while, so we simply re-upload the user's profile picture
|
||||||
|
// at a certain interval to ensure it's always available.
|
||||||
|
val userPublicKey = getLocalNumber(context) ?: return@launch
|
||||||
|
val now = Date().time
|
||||||
|
val lastProfilePictureUpload = getLastProfilePictureUpload(context)
|
||||||
|
if (now - lastProfilePictureUpload <= 14 * 24 * 60 * 60 * 1000) return@launch
|
||||||
|
|
||||||
|
// Don't generate a new profile key here; we do that when the user changes their profile picture
|
||||||
|
Log.d("Loki-Avatar", "Uploading Avatar Started")
|
||||||
|
val encodedProfileKey =
|
||||||
|
getProfileKey(context)
|
||||||
|
try {
|
||||||
|
// Read the file into a byte array
|
||||||
|
val inputStream = AvatarHelper.getInputStreamFor(
|
||||||
|
context,
|
||||||
|
fromSerialized(userPublicKey)
|
||||||
|
)
|
||||||
|
val baos = ByteArrayOutputStream()
|
||||||
|
var count: Int
|
||||||
|
val buffer = ByteArray(1024)
|
||||||
|
while ((inputStream.read(buffer, 0, buffer.size)
|
||||||
|
.also { count = it }) != -1
|
||||||
|
) {
|
||||||
|
baos.write(buffer, 0, count)
|
||||||
|
}
|
||||||
|
baos.flush()
|
||||||
|
val profilePicture = baos.toByteArray()
|
||||||
|
// Re-upload it
|
||||||
|
upload(
|
||||||
|
profilePicture,
|
||||||
|
encodedProfileKey!!,
|
||||||
|
context
|
||||||
|
)
|
||||||
|
|
||||||
|
// Update the last profile picture upload date
|
||||||
|
setLastProfilePictureUpload(
|
||||||
|
context,
|
||||||
|
Date().time
|
||||||
|
)
|
||||||
|
|
||||||
|
Log.d("Loki-Avatar", "Uploading Avatar Finished")
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Log.e("Loki-Avatar", "Uploading avatar failed.")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun upload(profilePicture: ByteArray, encodedProfileKey: String, context: Context) {
|
||||||
val inputStream = ByteArrayInputStream(profilePicture)
|
val inputStream = ByteArrayInputStream(profilePicture)
|
||||||
val outputStream = ProfileCipherOutputStream.getCiphertextLength(profilePicture.size.toLong())
|
val outputStream =
|
||||||
|
ProfileCipherOutputStream.getCiphertextLength(profilePicture.size.toLong())
|
||||||
val profileKey = ProfileKeyUtil.getProfileKeyFromEncodedString(encodedProfileKey)
|
val profileKey = ProfileKeyUtil.getProfileKeyFromEncodedString(encodedProfileKey)
|
||||||
val pad = ProfileAvatarData(inputStream, outputStream, "image/jpeg", ProfileCipherOutputStreamFactory(profileKey))
|
val pad = ProfileAvatarData(
|
||||||
val drb = DigestingRequestBody(pad.data, pad.outputStreamFactory, pad.contentType, pad.dataLength, null)
|
inputStream,
|
||||||
|
outputStream,
|
||||||
|
"image/jpeg",
|
||||||
|
ProfileCipherOutputStreamFactory(profileKey)
|
||||||
|
)
|
||||||
|
val drb = DigestingRequestBody(
|
||||||
|
pad.data,
|
||||||
|
pad.outputStreamFactory,
|
||||||
|
pad.contentType,
|
||||||
|
pad.dataLength,
|
||||||
|
null
|
||||||
|
)
|
||||||
val b = Buffer()
|
val b = Buffer()
|
||||||
drb.writeTo(b)
|
drb.writeTo(b)
|
||||||
val data = b.readByteArray()
|
val data = b.readByteArray()
|
||||||
var id: Long = 0
|
var id: Long = 0
|
||||||
try {
|
|
||||||
|
// this can throw an error
|
||||||
id = retryIfNeeded(4) {
|
id = retryIfNeeded(4) {
|
||||||
FileServerApi.upload(data)
|
FileServerApi.upload(data)
|
||||||
}.get()
|
}.get()
|
||||||
} catch (e: Exception) {
|
|
||||||
deferred.reject(e)
|
|
||||||
}
|
|
||||||
TextSecurePreferences.setLastProfilePictureUpload(context, Date().time)
|
TextSecurePreferences.setLastProfilePictureUpload(context, Date().time)
|
||||||
val url = "${FileServerApi.server}/file/$id"
|
val url = "${FileServerApi.server}/file/$id"
|
||||||
TextSecurePreferences.setProfilePictureURL(context, url)
|
TextSecurePreferences.setProfilePictureURL(context, url)
|
||||||
deferred.resolve(Unit)
|
|
||||||
}
|
|
||||||
return deferred.promise
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue