wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move MessageCryptoAnnotations to a different package

Browse source
This commit is contained in:
cketti 2018-07-01 02:09:34 +02:00
parent a2cf5a08c1
commit 4f4918c39b
10 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/core/src/main/java/com/fsck/k9/activity/MessageLoaderHelper.java
View file

@ -26,7 +26,7 @@ import com.fsck.k9.mail.Flag;
import com.fsck.k9.mail.MessagingException;
import com.fsck.k9.mailstore.LocalMessage;
import com.fsck.k9.mailstore.MessageViewInfo;
import com.fsck.k9.ui.crypto.MessageCryptoAnnotations;
import com.fsck.k9.mailstore.MessageCryptoAnnotations;
import com.fsck.k9.ui.crypto.MessageCryptoCallback;
import com.fsck.k9.ui.crypto.MessageCryptoHelper;
import com.fsck.k9.ui.crypto.OpenPgpApiFactory;

2
app/core/src/main/java/com/fsck/k9/crypto/MessageCryptoStructureDetector.java
View file

@ -21,7 +21,7 @@ import com.fsck.k9.mail.internet.MimeBodyPart;
import com.fsck.k9.mail.internet.MimeMultipart;
import com.fsck.k9.mail.internet.MimeUtility;
import com.fsck.k9.mailstore.CryptoResultAnnotation;
import com.fsck.k9.ui.crypto.MessageCryptoAnnotations;
import com.fsck.k9.mailstore.MessageCryptoAnnotations;
import static com.fsck.k9.mail.internet.MimeUtility.isSameMimeType;

3
app/core/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoAnnotations.java → app/core/src/main/java/com/fsck/k9/mailstore/MessageCryptoAnnotations.java
View file

@ -1,10 +1,9 @@
package com.fsck.k9.ui.crypto;
package com.fsck.k9.mailstore;
import java.util.HashMap;
import com.fsck.k9.mail.Part;
import com.fsck.k9.mailstore.CryptoResultAnnotation;
public class MessageCryptoAnnotations {

1
app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java
View file

@ -27,7 +27,6 @@ import com.fsck.k9.mailstore.util.FlowedMessageUtils;
import com.fsck.k9.message.extractors.AttachmentInfoExtractor;
import com.fsck.k9.message.html.HtmlConverter;
import com.fsck.k9.message.html.HtmlProcessor;
import com.fsck.k9.ui.crypto.MessageCryptoAnnotations;
import org.openintents.openpgp.util.OpenPgpUtils;
import timber.log.Timber;

2
app/core/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoCallback.java
View file

@ -4,6 +4,8 @@ package com.fsck.k9.ui.crypto;
import android.content.Intent;
import android.content.IntentSender;
import com.fsck.k9.mailstore.MessageCryptoAnnotations;
public interface MessageCryptoCallback {
void onCryptoHelperProgress(int current, int max);

2
app/core/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java
View file

@ -17,7 +17,6 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;
import com.fsck.k9.K9;
import com.fsck.k9.autocrypt.AutocryptOperations;
import com.fsck.k9.crypto.MessageCryptoStructureDetector;
import com.fsck.k9.mail.Address;
@ -35,6 +34,7 @@ import com.fsck.k9.mail.internet.SizeAware;
import com.fsck.k9.mail.internet.TextBody;
import com.fsck.k9.mailstore.CryptoResultAnnotation;
import com.fsck.k9.mailstore.CryptoResultAnnotation.CryptoError;
import com.fsck.k9.mailstore.MessageCryptoAnnotations;
import com.fsck.k9.mailstore.MessageHelper;
import com.fsck.k9.mailstore.MimePartStreamParser;
import com.fsck.k9.mailstore.util.FileFactory;

2
app/core/src/main/java/com/fsck/k9/ui/message/LocalMessageExtractorLoader.java
View file

@ -12,7 +12,7 @@ import timber.log.Timber;
import com.fsck.k9.mailstore.LocalMessage;
import com.fsck.k9.mailstore.MessageViewInfoExtractor;
import com.fsck.k9.mailstore.MessageViewInfo;
import com.fsck.k9.ui.crypto.MessageCryptoAnnotations;
import com.fsck.k9.mailstore.MessageCryptoAnnotations;
public class LocalMessageExtractorLoader extends AsyncTaskLoader<MessageViewInfo> {

2
app/core/src/test/java/com/fsck/k9/crypto/MessageCryptoStructureDetectorTest.java
View file

@ -11,7 +11,7 @@ import com.fsck.k9.mail.Part;
import com.fsck.k9.mail.internet.MimeMessage;
import com.fsck.k9.mail.internet.MimeMessageHelper;
import com.fsck.k9.mail.internet.TextBody;
import com.fsck.k9.ui.crypto.MessageCryptoAnnotations;
import com.fsck.k9.mailstore.MessageCryptoAnnotations;
import org.junit.Test;
import static com.fsck.k9.message.TestMessageConstructionUtils.bodypart;

1
app/core/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java
View file

@ -33,7 +33,6 @@ import com.fsck.k9.mailstore.CryptoResultAnnotation.CryptoError;
import com.fsck.k9.mailstore.MessageViewInfoExtractor.ViewableExtractedText;
import com.fsck.k9.message.extractors.AttachmentInfoExtractor;
import com.fsck.k9.message.html.HtmlProcessor;
import com.fsck.k9.ui.crypto.MessageCryptoAnnotations;
import org.junit.Before;
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;

1
app/core/src/test/java/com/fsck/k9/ui/crypto/MessageCryptoHelperTest.java
View file

@ -19,6 +19,7 @@ import com.fsck.k9.mail.internet.MimeMessage;
import com.fsck.k9.mail.internet.TextBody;
import com.fsck.k9.mailstore.CryptoResultAnnotation;
import com.fsck.k9.mailstore.CryptoResultAnnotation.CryptoError;
import com.fsck.k9.mailstore.MessageCryptoAnnotations;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;