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

Unverified Commit 662b5f86 authored by Philipp Kewisch's avatar Philipp Kewisch Committed by GitHub
Browse files

Merge pull request #9060 from shamim-emon/move-legacy-core.contact-to-core-contact 

Refactor: Move legacy:core.contact to :core:contact
parents d76fd96b 8b8be5c2

core/contact/build.gradle.kts

0 → 100644
+11 −0
Original line number Diff line number Diff line 
plugins {

    id(ThunderbirdPlugins.Library.android)

}



android {

    namespace = "net.thunderbird.core.contact"

}



dependencies {

    implementation(projects.mail.common)

}

legacy/core/src/main/java/com/fsck/k9/contact/ContactIntentHelper.kt→core/contact/src/main/java/net/thunderbird/core/contact/ContactIntentHelper.kt

+1 −1
Original line number Diff line number Diff line 
package com.fsck.k9.contact

package net.thunderbird.core.contact



import android.content.Intent

import android.net.Uri

legacy/ui/legacy/build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ dependencies { 
    implementation(projects.core.account)

    implementation(projects.mail.common)

    implementation(projects.uiUtils.toolbarBottomSheet)

    implementation(projects.core.contact)



    implementation(projects.core.featureflags)

    implementation(projects.core.ui.theme.api)

legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java

+2 −2
Original line number Diff line number Diff line
@@ -70,8 +70,7 @@ import com.fsck.k9.activity.compose.ReplyToPresenter; 
import com.fsck.k9.activity.compose.ReplyToView;

import com.fsck.k9.activity.compose.SaveMessageTask;

import com.fsck.k9.activity.misc.Attachment;

import com.fsck.k9.autocrypt.AutocryptDraftStateHeaderParser;

import com.fsck.k9.contact.ContactIntentHelper;

import com.fsck.k9.autocrypt.AutocryptDraftStateHeaderParser;;

import app.k9mail.legacy.message.controller.MessageReference;

import com.fsck.k9.controller.MessagingController;

import app.k9mail.legacy.message.controller.MessagingListener;
@@ -115,6 +114,7 @@ import com.fsck.k9.ui.helper.SizeFormatter; 
import com.fsck.k9.ui.messagelist.DefaultFolderProvider;

import com.google.android.material.dialog.MaterialAlertDialogBuilder;

import com.google.android.material.textview.MaterialTextView;

import net.thunderbird.core.contact.ContactIntentHelper;

import net.thunderbird.core.ui.theme.manager.ThemeManager;

import net.thunderbird.feature.search.LocalSearch;

import org.openintents.openpgp.OpenPgpApiManager;

legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt

+5 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ import com.fsck.k9.activity.compose.ComposeCryptoStatus.AttachErrorState 
import com.fsck.k9.activity.compose.ComposeCryptoStatus.SendErrorState

import com.fsck.k9.autocrypt.AutocryptDraftStateHeader

import com.fsck.k9.autocrypt.AutocryptDraftStateHeaderParser

import com.fsck.k9.contact.ContactIntentHelper

import com.fsck.k9.helper.MailTo

import com.fsck.k9.helper.ReplyToParser

import com.fsck.k9.mail.Address
@@ -33,6 +32,7 @@ import com.fsck.k9.message.MessageBuilder 
import com.fsck.k9.message.PgpMessageBuilder

import com.fsck.k9.ui.R

import com.fsck.k9.view.RecipientSelectView.Recipient

import net.thunderbird.core.contact.ContactIntentHelper

import org.openintents.openpgp.OpenPgpApiManager

import org.openintents.openpgp.OpenPgpApiManager.OpenPgpApiManagerCallback

import org.openintents.openpgp.OpenPgpApiManager.OpenPgpProviderError
@@ -633,7 +633,10 @@ class RecipientPresenter( 


    private fun isContactPickerAvailable(): Boolean {

        val resolveInfoList =

            context.packageManager.queryIntentActivities(ContactIntentHelper.getContactPickerIntent(), 0)

            context.packageManager.queryIntentActivities(

                ContactIntentHelper.getContactPickerIntent(),

                0,

            )

        return resolveInfoList.isNotEmpty()

    }