|
|
|
@ -24,7 +24,6 @@ import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPoin
|
|
|
|
|
|
|
|
|
|
import java.io.Closeable;
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import java.security.NoSuchAlgorithmException;
|
|
|
|
|
import java.security.SecureRandom;
|
|
|
|
|
import java.util.Collections;
|
|
|
|
|
import java.util.LinkedList;
|
|
|
|
@ -52,6 +51,7 @@ public class GroupDatabase extends Database {
|
|
|
|
|
|
|
|
|
|
// Loki
|
|
|
|
|
private static final String AVATAR_URL = "avatar_url";
|
|
|
|
|
private static final String ADMINS = "admins";
|
|
|
|
|
|
|
|
|
|
public static final String CREATE_TABLE =
|
|
|
|
|
"CREATE TABLE " + TABLE_NAME +
|
|
|
|
@ -68,6 +68,7 @@ public class GroupDatabase extends Database {
|
|
|
|
|
ACTIVE + " INTEGER DEFAULT 1, " +
|
|
|
|
|
AVATAR_DIGEST + " BLOB, " +
|
|
|
|
|
AVATAR_URL + " TEXT, " +
|
|
|
|
|
ADMINS + "TEXT, " +
|
|
|
|
|
MMS + " INTEGER DEFAULT 0);";
|
|
|
|
|
|
|
|
|
|
public static final String[] CREATE_INDEXS = {
|
|
|
|
@ -76,7 +77,7 @@ public class GroupDatabase extends Database {
|
|
|
|
|
|
|
|
|
|
private static final String[] GROUP_PROJECTION = {
|
|
|
|
|
GROUP_ID, TITLE, MEMBERS, AVATAR, AVATAR_ID, AVATAR_KEY, AVATAR_CONTENT_TYPE, AVATAR_RELAY, AVATAR_DIGEST,
|
|
|
|
|
TIMESTAMP, ACTIVE, MMS, AVATAR_URL
|
|
|
|
|
TIMESTAMP, ACTIVE, MMS, AVATAR_URL, ADMINS
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static final List<String> TYPED_GROUP_PROJECTION = Stream.of(GROUP_PROJECTION).map(columnName -> TABLE_NAME + "." + columnName).toList();
|
|
|
|
@ -116,8 +117,9 @@ public class GroupDatabase extends Database {
|
|
|
|
|
return new Reader(cursor);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public String getOrCreateGroupForMembers(List<Address> members, boolean mms) {
|
|
|
|
|
public String getOrCreateGroupForMembers(List<Address> members, boolean mms, List<Address> admins) {
|
|
|
|
|
Collections.sort(members);
|
|
|
|
|
Collections.sort(admins);
|
|
|
|
|
|
|
|
|
|
Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, new String[] {GROUP_ID},
|
|
|
|
|
MEMBERS + " = ? AND " + MMS + " = ?",
|
|
|
|
@ -128,7 +130,7 @@ public class GroupDatabase extends Database {
|
|
|
|
|
return cursor.getString(cursor.getColumnIndexOrThrow(GROUP_ID));
|
|
|
|
|
} else {
|
|
|
|
|
String groupId = GroupUtil.getEncodedId(allocateGroupId(), mms);
|
|
|
|
|
create(groupId, null, members, null, null);
|
|
|
|
|
create(groupId, null, members, null, null, admins);
|
|
|
|
|
return groupId;
|
|
|
|
|
}
|
|
|
|
|
} finally {
|
|
|
|
@ -157,7 +159,7 @@ public class GroupDatabase extends Database {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void create(@NonNull String groupId, @Nullable String title, @NonNull List<Address> members,
|
|
|
|
|
@Nullable SignalServiceAttachmentPointer avatar, @Nullable String relay)
|
|
|
|
|
@Nullable SignalServiceAttachmentPointer avatar, @Nullable String relay, @Nullable List<Address> admins)
|
|
|
|
|
{
|
|
|
|
|
Collections.sort(members);
|
|
|
|
|
|
|
|
|
@ -179,6 +181,10 @@ public class GroupDatabase extends Database {
|
|
|
|
|
contentValues.put(ACTIVE, 1);
|
|
|
|
|
contentValues.put(MMS, GroupUtil.isMmsGroup(groupId));
|
|
|
|
|
|
|
|
|
|
if (admins != null) {
|
|
|
|
|
contentValues.put(ADMINS, Address.toSerializedList(admins, ','));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
databaseHelper.getWritableDatabase().insert(TABLE_NAME, null, contentValues);
|
|
|
|
|
|
|
|
|
|
Recipient.applyCached(Address.fromSerialized(groupId), recipient -> {
|
|
|
|
@ -260,6 +266,17 @@ public class GroupDatabase extends Database {
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void updateAdmins(String groupId, List<Address> admins) {
|
|
|
|
|
Collections.sort(admins);
|
|
|
|
|
|
|
|
|
|
ContentValues contents = new ContentValues();
|
|
|
|
|
contents.put(ADMINS, Address.toSerializedList(admins, ','));
|
|
|
|
|
contents.put(ACTIVE, 1);
|
|
|
|
|
|
|
|
|
|
databaseHelper.getWritableDatabase().update(TABLE_NAME, contents, GROUP_ID + " = ?",
|
|
|
|
|
new String[] {groupId});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void remove(String groupId, Address source) {
|
|
|
|
|
List<Address> currentMembers = getCurrentMembers(groupId);
|
|
|
|
|
currentMembers.remove(source);
|
|
|
|
@ -351,7 +368,8 @@ public class GroupDatabase extends Database {
|
|
|
|
|
cursor.getInt(cursor.getColumnIndexOrThrow(ACTIVE)) == 1,
|
|
|
|
|
cursor.getBlob(cursor.getColumnIndexOrThrow(AVATAR_DIGEST)),
|
|
|
|
|
cursor.getInt(cursor.getColumnIndexOrThrow(MMS)) == 1,
|
|
|
|
|
cursor.getString(cursor.getColumnIndexOrThrow(AVATAR_URL)));
|
|
|
|
|
cursor.getString(cursor.getColumnIndexOrThrow(AVATAR_URL)),
|
|
|
|
|
cursor.getString(cursor.getColumnIndexOrThrow(ADMINS)));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@ -375,10 +393,11 @@ public class GroupDatabase extends Database {
|
|
|
|
|
private final boolean active;
|
|
|
|
|
private final boolean mms;
|
|
|
|
|
private final String url;
|
|
|
|
|
private final List<Address> admins;
|
|
|
|
|
|
|
|
|
|
public GroupRecord(String id, String title, String members, byte[] avatar,
|
|
|
|
|
long avatarId, byte[] avatarKey, String avatarContentType,
|
|
|
|
|
String relay, boolean active, byte[] avatarDigest, boolean mms, String url)
|
|
|
|
|
String relay, boolean active, byte[] avatarDigest, boolean mms, String url, String admins)
|
|
|
|
|
{
|
|
|
|
|
this.id = id;
|
|
|
|
|
this.title = title;
|
|
|
|
@ -394,6 +413,9 @@ public class GroupDatabase extends Database {
|
|
|
|
|
|
|
|
|
|
if (!TextUtils.isEmpty(members)) this.members = Address.fromSerializedList(members, ',');
|
|
|
|
|
else this.members = new LinkedList<>();
|
|
|
|
|
|
|
|
|
|
if (!TextUtils.isEmpty(admins)) this.admins = Address.fromSerializedList(admins, ',');
|
|
|
|
|
else this.admins = new LinkedList<>();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public byte[] getId() {
|
|
|
|
@ -453,5 +475,7 @@ public class GroupDatabase extends Database {
|
|
|
|
|
public boolean isRSSFeed() { return Address.fromSerialized(id).isRSSFeed(); }
|
|
|
|
|
|
|
|
|
|
public String getUrl() { return url; }
|
|
|
|
|
|
|
|
|
|
public List<Address> getAdmins() { return admins; }
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|