empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix issue where we weren't calling setTransactionSuccessful().

Browse source 
In a chain of events, this manifested by preventing the persistence of
media messages in group threads.
This commit is contained in:
Greyson Parrelli 2020-11-04 20:07:57 -05:00
parent 01b9cb13b4
commit e0657d09d8
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
View file

@ -616,12 +616,14 @@ public class RecipientDatabase extends Database {
Optional<RecipientId> existing = getByColumn(GROUP_ID, groupId.toString()); Optional<RecipientId> existing = getByColumn(GROUP_ID, groupId.toString());
if (existing.isPresent()) { if (existing.isPresent()) {
db.setTransactionSuccessful();
return existing.get(); return existing.get();
} }
if (groupId.isV1()) { if (groupId.isV1()) {
Optional<RecipientId> v2 = getByGroupId(groupId.requireV1().deriveV2MigrationGroupId()); Optional<RecipientId> v2 = getByGroupId(groupId.requireV1().deriveV2MigrationGroupId());
if (v2.isPresent()) { if (v2.isPresent()) {
db.setTransactionSuccessful();
return v2.get(); return v2.get();
} }
} }
@ -629,6 +631,7 @@ public class RecipientDatabase extends Database {
if (groupId.isV2()) { if (groupId.isV2()) {
Optional<GroupDatabase.GroupRecord> v1 = DatabaseFactory.getGroupDatabase(context).getGroupV1ByExpectedV2(groupId.requireV2()); Optional<GroupDatabase.GroupRecord> v1 = DatabaseFactory.getGroupDatabase(context).getGroupV1ByExpectedV2(groupId.requireV2());
if (v1.isPresent()) { if (v1.isPresent()) {
db.setTransactionSuccessful();
return v1.get().getRecipientId(); return v1.get().getRecipientId();
} }
} }
@ -636,7 +639,6 @@ public class RecipientDatabase extends Database {
RecipientId id = getOrInsertFromGroupId(groupId); RecipientId id = getOrInsertFromGroupId(groupId);
db.setTransactionSuccessful(); db.setTransactionSuccessful();
return id; return id;
} finally { } finally {
db.endTransaction(); db.endTransaction();