mirror of
https://github.com/oxen-io/session-android.git
synced 2023-12-14 02:53:01 +01:00
fix: compile errors
This commit is contained in:
parent
cf27760d01
commit
c861d571f8
|
@ -7,7 +7,6 @@ import androidx.core.view.isVisible
|
|||
import androidx.recyclerview.widget.RecyclerView
|
||||
import network.loki.messenger.R
|
||||
import network.loki.messenger.databinding.MediaOverviewGalleryItemBinding
|
||||
import org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
|
||||
import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord
|
||||
import org.thoughtcrime.securesms.mms.GlideApp
|
||||
import org.thoughtcrime.securesms.util.MediaUtil
|
||||
|
@ -68,11 +67,11 @@ class MediaGalleryAdapter(private val itemClickListener: ItemClickListener): Rec
|
|||
val slide = MediaUtil.getSlideForAttachment(itemView.context, item.attachment)
|
||||
|
||||
if (slide != null) {
|
||||
binding.image.setImageResource(glide, slide, false, false)
|
||||
binding.image.root.setImageResource(glide, slide, false, null)
|
||||
}
|
||||
|
||||
binding.image.setOnClickListener { itemClickListener.onMediaClicked(item) }
|
||||
binding.image.setOnLongClickListener {
|
||||
binding.image.root.setOnClickListener { itemClickListener.onMediaClicked(item) }
|
||||
binding.image.root.setOnLongClickListener {
|
||||
itemClickListener.onMediaLongClicked(item)
|
||||
true
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@ import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
|
|||
|
||||
class ConversationNotificationSettingsActivityContract: ActivityResultContract<Long, Unit>() {
|
||||
|
||||
override fun createIntent(context: Context, input: Long?): Intent =
|
||||
override fun createIntent(context: Context, input: Long): Intent =
|
||||
Intent(context, ConversationNotificationSettingsActivity::class.java).apply {
|
||||
putExtra(ConversationActivityV2.THREAD_ID, input)
|
||||
}
|
||||
|
|
|
@ -12,7 +12,7 @@ sealed class ConversationSettingsActivityResult {
|
|||
|
||||
class ConversationSettingsActivityContract: ActivityResultContract<Long, ConversationSettingsActivityResult>() {
|
||||
|
||||
override fun createIntent(context: Context, input: Long?) = Intent(context, ConversationSettingsActivity::class.java).apply {
|
||||
override fun createIntent(context: Context, input: Long) = Intent(context, ConversationSettingsActivity::class.java).apply {
|
||||
putExtra(ConversationActivityV2.THREAD_ID, input ?: -1L)
|
||||
}
|
||||
|
||||
|
|
|
@ -10,10 +10,8 @@ import android.text.style.ForegroundColorSpan
|
|||
import android.text.style.URLSpan
|
||||
import android.text.util.Linkify
|
||||
import android.util.AttributeSet
|
||||
import android.view.LayoutInflater
|
||||
import android.view.MotionEvent
|
||||
import android.view.View
|
||||
import android.widget.LinearLayout
|
||||
import androidx.annotation.ColorInt
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.constraintlayout.widget.ConstraintLayout
|
||||
|
@ -26,6 +24,7 @@ import androidx.core.view.isVisible
|
|||
import network.loki.messenger.R
|
||||
import network.loki.messenger.databinding.ViewVisibleMessageContentBinding
|
||||
import okhttp3.HttpUrl
|
||||
import org.session.libsession.messaging.MessagingModuleConfiguration
|
||||
import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress
|
||||
import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment
|
||||
import org.session.libsession.utilities.getColorFromAttr
|
||||
|
@ -64,7 +63,6 @@ class VisibleMessageContentView : ConstraintLayout {
|
|||
glide: GlideRequests,
|
||||
thread: Recipient,
|
||||
searchQuery: String?,
|
||||
contactIsTrusted: Boolean,
|
||||
onAttachmentNeedsDownload: (Long, Long) -> Unit
|
||||
) {
|
||||
// Background
|
||||
|
@ -90,7 +88,6 @@ class VisibleMessageContentView : ConstraintLayout {
|
|||
binding.bodyTextView.isVisible = false
|
||||
binding.quoteView.root.isVisible = false
|
||||
binding.linkPreviewView.root.isVisible = false
|
||||
binding.untrustedView.root.isVisible = false
|
||||
binding.voiceMessageView.root.isVisible = false
|
||||
binding.documentView.root.isVisible = false
|
||||
binding.albumThumbnailView.root.isVisible = false
|
||||
|
|
|
@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.database
|
|||
|
||||
import android.content.ContentValues
|
||||
import android.content.Context
|
||||
import androidx.core.database.getStringOrNull
|
||||
import android.database.Cursor
|
||||
import org.session.libsession.messaging.contacts.Contact
|
||||
import org.session.libsignal.utilities.Base64
|
||||
|
@ -87,20 +86,6 @@ class SessionContactDatabase(context: Context, helper: SQLCipherOpenHelper) : Da
|
|||
return contact
|
||||
}
|
||||
|
||||
fun contactFromCursor(cursor: android.database.Cursor): Contact {
|
||||
val sessionID = cursor.getString(cursor.getColumnIndexOrThrow(sessionID))
|
||||
val contact = Contact(sessionID)
|
||||
contact.name = cursor.getStringOrNull(cursor.getColumnIndexOrThrow(name))
|
||||
contact.nickname = cursor.getStringOrNull(cursor.getColumnIndexOrThrow(nickname))
|
||||
contact.profilePictureURL = cursor.getStringOrNull(cursor.getColumnIndexOrThrow(profilePictureURL))
|
||||
contact.profilePictureFileName = cursor.getStringOrNull(cursor.getColumnIndexOrThrow(profilePictureFileName))
|
||||
cursor.getStringOrNull(cursor.getColumnIndexOrThrow(profilePictureEncryptionKey))?.let {
|
||||
contact.profilePictureEncryptionKey = Base64.decode(it)
|
||||
}
|
||||
contact.threadID = cursor.getLong(cursor.getColumnIndexOrThrow(threadID))
|
||||
return contact
|
||||
}
|
||||
|
||||
fun queryContactsByName(constraint: String): Cursor {
|
||||
return databaseHelper.readableDatabase.query(
|
||||
sessionContactTable, null, " $name LIKE ? OR $nickname LIKE ?", arrayOf(
|
||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue