Build: #1765 failed Changes by Paul Schaub <vanitasvitae@fsfe.org> and Florian Schmaus <flo@geekplace.eu>
Code commits
Smack (master)
-
Florian Schmaus <flo@geekplace.eu> 2edf27f5da17d34cf1e13173eff9079a33eeb7e2
Merge pull request #406 from vanitasvitae/oxSecretKeyBackupRestore
OX: Improvements to Secret key backup restore function -
Florian Schmaus <flo@geekplace.eu> dad2a1ad2efde6934ba33e8baad58622af7ec91b
Bump MiniDNS version to 1.0.0
-
Florian Schmaus <flo@geekplace.eu> 7d6374b04b0cff761d2fdf730871467015b3031c
Bump jXMPP version to 1.0.0
-
Florian Schmaus <flo@geekplace.eu> 2b423b911e11a772487ebcbd2eab767b599c2988
Merge branch 'master' of github.com:igniterealtime/Smack
-
Paul Schaub <vanitasvitae@fsfe.org> 2f98bb25e2d5815b88e61c426901a7ccf3209f1c
OX: Fix incorrect documentation URL
-
Paul Schaub <vanitasvitae@fsfe.org> 15b8a81493a14d58bc68ace499a58d72fa0fee09
OX: Trust secret key upon backup import
-
Florian Schmaus <flo@geekplace.eu> 81cccaab91523fe5959e21cf32ad18e658602e76
Merge pull request #408 from vanitasvitae/secretKeyBackupPassword
Allow user-supplied secret key backup passphrases -
Florian Schmaus <flo@geekplace.eu> 037bf3a27c412d02756f854013c0b65349768ed2
Merge pull request #407 from vanitasvitae/oxDeadCode
OX-IM: Remove redundant code to add self to recipients -
Paul Schaub <vanitasvitae@fsfe.org> 6e57ea0873e45acd70855a1149f9ee4cbf231cd3
Allow user-supplied secret key backup passphrases
Instead of passing the passphrase back to the user via a
DisplayBackupCodeCallback, we directly return the passphrase
which is now represented by a class.
Also we now allow the user to provide the passphrase.- smack-integration-test/src/main/java/org/jivesoftware/smackx/ox/OXSecretKeyBackupIntegrationTest.java (version 6e57ea0873e45acd70855a1149f9ee4cbf231cd3) (diffs)
- smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java (version 6e57ea0873e45acd70855a1149f9ee4cbf231cd3) (diffs)
- smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpSecretKeyBackupPassphrase.java (version 6e57ea0873e45acd70855a1149f9ee4cbf231cd3) (diffs)
- smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/callback/backup/AskForBackupCodeCallback.java (version 6e57ea0873e45acd70855a1149f9ee4cbf231cd3) (diffs)
- smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/callback/backup/DisplayBackupCodeCallback.java (version 6e57ea0873e45acd70855a1149f9ee4cbf231cd3) (diffs)
- smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/SecretKeyBackupHelper.java (version 6e57ea0873e45acd70855a1149f9ee4cbf231cd3) (diffs)
- smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/OpenPgpSecretKeyBackupPassphraseTest.java (version 6e57ea0873e45acd70855a1149f9ee4cbf231cd3) (diffs)
- smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/SecretKeyBackupHelperTest.java (version 6e57ea0873e45acd70855a1149f9ee4cbf231cd3) (diffs)
-
Paul Schaub <vanitasvitae@fsfe.org> 075e65ad40d856471804b088b9491c73d384c052
Fix indentation
-
Paul Schaub <vanitasvitae@fsfe.org> bb3c491e0c88661506bdee2100004c029b065943
StringUtils: Fix typo and expose unambiguous alphabet as string
-
Paul Schaub <vanitasvitae@fsfe.org> a587827ef8f646ffad3e7db67d95836e58bf16fb
Remove unnecessary lines from OX backup restore routine
-
Florian Schmaus <flo@geekplace.eu> d3a99a133ae39bb822c1daa047e4ca22ebfa6228
[core] Fix log/exception message of XmppElementUtil
The Class.toString() already prefixes the resulting string with "class
", no need to state it explicitly in the log message that this is a
class. -
Paul Schaub <vanitasvitae@fsfe.org> 9fd2c6f9ec1a9884977d40b779fdfa787a357f75
OX-IM: Remove redundant code to add self to recipients