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

Commit c45251f6 authored by Philip Whitehouse's avatar Philip Whitehouse
Browse files

Rename getInstance() to getTransport()

parent b97cbba3

k9mail-library/src/main/java/com/fsck/k9/mail/TransportProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ public class TransportProvider { 
        return transportProvider;

    }



    public synchronized Transport getInstance(Context context, StoreConfig storeConfig)

    public synchronized Transport getTransport(Context context, StoreConfig storeConfig)

            throws MessagingException {

        String uri = storeConfig.getTransportUri();

        if (uri.startsWith("smtp")) {

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

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,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 = TransportProvider.getInstance().getInstance(K9.app, account);

            Transport transport = TransportProvider.getInstance().getTransport(K9.app, account);

            transport.close();

            try {

                transport.open();

k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java

+1 −1
Original line number Diff line number Diff line
@@ -2805,7 +2805,7 @@ public class MessagingController { 
                        + "' (" + localFolder.getId() + ") for messages to send");

            }



            Transport transport = transportProvider.getInstance(K9.app, account);

            Transport transport = transportProvider.getTransport(K9.app, account);



            for (LocalMessage message : localMessages) {

                if (message.isSet(Flag.DELETED)) {

k9mail/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -891,7 +891,7 @@ public class MessagingControllerTest { 
        when(localStore.getFolder(SENT_FOLDER_NAME)).thenReturn(sentFolder);

        when(sentFolder.getId()).thenReturn(1L);

        when(localFolder.exists()).thenReturn(true);

        when(transportProvider.getInstance(appContext, account)).thenReturn(transport);

        when(transportProvider.getTransport(appContext, account)).thenReturn(transport);

        when(localFolder.getMessages(null)).thenReturn(Collections.singletonList(localMessageToSend1));

        when(localMessageToSend1.getUid()).thenReturn("localMessageToSend1");

        when(localMessageToSend1.getHeader(K9.IDENTITY_HEADER)).thenReturn(new String[]{});