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

Commit 2e98ff56 authored by Jan Berkel's avatar Jan Berkel
Browse files

Break dependencies

parent 0024f39b

src/com/fsck/k9/activity/MessageCompose.java

+2 −1
Original line number Diff line number Diff line
@@ -89,12 +89,13 @@ import com.fsck.k9.crypto.PgpData; 
import com.fsck.k9.fragment.ProgressDialogFragment;

import com.fsck.k9.helper.ContactItem;

import com.fsck.k9.helper.Contacts;

import com.fsck.k9.helper.HtmlConverter;

import com.fsck.k9.mail.internet.HtmlConverter;

import com.fsck.k9.helper.IdentityHelper;

import com.fsck.k9.helper.Utility;

import com.fsck.k9.mail.Address;

import com.fsck.k9.mail.Body;

import com.fsck.k9.mail.Flag;

import com.fsck.k9.mail.internet.InsertableHtmlContent;

import com.fsck.k9.mail.Message;

import com.fsck.k9.mail.Message.RecipientType;

import com.fsck.k9.mail.MessagingException;

src/com/fsck/k9/activity/setup/WelcomeMessage.java

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ import android.widget.TextView; 
import com.fsck.k9.R;

import com.fsck.k9.activity.Accounts;

import com.fsck.k9.activity.K9Activity;

import com.fsck.k9.helper.HtmlConverter;

import com.fsck.k9.mail.internet.HtmlConverter;



/**

 * Displays a welcome message when no accounts have been created yet.

src/com/fsck/k9/helper/Contacts.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ import java.util.List; 
/**

 * Helper class to access the contacts stored on the device.

 */

public class Contacts {

public class Contacts implements Address.Lookup {

    /**

     * The order in which the search results are returned by

     * {@link #searchContacts(CharSequence)}.

src/com/fsck/k9/mail/Address.java

+8 −9
Original line number Diff line number Diff line
@@ -20,11 +20,14 @@ import android.text.util.Rfc822Tokenizer; 
import android.util.Log;



import com.fsck.k9.K9;

import com.fsck.k9.helper.Contacts;

import com.fsck.k9.helper.Utility;





public class Address {

    public static interface Lookup {

        String getNameForAddress(String address);

    }



    /**

     * If the number of addresses exceeds this value the addresses aren't

     * resolved to the names of Android contacts.
@@ -34,7 +37,7 @@ public class Address { 
     * performance tests.

     * </p>

     *

     * @see Address#toFriendly(Address[], Contacts)

     * @see Address#toFriendly(Address[], com.fsck.k9.mail.Address.Lookup)

     */

    private static final int TOO_MANY_ADDRESSES = 50;
@@ -239,7 +242,7 @@ public class Address { 
     * @return

     */

    public CharSequence toFriendly() {

        return toFriendly((Contacts)null);

        return toFriendly((Lookup)null);

    }



    /**
@@ -254,7 +257,7 @@ public class Address { 
     * @return

     *         A "friendly" name for this {@link Address}.

     */

    public CharSequence toFriendly(final Contacts contacts) {

    public CharSequence toFriendly(final Lookup contacts) {

        if (!K9.showCorrespondentNames()) {

            return mAddress;
@@ -281,11 +284,7 @@ public class Address { 
        return (!TextUtils.isEmpty(mPersonal)) ? mPersonal : mAddress;

    }



    public static CharSequence toFriendly(Address[] addresses) {

        return toFriendly(addresses, null);

    }



    public static CharSequence toFriendly(Address[] addresses, Contacts contacts) {

    public static CharSequence toFriendly(Address[] addresses, Lookup contacts) {

        if (addresses == null) {

            return null;

        }

src/com/fsck/k9/helper/HtmlConverter.java→src/com/fsck/k9/mail/internet/HtmlConverter.java

+3 −1
Original line number Diff line number Diff line 
package com.fsck.k9.helper;

package com.fsck.k9.mail.internet;



import android.text.*;

import android.text.Html.TagHandler;

import android.util.Log;

import com.fsck.k9.K9;

import com.fsck.k9.helper.Regex;



import org.xml.sax.XMLReader;



import java.io.IOException;