wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some tidy-up

Browse source
This commit is contained in:
Philip Whitehouse 2017-03-26 12:54:01 +01:00
parent a05bbbbf8d
commit 29c013f876
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapConnection.java
View file

@ -387,16 +387,16 @@ class ImapConnection {
oauthTokenProvider.invalidateToken(settings.getUsername());
if (!retryXoauth2WithNewToken) {
return handlePermanentXoauth2Failure(e);
throw handlePermanentXoauth2Failure(e);
} else {
return handleTemporaryXoauth2Failure(e);
}
}
}
private List<ImapResponse> handlePermanentXoauth2Failure(NegativeImapResponseException e) throws AuthenticationFailedException {
Timber.v(e, "Permanent failure during XOAUTH2");
throw new AuthenticationFailedException(e.getMessage(), e);
private AuthenticationFailedException handlePermanentXoauth2Failure(NegativeImapResponseException e) {
Timber.v(e, "Permanent failure during XOAUTH2");
return new AuthenticationFailedException(e.getMessage(), e);
}
private List<ImapResponse> handleTemporaryXoauth2Failure(NegativeImapResponseException e) throws IOException, MessagingException {
@ -413,7 +413,7 @@ class ImapConnection {
//Invalidate the token anyway but assume it's permanent.
Timber.v(e, "Authentication exception for new token, permanent error assumed");
oauthTokenProvider.invalidateToken(settings.getUsername());
return handlePermanentXoauth2Failure(e2);
throw handlePermanentXoauth2Failure(e2);
}
}

2
k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapConnectionTest.java
View file

@ -945,7 +945,7 @@ public class ImapConnectionTest {
private void simplePostAuthenticationDialog(MockImapServer server, boolean requestCapabilities, int tag) {
if (requestCapabilities) {
server.expect(tag+" CAPABILITY");
server.expect(tag + " CAPABILITY");
server.output("* CAPABILITY IMAP4 IMAP4REV1 ");
server.output(tag+" OK CAPABILITY");
server.expect((tag+1) + " LIST \"\" \"\"");