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

Commit 8df6a56a authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #1521 from k9mail/attachment-count-encrypted 

Set attachment count to zero for encrypted messages
parents 8b1c13d6 5c638dd2

k9mail/src/main/java/com/fsck/k9/crypto/MessageDecryptVerifier.java

+16 −12
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ import java.util.ArrayList; 
import java.util.List;

import java.util.Stack;



import android.support.annotation.Nullable;

import android.text.TextUtils;



import com.fsck.k9.mail.Body;
@@ -128,7 +129,7 @@ public class MessageDecryptVerifier { 
            Part part = partsToCheck.pop();

            Body body = part.getBody();



            if (isPartPgpInline(part)) {

            if (isPartPgpInlineEncryptedOrSigned(part)) {

                inlineParts.add(part);

                continue;

            }
@@ -162,17 +163,8 @@ public class MessageDecryptVerifier { 
        return null;

    }



    private static boolean isPartPgpInline(Part part) {

        if (!part.isMimeType(TEXT_PLAIN) && !part.isMimeType(APPLICATION_PGP)) {

            return false;

        }

        String text = MessageExtractor.getTextFromPart(part, TEXT_LENGTH_FOR_INLINE_CHECK);

        return !TextUtils.isEmpty(text) &&

                (text.startsWith(PGP_INLINE_START_MARKER) || text.startsWith(PGP_INLINE_SIGNED_START_MARKER));

    }



    private static boolean isPartEncryptedOrSigned(Part part) {

        return isPartMultipartEncrypted(part) || isPartMultipartSigned(part) || isPartPgpInline(part);

        return isPartMultipartEncrypted(part) || isPartMultipartSigned(part) || isPartPgpInlineEncryptedOrSigned(part);

    }



    private static boolean isPartMultipartSigned(Part part) {
@@ -196,7 +188,19 @@ public class MessageDecryptVerifier { 
        return isPgpEncrypted || isPgpSigned;

    }



    public static boolean isPartPgpInlineEncrypted(Part part) {

    private static boolean isPartPgpInlineEncryptedOrSigned(Part part) {

        if (!part.isMimeType(TEXT_PLAIN) && !part.isMimeType(APPLICATION_PGP)) {

            return false;

        }

        String text = MessageExtractor.getTextFromPart(part, TEXT_LENGTH_FOR_INLINE_CHECK);

        return !TextUtils.isEmpty(text) &&

                (text.startsWith(PGP_INLINE_START_MARKER) || text.startsWith(PGP_INLINE_SIGNED_START_MARKER));

    }



    public static boolean isPartPgpInlineEncrypted(@Nullable Part part) {

        if (part == null) {

            return false;

        }

        if (!part.isMimeType(TEXT_PLAIN) && !part.isMimeType(APPLICATION_PGP)) {

            return false;

        }

k9mail/src/main/java/com/fsck/k9/mailstore/AttachmentCounter.java

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
package com.fsck.k9.mailstore;





import java.util.ArrayList;

import java.util.List;



import com.fsck.k9.mail.Message;

import com.fsck.k9.mail.MessagingException;

import com.fsck.k9.mail.Part;

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

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





class AttachmentCounter {

    public int getAttachmentCount(Message message) throws MessagingException {

        List<Part> attachments = new ArrayList<>();

        MessageExtractor.findViewablesAndAttachments(message, new ArrayList<Viewable>(), attachments);



        return attachments.size();

    }

}

k9mail/src/main/java/com/fsck/k9/mailstore/LocalFolder.java

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import com.fsck.k9.mail.internet.SizeAware; 
import com.fsck.k9.mail.message.MessageHeaderParser;

import com.fsck.k9.mailstore.LockableDatabase.DbCallback;

import com.fsck.k9.mailstore.LockableDatabase.WrappedException;

import com.fsck.k9.message.extractors.AttachmentCounter;

import com.fsck.k9.message.extractors.AttachmentInfoExtractor;

import com.fsck.k9.message.extractors.MessageFulltextCreator;

import com.fsck.k9.message.extractors.MessagePreviewCreator;

k9mail/src/main/java/com/fsck/k9/mailstore/LocalStore.java

+23 −20
Original line number Diff line number Diff line 


package com.fsck.k9.mailstore;





import java.io.ByteArrayInputStream;

import java.io.File;

import java.io.FileInputStream;

import java.io.FileNotFoundException;

import java.io.IOException;

import java.io.InputStream;

import java.io.Serializable;

import java.util.ArrayList;

import java.util.Collections;

import java.util.HashMap;

import java.util.LinkedList;

import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.ConcurrentMap;



import android.content.ContentResolver;

import android.content.ContentValues;

import android.content.Context;
@@ -9,6 +27,7 @@ import android.database.sqlite.SQLiteDatabase; 
import android.net.Uri;

import android.text.TextUtils;

import android.util.Log;



import com.fsck.k9.Account;

import com.fsck.k9.K9;

import com.fsck.k9.Preferences;
@@ -21,11 +40,12 @@ import com.fsck.k9.mail.MessagingException; 
import com.fsck.k9.mail.Store;

import com.fsck.k9.mailstore.LocalFolder.DataLocation;

import com.fsck.k9.mailstore.LocalFolder.MoreMessages;

import com.fsck.k9.mailstore.StorageManager.StorageProvider;

import com.fsck.k9.mailstore.LockableDatabase.DbCallback;

import com.fsck.k9.mailstore.LockableDatabase.WrappedException;

import com.fsck.k9.message.extractors.MessagePreviewCreator;

import com.fsck.k9.mailstore.StorageManager.StorageProvider;

import com.fsck.k9.message.extractors.AttachmentCounter;

import com.fsck.k9.message.extractors.MessageFulltextCreator;

import com.fsck.k9.message.extractors.MessagePreviewCreator;

import com.fsck.k9.preferences.Storage;

import com.fsck.k9.provider.EmailProvider;

import com.fsck.k9.provider.EmailProvider.MessageColumns;
@@ -37,23 +57,6 @@ import org.apache.james.mime4j.codec.Base64InputStream; 
import org.apache.james.mime4j.codec.QuotedPrintableInputStream;

import org.apache.james.mime4j.util.MimeUtil;



import java.io.ByteArrayInputStream;

import java.io.File;

import java.io.FileInputStream;

import java.io.FileNotFoundException;

import java.io.IOException;

import java.io.InputStream;

import java.io.Serializable;

import java.util.ArrayList;

import java.util.Collections;

import java.util.HashMap;

import java.util.LinkedList;

import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.ConcurrentMap;



/**

 * <pre>

 * Implements a SQLite database backed local store for Messages.
@@ -182,7 +185,7 @@ public class LocalStore extends Store implements Serializable { 


        messagePreviewCreator = MessagePreviewCreator.newInstance();

        messageFulltextCreator = MessageFulltextCreator.newInstance();

        attachmentCounter = new AttachmentCounter();

        attachmentCounter = AttachmentCounter.newInstance();



        database.open();

    }

k9mail/src/main/java/com/fsck/k9/message/extractors/AttachmentCounter.java

0 → 100644
+37 −0
Original line number Diff line number Diff line 
package com.fsck.k9.message.extractors;





import java.util.ArrayList;

import java.util.List;



import com.fsck.k9.mail.Message;

import com.fsck.k9.mail.MessagingException;

import com.fsck.k9.mail.Part;

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





public class AttachmentCounter {

    private final EncryptionDetector encryptionDetector;





    AttachmentCounter(EncryptionDetector encryptionDetector) {

        this.encryptionDetector = encryptionDetector;

    }



    public static AttachmentCounter newInstance() {

        TextPartFinder textPartFinder = new TextPartFinder();

        EncryptionDetector encryptionDetector = new EncryptionDetector(textPartFinder);

        return new AttachmentCounter(encryptionDetector);

    }



    public int getAttachmentCount(Message message) throws MessagingException {

        if (encryptionDetector.isEncrypted(message)) {

            return 0;

        }



        List<Part> attachmentParts = new ArrayList<>();

        MessageExtractor.findViewablesAndAttachments(message, null, attachmentParts);



        return attachmentParts.size();

    }

}