Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Inline the GV1 forced migration flag.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-06-08 12:42:51 -04:00
committed by GitHub
parent cf361334c4
commit 0972d8f1e1
16 changed files with 15 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1067,7 +1067,7 @@ private static final String[] GROUP_PROJECTION = {
return GroupAccessControl.ALL_MEMBERS;
}
return GroupAccessControl.ONLY_ADMINS;
} else if (isV1Group() && FeatureFlags.groupsV1ForcedMigration()) {
} else if (isV1Group()) {
return GroupAccessControl.NO_ONE;
} else {
return id.isV1() ? GroupAccessControl.ALL_MEMBERS : GroupAccessControl.ONLY_ADMINS;
@@ -1083,7 +1083,7 @@ private static final String[] GROUP_PROJECTION = {
return GroupAccessControl.ALL_MEMBERS;
}
return GroupAccessControl.ONLY_ADMINS;
} else if (isV1Group() && FeatureFlags.groupsV1ForcedMigration()) {
} else if (isV1Group()) {
return GroupAccessControl.NO_ONE;
} else {
return GroupAccessControl.ALL_MEMBERS;

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

@@ -140,7 +140,6 @@ public class RecipientDatabase extends Database {
private static final String PROFILE_JOINED_NAME = "profile_joined_name";
private static final String MENTION_SETTING = "mention_setting";
private static final String STORAGE_PROTO = "storage_proto";
private static final String LAST_GV1_MIGRATE_REMINDER = "last_gv1_migrate_reminder";
private static final String LAST_SESSION_RESET = "last_session_reset";
private static final String WALLPAPER = "wallpaper";
private static final String WALLPAPER_URI = "wallpaper_file";
@@ -359,7 +358,6 @@ public class RecipientDatabase extends Database {
MENTION_SETTING + " INTEGER DEFAULT " + MentionSetting.ALWAYS_NOTIFY.getId() + ", " +
STORAGE_PROTO + " TEXT DEFAULT NULL, " +
CAPABILITIES + " INTEGER DEFAULT 0, " +
LAST_GV1_MIGRATE_REMINDER + " INTEGER DEFAULT 0, " +
LAST_SESSION_RESET + " BLOB DEFAULT NULL, " +
WALLPAPER + " BLOB DEFAULT NULL, " +
WALLPAPER_URI + " TEXT DEFAULT NULL, " +
@@ -1583,27 +1581,6 @@ public class RecipientDatabase extends Database {
}
}
public void markGroupsV1MigrationReminderSeen(@NonNull RecipientId id, long time) {
ContentValues values = new ContentValues(1);
values.put(LAST_GV1_MIGRATE_REMINDER, time);
if (update(id, values)) {
Recipient.live(id).refresh();
}
}
public long getGroupsV1MigrationReminderLastSeen(@NonNull RecipientId id) {
SQLiteDatabase db = databaseHelper.getReadableDatabase();
try (Cursor cursor = db.query(TABLE_NAME, new String[] { LAST_GV1_MIGRATE_REMINDER }, ID_WHERE, SqlUtil.buildArgs(id), null, null, null)) {
if (cursor.moveToFirst()) {
return CursorUtil.requireLong(cursor, LAST_GV1_MIGRATE_REMINDER);
}
}
return 0;
}
public void setLastSessionResetTime(@NonNull RecipientId id, DeviceLastResetTime lastResetTime) {
ContentValues values = new ContentValues(1);
values.put(LAST_SESSION_RESET, lastResetTime.toByteArray());