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

Unverified Commit 1a65fb90 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #3410 from k9mail/modularize 

Move email protocol implementations to separate Gradle modules
parents cf7d150c d6696839

k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/FolderNotFoundException.kt

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
package com.fsck.k9.mail.store.imap



import com.fsck.k9.mail.MessagingException



class FolderNotFoundException(val folderServerId: String)

    : MessagingException("Folder not found: $folderServerId")

k9mail/build.gradle

+6 −1
Original line number Diff line number Diff line
@@ -19,7 +19,12 @@ configurations.all { 
dependencies {

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"



    implementation project(':k9mail-library')

    implementation project(":mail:common")

    implementation project(":mail:protocols:imap")

    implementation project(":mail:protocols:pop3")

    implementation project(":mail:protocols:webdav")

    implementation project(":mail:protocols:smtp")



    implementation project(':plugins:HoloColorPicker')

    implementation project(':plugins:openpgp-api-lib:openpgp-api')

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

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import com.fsck.k9.mail.NetworkType; 
import com.fsck.k9.mail.filter.Base64;

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

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

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

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

import com.fsck.k9.mailstore.LocalStore;

import com.fsck.k9.mailstore.StorageManager;
@@ -1186,7 +1187,7 @@ public class Account implements BaseAccount, StoreConfig { 
    }



    public RemoteStore getRemoteStore() throws MessagingException {

        return RemoteStore.getInstance(K9.app, this);

        return RemoteStoreManager.getInstance(K9.app, this);

    }



    // It'd be great if this actually went into the store implementation

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

+5 −4
Original line number Diff line number Diff line 


package com.fsck.k9;





import java.util.ArrayList;

import java.util.Collection;

import java.util.Collections;
@@ -10,12 +11,12 @@ import java.util.List; 
import java.util.Map;



import android.content.Context;

import timber.log.Timber;



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

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

import com.fsck.k9.mailstore.LocalStore;

import com.fsck.k9.preferences.StorageEditor;

import com.fsck.k9.preferences.Storage;

import com.fsck.k9.preferences.StorageEditor;

import timber.log.Timber;





public class Preferences {
@@ -126,7 +127,7 @@ public class Preferences { 
        }



        try {

            RemoteStore.removeInstance(account);

            RemoteStoreManager.removeInstance(account);

        } catch (Exception e) {

            Timber.e(e, "Failed to reset remote store for account %s", account.getUuid());

        }

k9mail/src/main/java/com/fsck/k9/activity/Accounts.java

+4 −4
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ import com.fsck.k9.helper.SizeFormatter; 
import com.fsck.k9.mail.AuthType;

import com.fsck.k9.mail.ServerSettings;

import com.fsck.k9.mail.TransportUris;

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

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

import com.fsck.k9.mailstore.StorageManager;

import com.fsck.k9.preferences.SettingsExporter;

import com.fsck.k9.preferences.SettingsImportExportException;
@@ -744,7 +744,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener { 
        }



        private void show(final Accounts activity, boolean restore) {

            ServerSettings incoming = RemoteStore.decodeStoreUri(mAccount.getStoreUri());

            ServerSettings incoming = RemoteStoreManager.decodeStoreUri(mAccount.getStoreUri());

            ServerSettings outgoing = TransportUris.decodeTransportUri(mAccount.getTransportUri());



            /*
@@ -962,9 +962,9 @@ public class Accounts extends K9ListActivity implements OnItemClickListener { 
                if (mIncomingPassword != null) {

                    // Set incoming server password

                    String storeUri = mAccount.getStoreUri();

                    ServerSettings incoming = RemoteStore.decodeStoreUri(storeUri);

                    ServerSettings incoming = RemoteStoreManager.decodeStoreUri(storeUri);

                    ServerSettings newIncoming = incoming.newPassword(mIncomingPassword);

                    String newStoreUri = RemoteStore.createStoreUri(newIncoming);

                    String newStoreUri = RemoteStoreManager.createStoreUri(newIncoming);

                    mAccount.setStoreUri(newStoreUri);

                }