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

Minor changes to front-end and interface to handle no implementation

Browse source
This commit is contained in:
Philip Whitehouse 2016-10-24 12:40:31 +01:00
parent 7774ebc788
commit 25cba114a6
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -330,7 +330,8 @@ class ImapConnection {
private void authenticate() throws MessagingException, IOException {
switch (settings.getAuthType()) {
case XOAUTH2:
if (hasCapability(Capabilities.AUTH_XOAUTH2) && hasCapability(Capabilities.SASL_IR)) {
if (hasCapability(Capabilities.AUTH_XOAUTH2) && hasCapability(Capabilities.SASL_IR)
&& oauthTokenProvider != null) {
authXoauth2withSASLIR();
} else {
throw new MessagingException("Server doesn't support SASL XOAUTH2.");

2
k9mail-library/src/main/java/com/fsck/k9/mail/transport/SmtpTransport.java
View file

@ -354,7 +354,7 @@ public class SmtpTransport extends Transport {
}
break;
case XOAUTH2:
if (authXoauth2Supported) {
if (authXoauth2Supported && oauthTokenProvider != null) {
saslXoauth2(mUsername);
} else {
throw new MessagingException("Authentication method XOAUTH2 is unavailable.");

2
k9mail/src/main/java/com/fsck/k9/Account.java
View file

@ -1287,7 +1287,7 @@ public class Account implements BaseAccount, StoreConfig {
}
public Store getRemoteStore() throws MessagingException {
return RemoteStore.getInstance(K9.app, this);
return RemoteStore.getInstance(K9.app, this, null);
}
// It'd be great if this actually went into the store implementation

2
k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
View file

@ -475,7 +475,7 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList
if (!(account.getRemoteStore() instanceof WebDavStore)) {
publishProgress(R.string.account_setup_check_settings_check_outgoing_msg);
}
Transport transport = Transport.getInstance(K9.app, account);
Transport transport = Transport.getInstance(K9.app, account, null);
transport.close();
try {
transport.open();

2
k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
View file

@ -2973,7 +2973,7 @@ public class MessagingController {
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "Scanning folder '" + account.getOutboxFolderName() + "' (" + localFolder.getId() + ") for messages to send");
Transport transport = Transport.getInstance(K9.app, account);
Transport transport = Transport.getInstance(K9.app, account, null);
for (LocalMessage message : localMessages) {
if (message.isSet(Flag.DELETED)) {
message.destroy();