Apply changes from Smack
This commit is contained in:
parent
30e7bd46a7
commit
669aa061ab
|
@ -73,10 +73,6 @@ public class MercuryOpenPgpManager {
|
||||||
//() -> "RW8X-367S-A2C3-QYAL-VG6E-Z2IM");
|
//() -> "RW8X-367S-A2C3-QYAL-VG6E-Z2IM");
|
||||||
//() -> "KISJ-5Z1T-FGDW-WMDK-SC2U-SQUA");
|
//() -> "KISJ-5Z1T-FGDW-WMDK-SC2U-SQUA");
|
||||||
() -> "71ZA-Y416-UA7A-7NCE-3SNM-88EF");
|
() -> "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!");
|
LOGGER.log(Level.INFO, "Successfully restored secret key backup!");
|
||||||
} catch (NoBackupFoundException | PubSubException.NotALeafNodeException | InvalidBackupCodeException e) {
|
} catch (NoBackupFoundException | PubSubException.NotALeafNodeException | InvalidBackupCodeException e) {
|
||||||
LOGGER.log(Level.INFO, "Error restoring secret key backup.", e);
|
LOGGER.log(Level.INFO, "Error restoring secret key backup.", e);
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 218403c362d306d38ea791d528f165fc64eb8189
|
Subproject commit f1f0a3d61ac9698bfbc627db4b6fdde5e478c4d8
|
Loading…
Reference in New Issue