From 669aa061ab1398323e201ae411a3e2d9e994c5a3 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Sat, 4 Jul 2020 20:13:35 +0200 Subject: [PATCH] Apply changes from Smack --- .../messenger/core/crypto/MercuryOpenPgpManager.java | 4 ---- libs/Smack | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/domain/src/main/java/org/mercury_im/messenger/core/crypto/MercuryOpenPgpManager.java b/domain/src/main/java/org/mercury_im/messenger/core/crypto/MercuryOpenPgpManager.java index d58cc16..46466f2 100644 --- a/domain/src/main/java/org/mercury_im/messenger/core/crypto/MercuryOpenPgpManager.java +++ b/domain/src/main/java/org/mercury_im/messenger/core/crypto/MercuryOpenPgpManager.java @@ -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); diff --git a/libs/Smack b/libs/Smack index 218403c..f1f0a3d 160000 --- a/libs/Smack +++ b/libs/Smack @@ -1 +1 @@ -Subproject commit 218403c362d306d38ea791d528f165fc64eb8189 +Subproject commit f1f0a3d61ac9698bfbc627db4b6fdde5e478c4d8