TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 00:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

One to one migration refactor

Browse Source
This commit is contained in:
charles 2022-11-21 16:10:15 +11:00
parent 24a020b99f
commit 962e648bb8
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt
View File

@ -51,6 +51,8 @@ class ExpirationSettingsViewModel(
showExpirationTypeSelector = recipient?.isContactRecipient == true && recipient.isLocalNumber == false
if (recipient?.isLocalNumber == true || recipient?.isClosedGroupRecipient == true) {
_selectedExpirationType.value = ExpirationType.DELETE_AFTER_SEND
} else {
_selectedExpirationType.value = expirationConfig?.expirationType
}
_selectedExpirationTimer.value = when(expirationConfig?.expirationType) {
ExpirationType.DELETE_AFTER_SEND -> afterSendOptions.find { it.value.toIntOrNull() == expirationConfig?.durationSeconds }

4
app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
View File

@ -967,7 +967,9 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
threadDb.readerFor(threadDb.conversationList).use { reader ->
while (reader.next != null) {
val thread = reader.current
if (thread.recipient.isClosedGroupRecipient || thread.recipient.isContactRecipient) {
if (thread.threadId == threadId &&
(thread.recipient.isClosedGroupRecipient || thread.recipient.isContactRecipient)
) {
return ExpirationConfiguration(
thread.threadId,
thread.expiresIn.toInt(),

7
app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
View File

@ -159,11 +159,14 @@ public class ThreadDatabase extends Database {
}
public static String getUpdateOneToOneConversationExpiryTypeCommand() {
return "UPDATE " + TABLE_NAME + " SET " + EXPIRY_TYPE + " = 2 " +
return "UPDATE " + TABLE_NAME + " SET " + EXPIRY_TYPE + " = 2, " +
EXPIRES_IN + " = (SELECT " + RecipientDatabase.EXPIRE_MESSAGES + " FROM " + RecipientDatabase.TABLE_NAME +
" WHERE " + TABLE_NAME + "." + ADDRESS + " = " + RecipientDatabase.TABLE_NAME + "." + RecipientDatabase.ADDRESS + " AND " + RecipientDatabase.EXPIRE_MESSAGES + " > 0 )" +
"WHERE " + ADDRESS + " NOT LIKE '" + CLOSED_GROUP_PREFIX + "%'" +
"AND " + ADDRESS + " NOT LIKE '" + OPEN_GROUP_PREFIX + "%'" +
"AND " + ADDRESS + " NOT LIKE '" + OPEN_GROUP_INBOX_PREFIX + "%'" +
"AND " + EXPIRES_IN + " > 0";
"AND EXISTS (SELECT " + RecipientDatabase.EXPIRE_MESSAGES + " FROM " + RecipientDatabase.TABLE_NAME +
" WHERE " + TABLE_NAME + "." + ADDRESS + " = " + RecipientDatabase.TABLE_NAME + "." + RecipientDatabase.ADDRESS + " AND " + RecipientDatabase.EXPIRE_MESSAGES + " > 0 )";
}
public ThreadDatabase(Context context, SQLCipherOpenHelper databaseHelper) {