Mercury-IM/Mercury-IM
Mercury-IM/Mercury-IM
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Mercury-IM synced 2025-09-12 19:59:40 +02:00
Code Issues Projects Releases Wiki Activity

Fix fingerprint observe method

Browse source
This commit is contained in:
Paul Schaub 2020-07-13 15:54:11 +02:00
parent e63632ee0e
commit c14cc304b1
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
data/src/main/java/org/mercury_im/messenger/data/repository/RxOpenPgpRepository.java
View file

@ -281,16 +281,20 @@ public class RxOpenPgpRepository implements OpenPgpRepository {
AnnouncedOpenPgpContactKey.MODIFICATION_DATE, AnnouncedOpenPgpContactKey.MODIFICATION_DATE,
OpenPgpKeyFetchDate.FETCH_DATE, OpenPgpKeyFetchDate.FETCH_DATE,
OpenPgpKeyTrust.TRUST) OpenPgpKeyTrust.TRUST)
.from(AnnouncedOpenPgpContactKey.class) .from(AnnouncedOpenPgpContactKey.class)
.join(OpenPgpKeyFetchDate.class) .leftJoin(OpenPgpKeyFetchDate.class)
.on(AnnouncedOpenPgpContactKey.ACCOUNT_ID.eq(OpenPgpKeyFetchDate.ACCOUNT_ID) .on(AnnouncedOpenPgpContactKey.ACCOUNT_ID.eq(OpenPgpKeyFetchDate.ACCOUNT_ID)
.and(AnnouncedOpenPgpContactKey.OWNER.eq(OpenPgpKeyFetchDate.OWNER) .and(AnnouncedOpenPgpContactKey.OWNER.eq(OpenPgpKeyFetchDate.OWNER)
.and(AnnouncedOpenPgpContactKey.FINGERPRINT.eq(OpenPgpKeyFetchDate.FINGERPRINT)))) .and(AnnouncedOpenPgpContactKey.FINGERPRINT.eq(OpenPgpKeyFetchDate.FINGERPRINT))))
.join(OpenPgpKeyTrust.class)
.leftJoin(OpenPgpKeyTrust.class)
.on(OpenPgpKeyTrust.ACCOUNT_ID.eq(AnnouncedOpenPgpContactKey.ACCOUNT_ID) .on(OpenPgpKeyTrust.ACCOUNT_ID.eq(AnnouncedOpenPgpContactKey.ACCOUNT_ID)
.and(OpenPgpKeyTrust.OWNER.eq(AnnouncedOpenPgpContactKey.OWNER) .and(OpenPgpKeyTrust.OWNER.eq(AnnouncedOpenPgpContactKey.OWNER)
.and(OpenPgpKeyTrust.FINGERPRINT.eq(AnnouncedOpenPgpContactKey.FINGERPRINT)))) .and(OpenPgpKeyTrust.FINGERPRINT.eq(AnnouncedOpenPgpContactKey.FINGERPRINT))))
.where(AnnouncedOpenPgpContactKey.ACCOUNT_ID.eq(accountId).and(AnnouncedOpenPgpContactKey.OWNER.eq(owner))) .where(AnnouncedOpenPgpContactKey.ACCOUNT_ID.eq(accountId).and(AnnouncedOpenPgpContactKey.OWNER.eq(owner)))
.get().observableResult() .get().observableResult()
.map(ResultDelegate::toList) .map(ResultDelegate::toList)
.map(list -> { .map(list -> {