Merge branch 'dev' of github.com:loki-project/loki-messenger-android into private-group-chat

2025-12-03 12:32:17 +00:00 · 2020-02-04 13:23:23 +11:00
parent 5183a76575 079779f15a
commit 155c7f2b12
35 changed files with 147 additions and 153 deletions
--- a/src/org/thoughtcrime/securesms/loki/LokiThreadDatabase.kt
+++ b/src/org/thoughtcrime/securesms/loki/LokiThreadDatabase.kt
@@ -7,11 +7,7 @@ import org.thoughtcrime.securesms.database.Address
 import org.thoughtcrime.securesms.database.Database
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
-import org.thoughtcrime.securesms.loki.redesign.utilities.get
-import org.thoughtcrime.securesms.loki.redesign.utilities.getInt
-import org.thoughtcrime.securesms.loki.redesign.utilities.getLong
-import org.thoughtcrime.securesms.loki.redesign.utilities.getString
-import org.thoughtcrime.securesms.loki.redesign.utilities.insertOrUpdate
+import org.thoughtcrime.securesms.loki.redesign.utilities.*
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.internal.util.JsonUtil
@@ -67,7 +63,6 @@ class LokiThreadDatabase(context: Context, helper: SQLCipherOpenHelper) : Databa

    override fun setFriendRequestStatus(threadID: Long, friendRequestStatus: LokiThreadFriendRequestStatus) {
        if (threadID < 0) { return }
-
        val database = databaseHelper.writableDatabase
        val contentValues = ContentValues(2)
        contentValues.put(Companion.threadID, threadID)
@@ -152,7 +147,6 @@ class LokiThreadDatabase(context: Context, helper: SQLCipherOpenHelper) : Databa
        databaseHelper.writableDatabase.delete(publicChatTableName, "${Companion.threadID} = ?", arrayOf( threadID.toString() ))
    }

-    // region Session Restore
    fun addSessionRestoreDevice(threadID: Long, hexEncodedPublicKey: String) {
        val devices = getSessionRestoreDevices(threadID).toMutableSet()
        if (devices.add(hexEncodedPublicKey)) {
@@ -172,5 +166,4 @@ class LokiThreadDatabase(context: Context, helper: SQLCipherOpenHelper) : Databa
        TextSecurePreferences.setStringPreference(context, "session_restore_devices_$threadID", "")
        delegate?.handleSessionRestoreDevicesChanged(threadID)
    }
-    // endregion
 }
--- a/src/org/thoughtcrime/securesms/loki/MultiDeviceUtilities.kt
+++ b/src/org/thoughtcrime/securesms/loki/MultiDeviceUtilities.kt
@@ -6,12 +6,10 @@ import nl.komponents.kovenant.Promise
 import nl.komponents.kovenant.all
 import nl.komponents.kovenant.functional.bind
 import nl.komponents.kovenant.functional.map
-import nl.komponents.kovenant.then
 import nl.komponents.kovenant.toFailVoid
 import nl.komponents.kovenant.ui.successUi
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
-import org.thoughtcrime.securesms.crypto.PreKeyUtil
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil
 import org.thoughtcrime.securesms.database.Address
@@ -20,14 +18,11 @@ import org.thoughtcrime.securesms.logging.Log
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.sms.MessageSender
 import org.thoughtcrime.securesms.util.TextSecurePreferences
-import org.whispersystems.libsignal.util.guava.Optional
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
 import org.whispersystems.signalservice.loki.api.LokiStorageAPI
 import org.whispersystems.signalservice.loki.api.PairingAuthorisation
 import org.whispersystems.signalservice.loki.messaging.LokiThreadFriendRequestStatus
-import org.whispersystems.signalservice.loki.utilities.Analytics
 import org.whispersystems.signalservice.loki.utilities.recover
 import org.whispersystems.signalservice.loki.utilities.retryIfNeeded
 import java.util.*
