Mercury-IM/Mercury-IM
Mercury-IM
/
Mercury-IM
mirror of https://codeberg.org/Mercury-IM/Mercury-IM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Apply changes from Smack

This commit is contained in:
Paul Schaub 2020-07-04 20:13:35 +02:00
parent 30e7bd46a7
commit 669aa061ab
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
domain/src/main/java/org/mercury_im/messenger/core/crypto/MercuryOpenPgpManager.java
View File

@ -73,10 +73,6 @@ public class MercuryOpenPgpManager {
//() -> "RW8X-367S-A2C3-QYAL-VG6E-Z2IM");
//() -> "KISJ-5Z1T-FGDW-WMDK-SC2U-SQUA");
() -> "71ZA-Y416-UA7A-7NCE-3SNM-88EF");
PGPPublicKeyRingCollection keys = oxManager.getOpenPgpSelf().getAnyPublicKeys();
for (PGPPublicKeyRing key : keys) {
oxManager.getOpenPgpSelf().trust(new OpenPgpV4Fingerprint(key));
}
LOGGER.log(Level.INFO, "Successfully restored secret key backup!");
} catch (NoBackupFoundException | PubSubException.NotALeafNodeException | InvalidBackupCodeException e) {
LOGGER.log(Level.INFO, "Error restoring secret key backup.", e);

2
libs/Smack

@ -1 +1 @@
Subproject commit 218403c362d306d38ea791d528f165fc64eb8189
Subproject commit f1f0a3d61ac9698bfbc627db4b6fdde5e478c4d8