@ -152,36 +152,36 @@ class LokiPublicChatPoller(private val context: Context, private val group: Loki
fun pollForNewMessages ( ) {
fun processIncomingMessage ( message : LokiPublicChatMessage ) {
// If the sender of the current message is not a s econdary device, we need to set the display name in the database
val primaryDevice = LokiDeviceLinkUtilities . getMasterHexEncodedPublicKey ( message . hexEncodedPublicKey ) . get ( )
if ( primaryDevice == null ) {
// If the sender of the current message is not a s lav e device, set the display name in the database
val masterHexEncodedPublicKey = LokiDeviceLinkUtilities . getMasterHexEncodedPublicKey ( message . hexEncodedPublicKey ) . get ( )
if ( masterHexEncodedPublicKey == null ) {
val senderDisplayName = " ${message.displayName} (... ${message.hexEncodedPublicKey.takeLast(8)} ) "
DatabaseFactory . getLokiUserDatabase ( context ) . setServerDisplayName ( group . id , message . hexEncodedPublicKey , senderDisplayName )
}
val sender PublicKey = primaryDevice ?: message . hexEncodedPublicKey
val sender HexEncodedPublicKey = masterHexEncodedPublicKey ?: message . hexEncodedPublicKey
val serviceDataMessage = getDataMessage ( message )
val serviceContent = SignalServiceContent ( serviceDataMessage , sender PublicKey, SignalServiceAddress . DEFAULT _DEVICE _ID , message . timestamp , false , false )
val serviceContent = SignalServiceContent ( serviceDataMessage , sender HexEncoded PublicKey, SignalServiceAddress . DEFAULT _DEVICE _ID , message . timestamp , false , false )
if ( serviceDataMessage . quote . isPresent || ( serviceDataMessage . attachments . isPresent && serviceDataMessage . attachments . get ( ) . size > 0 ) || serviceDataMessage . previews . isPresent ) {
PushDecryptJob ( context ) . handleMediaMessage ( serviceContent , serviceDataMessage , Optional . absent ( ) , Optional . of ( message . serverID ) )
} else {
PushDecryptJob ( context ) . handleTextMessage ( serviceContent , serviceDataMessage , Optional . absent ( ) , Optional . of ( message . serverID ) )
}
// Update profile avatar if needed
val sender Recipient = Recipient . from ( context , Address . fromSerialized ( sender PublicKey) , false )
// Update profile picture if needed
val sender As Recipient = Recipient . from ( context , Address . fromSerialized ( sender HexEncoded PublicKey) , false )
if ( message . profilePicture != null && message . profilePicture !! . url . isNotEmpty ( ) ) {
val profileKey = message . profilePicture !! . profileKey
val url = message . profilePicture !! . url
if ( sender Recipient. profileKey == null || ! MessageDigest . isEqual ( sender Recipient. profileKey , profileKey ) ) {
if ( sender As Recipient. profileKey == null || ! MessageDigest . isEqual ( sender As Recipient. profileKey , profileKey ) ) {
val database = DatabaseFactory . getRecipientDatabase ( context )
database . setProfileKey ( sender Recipient, profileKey )
ApplicationContext . getInstance ( context ) . jobManager . add ( RetrieveProfileAvatarJob ( sender Recipient, url ) )
database . setProfileKey ( sender As Recipient, profileKey )
ApplicationContext . getInstance ( context ) . jobManager . add ( RetrieveProfileAvatarJob ( sender As Recipient, url ) )
}
} else if ( sender Recipient. profileAvatar . orEmpty ( ) . isNotEmpty ( ) ) {
// Unset the avatar if we had an avatar before and we're not friends with the person
val threadI d = DatabaseFactory . getThreadDatabase ( context ) . getThreadIdFor ( sender Recipient)
val friendRequestStatus = DatabaseFactory . getLokiThreadDatabase ( context ) . getFriendRequestStatus ( threadI d )
} else if ( sender As Recipient. profileAvatar . orEmpty ( ) . isNotEmpty ( ) ) {
// Clear the profile picture if we had a profile picture before and we're not friends with the person
val threadI D = DatabaseFactory . getThreadDatabase ( context ) . getThreadIdFor ( sender As Recipient)
val friendRequestStatus = DatabaseFactory . getLokiThreadDatabase ( context ) . getFriendRequestStatus ( threadI D )
if ( friendRequestStatus != LokiThreadFriendRequestStatus . FRIENDS ) {
ApplicationContext . getInstance ( context ) . jobManager . add ( RetrieveProfileAvatarJob ( sender Recipient, " " ) )
ApplicationContext . getInstance ( context ) . jobManager . add ( RetrieveProfileAvatarJob ( sender As Recipient, " " ) )
}
}
}
@ -190,16 +190,16 @@ class LokiPublicChatPoller(private val context: Context, private val group: Loki
val isDuplicate = DatabaseFactory . getLokiMessageDatabase ( context ) . getMessageID ( messageServerID ) != null
if ( isDuplicate ) { return }
if ( message . body . isEmpty ( ) && message . attachments . isEmpty ( ) && message . quote == null ) { return }
val localNumber = TextSecurePreferences . getLocalNumber ( context )
val userHexEncodedPublicKey = TextSecurePreferences . getLocalNumber ( context )
val dataMessage = getDataMessage ( message )
val transcript = SentTranscriptMessage ( localNumber , dataMessage . timestamp , dataMessage , dataMessage . expiresInSeconds . toLong ( ) , Collections . singletonMap ( localNumber , false ) )
val transcript = SentTranscriptMessage ( userHexEncodedPublicKey , dataMessage . timestamp , dataMessage , dataMessage . expiresInSeconds . toLong ( ) , Collections . singletonMap ( userHexEncodedPublicKey , false ) )
transcript . messageServerID = messageServerID
if ( dataMessage . quote . isPresent || ( dataMessage . attachments . isPresent && dataMessage . attachments . get ( ) . size > 0 ) || dataMessage . previews . isPresent ) {
PushDecryptJob ( context ) . handleSynchronizeSentMediaMessage ( transcript )
} else {
PushDecryptJob ( context ) . handleSynchronizeSentTextMessage ( transcript )
}
// If we got a message from our master device then make sure our mapping s stay in sync
// If we got a message from our master device then make sure our mapping stays in sync
val recipient = Recipient . from ( context , Address . fromSerialized ( message . hexEncodedPublicKey ) , false )
if ( recipient . isOurMasterDevice && message . profilePicture != null ) {
val profileKey = message . profilePicture !! . profileKey
@ -222,7 +222,7 @@ class LokiPublicChatPoller(private val context: Context, private val group: Loki
api . getMessages ( group . channel , group . server )
} . bind { messages ->
if ( messages . isNotEmpty ( ) ) {
// We need to fetch device mappings for all the devices we don't have
// We need to fetch the device mapping for any devices we don't have
uniqueDevices = messages . map { it . hexEncodedPublicKey } . toSet ( )
val devicesToUpdate = uniqueDevices . filter { ! userDevices . contains ( it ) && LokiFileServerAPI . shared . hasDeviceLinkCacheExpired ( hexEncodedPublicKey = it ) }
if ( devicesToUpdate . isNotEmpty ( ) ) {
@ -231,14 +231,11 @@ class LokiPublicChatPoller(private val context: Context, private val group: Loki
}
Promise . of ( messages )
} . successBackground {
// Get the set of primary device pubKeys FROM the secondary devices in uniqueDevices
val newDisplayNameUpdatees = uniqueDevices . mapNotNull {
// This will return null if current device is primary
// So if it's non-null then we know the device is a secondary device
val primaryDevice = LokiDeviceLinkUtilities . getMasterHexEncodedPublicKey ( it ) . get ( )
primaryDevice
// This will return null if the current device is a master device
LokiDeviceLinkUtilities . getMasterHexEncodedPublicKey ( it ) . get ( )
} . toSet ( )
// Fetch the display names of the pri mary devices
// Fetch the display names of the master devices
displayNameUpdatees = displayNameUpdatees . union ( newDisplayNameUpdatees )
} . successBackground { messages ->
// Process messages in the background
Niels Andriesse
5 years ago