@@ -44,7 +39,6 @@ fun checkForRevocation(context: Context) {
    DatabaseFactory.getLokiAPIDatabase(context).removePairingAuthorisations(ourDevice)
    LokiStorageAPI.shared.updateUserDeviceMappings()
  }.successUi {
-    Analytics.shared.track("Secondary Device Unlinked")
    TextSecurePreferences.setNeedsRevocationCheck(context, false)
    ApplicationContext.getInstance(context).clearData()
  }.fail { error ->
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkedDevicesActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkedDevicesActivity.kt
@@ -15,7 +15,7 @@ import network.loki.messenger.R
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.devicelist.Device
-import org.thoughtcrime.securesms.loki.DeviceListBottomSheetFragment
+import org.thoughtcrime.securesms.loki.redesign.views.DeviceEditingOptionsBottomSheet
 import org.thoughtcrime.securesms.loki.redesign.dialogs.EditDeviceNameDialog
 import org.thoughtcrime.securesms.loki.redesign.dialogs.EditDeviceNameDialogDelegate
 import org.thoughtcrime.securesms.loki.redesign.dialogs.LinkDeviceMasterModeDialog
@@ -104,7 +104,7 @@ class LinkedDevicesActivity : PassphraseRequiredActionBarActivity, LoaderManager
    }

    override fun onDeviceClick(device: Device) {
-        val bottomSheet = DeviceListBottomSheetFragment()
+        val bottomSheet = DeviceEditingOptionsBottomSheet()
        bottomSheet.onEditTapped = {
            bottomSheet.dismiss()
            val editDeviceNameDialog = EditDeviceNameDialog()
--- a/src/org/thoughtcrime/securesms/loki/redesign/fragments/ScanQRCodeFragmentV2.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/fragments/ScanQRCodeFragmentV2.kt
@@ -12,7 +12,7 @@ import network.loki.messenger.R
 import org.thoughtcrime.securesms.qr.ScanListener
 import org.thoughtcrime.securesms.qr.ScanningThread

-class ScanQRCodeFragmentV2 : Fragment() {
+class ScanQRCodeFragment : Fragment() {
    private val scanningThread = ScanningThread()
    var scanListener: ScanListener? = null
        set(value) { field = value; scanningThread.setScanListener(scanListener) }
--- a/src/org/thoughtcrime/securesms/loki/redesign/fragments/ScanQRCodeWrapperFragment.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/fragments/ScanQRCodeWrapperFragment.kt
@@ -28,7 +28,7 @@ class ScanQRCodeWrapperFragment : Fragment(), ScanQRCodePlaceholderFragmentDeleg
    private fun update() {
        val fragment: Fragment
        if (ContextCompat.checkSelfPermission(activity!!, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
-            val scanQRCodeFragment = ScanQRCodeFragmentV2()
+            val scanQRCodeFragment = ScanQRCodeFragment()
            scanQRCodeFragment.scanListener = this
            scanQRCodeFragment.message = message
            fragment = scanQRCodeFragment
--- a/src/org/thoughtcrime/securesms/loki/redesign/messaging/BackgroundPollWorker.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/messaging/BackgroundPollWorker.kt
@@ -10,7 +10,6 @@ import org.thoughtcrime.securesms.service.PersistentAlarmManagerListener
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope
 import org.whispersystems.signalservice.loki.api.LokiAPI
-import org.whispersystems.signalservice.loki.utilities.Analytics
 import java.util.concurrent.TimeUnit

 class BackgroundPollWorker : PersistentAlarmManagerListener() {
@@ -30,7 +29,6 @@ class BackgroundPollWorker : PersistentAlarmManagerListener() {

    override fun onAlarm(context: Context, scheduledTime: Long): Long {
        if (scheduledTime != 0L) {
-            Analytics.shared.track("Performed Background Fetch")
            val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context)
            val lokiAPIDatabase = DatabaseFactory.getLokiAPIDatabase(context)
            try {
--- a/src/org/thoughtcrime/securesms/loki/redesign/messaging/LokiAPIDatabase.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/messaging/LokiAPIDatabase.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki
+package org.thoughtcrime.securesms.loki.redesign.messaging

 import android.content.ContentValues
 import android.content.Context
@@ -88,7 +88,7 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
            }
            string
        }
-        val row = wrap(mapOf( Companion.hexEncodedPublicKey to hexEncodedPublicKey, swarm to swarmAsString ))
+        val row = wrap(mapOf(Companion.hexEncodedPublicKey to hexEncodedPublicKey, swarm to swarmAsString))
        database.insertOrUpdate(swarmCache, row, "${Companion.hexEncodedPublicKey} = ?", wrap(hexEncodedPublicKey))
    }

@@ -101,7 +101,7 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(

    override fun setLastMessageHashValue(target: LokiAPITarget, newValue: String) {
        val database = databaseHelper.writableDatabase
-        val row = wrap(mapOf( Companion.target to target.address, lastMessageHashValue to newValue ))
+        val row = wrap(mapOf(Companion.target to target.address, lastMessageHashValue to newValue))
        database.insertOrUpdate(lastMessageHashValueCache, row, "${Companion.target} = ?", wrap(target.address))
    }

@@ -116,7 +116,7 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
    override fun setReceivedMessageHashValues(newValue: Set<String>) {
        val database = databaseHelper.writableDatabase
        val receivedMessageHashValuesAsString = newValue.joinToString(", ")
-        val row = wrap(mapOf( userID to userPublicKey, receivedMessageHashValues to receivedMessageHashValuesAsString ))
+        val row = wrap(mapOf(userID to userPublicKey, receivedMessageHashValues to receivedMessageHashValuesAsString))
        database.insertOrUpdate(receivedMessageHashValuesCache, row, "$userID = ?", wrap(userPublicKey))
    }

@@ -148,7 +148,7 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
    override fun setLastMessageServerID(group: Long, server: String, newValue: Long) {
        val database = databaseHelper.writableDatabase
        val index = "$server.$group"
-        val row = wrap(mapOf( lastMessageServerIDCacheIndex to index, lastMessageServerID to newValue.toString() ))
+        val row = wrap(mapOf(lastMessageServerIDCacheIndex to index, lastMessageServerID to newValue.toString()))
        database.insertOrUpdate(lastMessageServerIDCache, row, "$lastMessageServerIDCacheIndex = ?", wrap(index))
    }

@@ -169,7 +169,7 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
    override fun setLastDeletionServerID(group: Long, server: String, newValue: Long) {
        val database = databaseHelper.writableDatabase
        val index = "$server.$group"
-        val row = wrap(mapOf( lastDeletionServerIDCacheIndex to index, lastDeletionServerID to newValue.toString() ))
+        val row = wrap(mapOf(lastDeletionServerIDCacheIndex to index, lastDeletionServerID to newValue.toString()))
        database.insertOrUpdate(lastDeletionServerIDCache, row, "$lastDeletionServerIDCacheIndex = ?", wrap(index))
    }

@@ -221,7 +221,7 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
    override fun setUserCount(userCount: Int, group: Long, server: String) {
        val database = databaseHelper.writableDatabase
        val index = "$server.$group"
-        val row = wrap(mapOf( publicChatID to index, LokiAPIDatabase.userCount to userCount.toString() ))
+        val row = wrap(mapOf(publicChatID to index, Companion.userCount to userCount.toString()))
        database.insertOrUpdate(userCountCache, row, "$publicChatID = ?", wrap(index))
    }
 }
--- a/src/org/thoughtcrime/securesms/loki/redesign/messaging/LokiPreKeyBundleDatabase.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/messaging/LokiPreKeyBundleDatabase.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki
+package org.thoughtcrime.securesms.loki.redesign.messaging

 import android.content.ContentValues
 import android.content.Context
--- a/src/org/thoughtcrime/securesms/loki/redesign/messaging/LokiPreKeyRecordDatabase.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/messaging/LokiPreKeyRecordDatabase.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki
+package org.thoughtcrime.securesms.loki.redesign.messaging

 import android.content.ContentValues
 import android.content.Context
--- a/src/org/thoughtcrime/securesms/loki/redesign/messaging/LokiPublicChatPoller.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/messaging/LokiPublicChatPoller.kt
@@ -120,33 +120,33 @@ class LokiPublicChatPoller(private val context: Context, private val group: Loki
        val attachments = message.attachments.mapNotNull { attachment ->
            if (attachment.kind != LokiPublicChatMessage.Attachment.Kind.Attachment) { return@mapNotNull null }
            SignalServiceAttachmentPointer(
-                    attachment.serverID,
-                    attachment.contentType,
-                    ByteArray(0),
-                    Optional.of(attachment.size),
-                    Optional.absent(),
-                    attachment.width, attachment.height,
-                    Optional.absent(),
-                    Optional.of(attachment.fileName),
-                    false,
-                    Optional.fromNullable(attachment.caption),
-                    attachment.url)
+                attachment.serverID,
+                attachment.contentType,
+                ByteArray(0),
+                Optional.of(attachment.size),
+                Optional.absent(),
+                attachment.width, attachment.height,
+                Optional.absent(),
+                Optional.of(attachment.fileName),
+                false,
+                Optional.fromNullable(attachment.caption),
+                attachment.url)
        }
        val linkPreview = message.attachments.firstOrNull { it.kind == LokiPublicChatMessage.Attachment.Kind.LinkPreview }
        val signalLinkPreviews = mutableListOf<SignalServiceDataMessage.Preview>()
        if (linkPreview != null) {
            val attachment = SignalServiceAttachmentPointer(
-                    linkPreview.serverID,
-                    linkPreview.contentType,
-                    ByteArray(0),
-                    Optional.of(linkPreview.size),
-                    Optional.absent(),
-                    linkPreview.width, linkPreview.height,
-                    Optional.absent(),
-                    Optional.of(linkPreview.fileName),
-                    false,
-                    Optional.fromNullable(linkPreview.caption),
-                    linkPreview.url)
+                linkPreview.serverID,
+                linkPreview.contentType,
+                ByteArray(0),
+                Optional.of(linkPreview.size),
+                Optional.absent(),
+                linkPreview.width, linkPreview.height,
+                Optional.absent(),
+                Optional.of(linkPreview.fileName),
+                false,
+                Optional.fromNullable(linkPreview.caption),
+                linkPreview.url)
            signalLinkPreviews.add(SignalServiceDataMessage.Preview(linkPreview.linkPreviewURL!!, linkPreview.linkPreviewTitle!!, Optional.of(attachment)))
        }
        val body = if (message.body == message.timestamp.toString()) "" else message.body // Workaround for the fact that the back-end doesn't accept messages without a body
@@ -161,7 +161,6 @@ class LokiPublicChatPoller(private val context: Context, private val group: Loki
                val senderDisplayName = "${message.displayName} (...${message.hexEncodedPublicKey.takeLast(8)})"
                DatabaseFactory.getLokiUserDatabase(context).setServerDisplayName(group.id, message.hexEncodedPublicKey, senderDisplayName)
            }
-
            val senderPublicKey = primaryDevice ?: message.hexEncodedPublicKey
            val serviceDataMessage = getDataMessage(message)
            val serviceContent = SignalServiceContent(serviceDataMessage, senderPublicKey, SignalServiceAddress.DEFAULT_DEVICE_ID, message.timestamp, false, false)
@@ -170,7 +169,6 @@ class LokiPublicChatPoller(private val context: Context, private val group: Loki
            } else {
                PushDecryptJob(context).handleTextMessage(serviceContent, serviceDataMessage, Optional.absent(), Optional.of(message.serverID))
            }
-
            // Update profile avatar if needed
            val senderRecipient = Recipient.from(context, Address.fromSerialized(senderPublicKey), false)
            if (message.avatar != null && message.avatar!!.url.isNotEmpty()) {
@@ -204,8 +202,7 @@ class LokiPublicChatPoller(private val context: Context, private val group: Loki
            } else {
                PushDecryptJob(context).handleSynchronizeSentTextMessage(transcript)
            }
-
-            // Loki - If we got a message from our master device then make sure our mappings stay in sync
+            // If we got a message from our master device then make sure our mappings stay in sync
            val recipient = Recipient.from(context, Address.fromSerialized(message.hexEncodedPublicKey), false)
            if (recipient.isOurMasterDevice && message.avatar != null) {
                val profileKey = message.avatar!!.profileKey
--- a/src/org/thoughtcrime/securesms/loki/redesign/messaging/LokiRSSFeedPoller.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/messaging/LokiRSSFeedPoller.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki
+package org.thoughtcrime.securesms.loki.redesign.messaging

 import android.content.Context
 import android.os.Handler
--- a/src/org/thoughtcrime/securesms/loki/redesign/messaging/LokiUserDatabase.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/messaging/LokiUserDatabase.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki
+package org.thoughtcrime.securesms.loki.redesign.messaging

 import android.content.ContentValues
 import android.content.Context
@@ -18,7 +18,6 @@ class LokiUserDatabase(context: Context, helper: SQLCipherOpenHelper) : Database
    companion object {
        // Shared
        private val displayName = "display_name"
-        private val profileAvatarUrl = "profile_avatar_url"
        // Display name cache
        private val displayNameTable = "loki_user_display_name_database"
        private val hexEncodedPublicKey = "hex_encoded_public_key"
@@ -70,7 +69,7 @@ class LokiUserDatabase(context: Context, helper: SQLCipherOpenHelper) : Database
        }
    }

-    override fun getProfileAvatarUrl(hexEncodedPublicKey: String): String? {
+    override fun getProfilePictureURL(hexEncodedPublicKey: String): String? {
        return if (hexEncodedPublicKey == TextSecurePreferences.getLocalNumber(context)) {
            TextSecurePreferences.getProfileAvatarUrl(context)
        } else {
--- a/src/org/thoughtcrime/securesms/loki/redesign/views/ConversationView.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/ConversationView.kt
@@ -53,7 +53,7 @@ class ConversationView : LinearLayout {
            val randomUsers = users.sorted() // Sort to provide a level of stability
            profilePictureView.hexEncodedPublicKey = randomUsers.getOrNull(0) ?: ""
            profilePictureView.additionalHexEncodedPublicKey = randomUsers.getOrNull(1) ?: ""
-            profilePictureView.isRSSFeed = thread.recipient.name == "Loki News" || thread.recipient.name == "Loki Messenger Updates"
+            profilePictureView.isRSSFeed = thread.recipient.name == "Loki News" || thread.recipient.name == "Session Updates"
        } else {
            profilePictureView.hexEncodedPublicKey = thread.recipient.address.toString()
            profilePictureView.additionalHexEncodedPublicKey = null
--- a/src/org/thoughtcrime/securesms/loki/redesign/views/DeviceEditingOptionsBottomSheet.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/DeviceEditingOptionsBottomSheet.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki
+package org.thoughtcrime.securesms.loki.redesign.views

 import android.os.Bundle
 import android.support.design.widget.BottomSheetDialogFragment
@@ -8,7 +8,7 @@ import android.view.ViewGroup
 import kotlinx.android.synthetic.main.fragment_device_list_bottom_sheet.*
 import network.loki.messenger.R

-public class DeviceListBottomSheetFragment : BottomSheetDialogFragment() {
+public class DeviceEditingOptionsBottomSheet : BottomSheetDialogFragment() {
    var onEditTapped: (() -> Unit)? = null
    var onUnlinkTapped: (() -> Unit)? = null

--- a/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt
@@ -61,7 +61,7 @@ class ProfilePictureView : RelativeLayout {
            glide.clear(imageView)
            if (hexEncodedPublicKey.isNotEmpty()) {
                val signalProfilePicture = Recipient.from(context, Address.fromSerialized(hexEncodedPublicKey), false).contactPhoto
-                if (signalProfilePicture != null && (signalProfilePicture as? ProfileContactPhoto)?.avatarObject != "0") {
+                if (signalProfilePicture != null && (signalProfilePicture as? ProfileContactPhoto)?.avatarObject != "0" && (signalProfilePicture as? ProfileContactPhoto)?.avatarObject != "") {
                    glide.load(signalProfilePicture).diskCacheStrategy(DiskCacheStrategy.ALL).circleCrop().into(imageView)
                } else {
                    val size = resources.getDimensionPixelSize(sizeID)
--- a/src/org/thoughtcrime/securesms/loki/redesign/views/SessionRestoreBannerView.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/SessionRestoreBannerView.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki
+package org.thoughtcrime.securesms.loki.redesign.views

 import android.content.Context
 import android.util.AttributeSet