TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-13 10:57:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into ui

Browse Source
This commit is contained in:
Niels Andriesse
2021-06-11 13:41:50 +10:00
parent c79b9e3397 f4ae16239e
commit ed6db6f4e7
13 changed files with 1505 additions and 1397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

@@ -1025,6 +1025,7 @@ public class ConversationFragment extends Fragment
@Override
public void onItemClick(MessageRecord messageRecord) {
if (messageRecord.isUpdate()) return;
if (actionMode != null) {
((ConversationAdapter) list.getAdapter()).toggleSelection(messageRecord);
list.getAdapter().notifyDataSetChanged();
@@ -1040,6 +1041,7 @@ public class ConversationFragment extends Fragment
@Override
public void onItemLongClick(MessageRecord messageRecord) {
if (messageRecord.isUpdate()) return;
if (actionMode == null) {
((ConversationAdapter) list.getAdapter()).toggleSelection(messageRecord);
list.getAdapter().notifyDataSetChanged();

1
app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
View File

@@ -294,7 +294,6 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
ContentValues contents = new ContentValues();
contents.put(ZOMBIE_MEMBERS, Address.toSerializedList(members, ','));
contents.put(ACTIVE, 1);
databaseHelper.getWritableDatabase().update(TABLE_NAME, contents, GROUP_ID + " = ?",
new String[] {groupId});
}

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

@@ -428,6 +428,11 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
DatabaseFactory.getLokiAPIDatabase(context).removeAllClosedGroupEncryptionKeyPairs(groupPublicKey)
}
override fun setExpirationTimer(groupID: String, duration: Int) {
val recipient = Recipient.from(context, fromSerialized(groupID), false)
DatabaseFactory.getRecipientDatabase(context).setExpireMessages(recipient, duration);
}
override fun getAllV2OpenGroups(): Map<Long, OpenGroupV2> {
return DatabaseFactory.getLokiThreadDatabase(context).getAllV2OpenGroups()
}

3
app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
View File

@@ -318,9 +318,6 @@ class HomeActivity : PassphraseRequiredActionBarActivity(), ConversationClickLis
}
if (isClosedGroup) {
MessageSender.explicitLeave(groupPublicKey!!, false)
} else {
Toast.makeText(context, R.string.activity_home_leaving_group_failed_message, Toast.LENGTH_LONG).show()
return@launch
}
}
// Delete the conversation