TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 20:52:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge Signal 4.41.0

Browse Source
This commit is contained in:
Niels Andriesse
2019-08-07 16:48:54 +10:00
parent 781a8500df 56c17e32f1
commit 1822e87f7c
584 changed files with 9504 additions and 1558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/loki/FriendRequestView.kt
View File

@@ -112,7 +112,7 @@ class FriendRequestView(context: Context, attrs: AttributeSet?, defStyleAttr: In
if (message is MediaMmsMessageRecord && message.quote != null) { visibility = View.GONE; return }
val isTextMessage = message is SmsMessageRecord
if (!isTextMessage) return
val friendRequestStatus = database.getFriendRequestStatus(message!!.id)
val friendRequestStatus = database.getFriendRequestStatus(message.id)
if (!message.isOutgoing) {
visibility = if (friendRequestStatus == LokiMessageFriendRequestStatus.NONE) View.GONE else View.VISIBLE
buttonLinearLayout.visibility = if (friendRequestStatus != LokiMessageFriendRequestStatus.REQUEST_PENDING) View.GONE else View.VISIBLE

4
src/org/thoughtcrime/securesms/loki/LokiThreadDatabase.kt
View File

@@ -24,8 +24,8 @@ class LokiThreadDatabase(context: Context, helper: SQLCipherOpenHelper) : Databa
@JvmStatic val createSessionResetTableCommand = "CREATE TABLE $sessionResetTableName ($threadID INTEGER PRIMARY KEY, $sessionResetStatus INTEGER DEFAULT 0);"
}
override fun getThreadID(hexEncodePubKey: String): Long {
val address = Address.fromSerialized(hexEncodePubKey)
override fun getThreadID(hexEncodedPublicKey: String): Long {
val address = Address.fromSerialized(hexEncodedPublicKey)
val recipient = Recipient.from(context, address, false)
return DatabaseFactory.getThreadDatabase(context).getThreadIdFor(recipient)
}