Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

GroupId for GV2.

Browse Source
This commit is contained in:
Alan Evans
2020-03-27 11:28:48 -03:00
committed by GitHub
parent d8fa46c558
commit 66c7f8bcb2
10 changed files with 358 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPoin
import java.io.Closeable;
import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -233,7 +232,7 @@ public class GroupDatabase extends Database {
contentValues.put(AVATAR_RELAY, relay);
contentValues.put(TIMESTAMP, System.currentTimeMillis());
contentValues.put(ACTIVE, 1);
contentValues.put(MMS, groupId.isMmsGroup());
contentValues.put(MMS, groupId.isMms());
databaseHelper.getWritableDatabase().insert(TABLE_NAME, null, contentValues);

6
app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
View File

@@ -356,7 +356,7 @@ public class RecipientDatabase extends Database {
if (result.neededInsert) {
ContentValues values = new ContentValues();
if (groupId.isMmsGroup()) {
if (groupId.isMms()) {
values.put(GROUP_TYPE, GroupType.MMS.getId());
} else {
values.put(GROUP_TYPE, GroupType.SIGNAL_V1.getId());
@@ -1406,9 +1406,9 @@ public class RecipientDatabase extends Database {
db.update(TABLE_NAME, setBlocked, UUID + " = ?", new String[] { uuid });
}
List<GroupId> groupIdStrings = Stream.of(groupIds).map(GroupId::v1).toList();
List<GroupId.V1> groupIdStrings = Stream.of(groupIds).map(GroupId::v1).toList();
for (GroupId groupId : groupIdStrings) {
for (GroupId.V1 groupId : groupIdStrings) {
db.update(TABLE_NAME, setBlocked, GROUP_ID + " = ?", new String[] { groupId.toString() });
}