Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b1364bb authored by daquexian's avatar daquexian
Browse files

change Transport to TransportUri

parent 7e4d034a

k9mail/src/main/java/com/fsck/k9/Account.java

+5 −4
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.fsck.k9.mail.MessagingException; 
import com.fsck.k9.mail.NetworkType;

import com.fsck.k9.mail.Store;

import com.fsck.k9.mail.Folder.FolderClass;

import com.fsck.k9.mail.TransportUris;

import com.fsck.k9.mail.filter.Base64;

import com.fsck.k9.mail.store.RemoteStore;

import com.fsck.k9.mailstore.StorageManager;
@@ -1063,17 +1064,17 @@ public class Account implements BaseAccount, AccountConfig { 


    @Override

    public ConnectionSecurity getOutgoingSecurityType() {

        return Transport.decodeTransportUri(getTransportUri()).connectionSecurity;

        return TransportUris.decodeTransportUri(getTransportUri()).connectionSecurity;

    }



    @Override

    public AuthType getOutgoingAuthType() {

        return Transport.decodeTransportUri(getTransportUri()).authenticationType;

        return TransportUris.decodeTransportUri(getTransportUri()).authenticationType;

    }



    @Override

    public String getOutgoingPort() {

        return String.valueOf(Transport.decodeTransportUri(getTransportUri()).port);

        return String.valueOf(TransportUris.decodeTransportUri(getTransportUri()).port);

    }



    @Override
@@ -1945,7 +1946,7 @@ public class Account implements BaseAccount, AccountConfig { 
        ServerSettings transportServer = new ServerSettings(ServerSettings.Type.SMTP, "mail." + domain, -1,

                ConnectionSecurity.SSL_TLS_REQUIRED, AuthType.PLAIN, user, password, null);

        String storeUri = RemoteStore.createStoreUri(storeServer);

        String transportUri = Transport.createTransportUri(transportServer);

        String transportUri = TransportUris.createTransportUri(transportServer);

        setStoreUri(storeUri);

        setTransportUri(transportUri);

k9mail/src/main/java/com/fsck/k9/activity/setup/AccountConfigImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import com.fsck.k9.mail.MessagingException; 
import com.fsck.k9.mail.NetworkType;

import com.fsck.k9.mail.ServerSettings;

import com.fsck.k9.mail.Store;

import com.fsck.k9.mail.Transport;

import com.fsck.k9.mail.TransportUris;

import com.fsck.k9.mail.ssl.LocalKeyStore;

import com.fsck.k9.mail.store.RemoteStore;

import timber.log.Timber;
@@ -333,7 +333,7 @@ class AccountConfigImpl implements AccountConfig, Parcelable { 
        ServerSettings transportServer = new ServerSettings(ServerSettings.Type.SMTP, "mail." + domain, -1,

                ConnectionSecurity.SSL_TLS_REQUIRED, AuthType.PLAIN, user, password, null);

        String storeUri = RemoteStore.createStoreUri(storeServer);

        String transportUri = Transport.createTransportUri(transportServer);

        String transportUri = TransportUris.createTransportUri(transportServer);



        this.storeUri = storeUri;

        this.transportUri = transportUri;

k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupPresenter.java

+4 −3
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.fsck.k9.mail.ServerSettings.Type; 
import com.fsck.k9.mail.Store;

import com.fsck.k9.mail.Transport;

import com.fsck.k9.mail.TransportProvider;

import com.fsck.k9.mail.TransportUris;

import com.fsck.k9.mail.autoconfiguration.AutoConfigure;

import com.fsck.k9.mail.autoconfiguration.AutoConfigure.ProviderInfo;

import com.fsck.k9.mail.autoconfiguration.AutoConfigureAutodiscover;
@@ -441,7 +442,7 @@ public class AccountSetupPresenter implements AccountSetupContract.Presenter, 
                                oldUri.getHost(), oldUri.getPort(),

                                ConnectionSecurity.SSL_TLS_REQUIRED, currentIncomingAuthType,

                                incomingSettings.username, password, clientCertificateAlias);

                        String transportUri = Transport.createTransportUri(transportServer);

                        String transportUri = TransportUris.createTransportUri(transportServer);

                        accountConfig.setTransportUri(transportUri);

                    } catch (URISyntaxException use) {

                    /*
@@ -1409,7 +1410,7 @@ public class AccountSetupPresenter implements AccountSetupContract.Presenter, 
        }



        try {

            outgoingSettings = Transport.decodeTransportUri(accountConfig.getTransportUri());

            outgoingSettings = TransportUris.decodeTransportUri(accountConfig.getTransportUri());



            currentOutgoingAuthType = outgoingSettings.authenticationType;

            setAuthTypeInOutgoing(currentOutgoingAuthType);
@@ -1482,7 +1483,7 @@ public class AccountSetupPresenter implements AccountSetupContract.Presenter, 
        accountConfig.deleteCertificate(host, port, CheckDirection.OUTGOING);

        ServerSettings server = new ServerSettings(Type.SMTP, host, port, connectionSecurity,

                authType, username, password, clientCertificateAlias);

        String uri = Transport.createTransportUri(server);

        String uri = TransportUris.createTransportUri(server);

        accountConfig.setTransportUri(uri);



        view.goToOutgoingChecking();