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

Commit 4faf17fb authored by cketti's avatar cketti
Browse files

Use Koin for creating instances of ContactPictureLoader

parent 9ada669e

app/k9mail/src/main/java/com/fsck/k9/directshare/K9ChooserTargetService.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public class K9ChooserTargetService extends ChooserTargetService { 


        Context applicationContext = getApplicationContext();

        recipientLoader = RecipientLoader.getMostContactedRecipientLoader(applicationContext, MAX_TARGETS);

        contactPictureLoader = ContactPicture.getContactPictureLoader(applicationContext);

        contactPictureLoader = ContactPicture.getContactPictureLoader();

    }



    @Override

app/ui/src/main/java/com/fsck/k9/activity/compose/RecipientAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public class RecipientAdapter extends BaseAdapter implements Filterable { 
    }



    public static void setContactPhotoOrPlaceholder(Context context, ImageView imageView, Recipient recipient) {

        ContactPicture.getContactPictureLoader(context).loadContactPicture(recipient, imageView);

        ContactPicture.getContactPictureLoader().loadContactPicture(recipient, imageView);

    }



    @Override

app/ui/src/main/java/com/fsck/k9/activity/misc/ContactPicture.java

+2 −6
Original line number Diff line number Diff line 
package com.fsck.k9.activity.misc;





import android.content.Context;



import com.fsck.k9.DI;

import com.fsck.k9.contacts.ContactLetterBitmapCreator;

import com.fsck.k9.contacts.ContactPictureLoader;





public class ContactPicture {



    public static ContactPictureLoader getContactPictureLoader(Context context) {

        ContactLetterBitmapCreator contactLetterBitmapCreator = DI.get(ContactLetterBitmapCreator.class);

        return new ContactPictureLoader(context.getApplicationContext(), contactLetterBitmapCreator);

    public static ContactPictureLoader getContactPictureLoader() {

        return DI.get(ContactPictureLoader.class);

    }

}

app/ui/src/main/java/com/fsck/k9/contacts/KoinModule.kt

+1 −0
Original line number Diff line number Diff line
@@ -6,4 +6,5 @@ val contactsModule = applicationContext { 
    bean { ContactLetterExtractor() }

    factory { ContactLetterBitmapConfig(get()) }

    factory { ContactLetterBitmapCreator(get(), get()) }

    factory { ContactPictureLoader(get(), get()) }

}

app/ui/src/main/java/com/fsck/k9/fragment/MessageListFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener 
        stars = K9.messageListStars();



        if (K9.showContactPicture()) {

            contactsPictureLoader = ContactPicture.getContactPictureLoader(getActivity());

            contactsPictureLoader = ContactPicture.getContactPictureLoader();

        }



        restoreInstanceState(savedInstanceState);