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

Commit 4da1a011 authored by Vincent Breitmoser's avatar Vincent Breitmoser Committed by Vincent Breitmoser
Browse files

messageview: add crypto info dialog

parent d92155e2

images/drawables-pgp/status_none_dots_1.svg

0 → 100644
+62 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<svg

   xmlns:dc="http://purl.org/dc/elements/1.1/"

   xmlns:cc="http://creativecommons.org/ns#"

   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

   xmlns:svg="http://www.w3.org/2000/svg"

   xmlns="http://www.w3.org/2000/svg"

   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

   width="150"

   height="100"

   viewBox="0 0 149.99999 99.999998"

   id="svg3344"

   version="1.1"

   inkscape:version="0.48.5 r10040"

   sodipodi:docname="status_none_dots_1.svg">

  <sodipodi:namedview

     pagecolor="#ffffff"

     bordercolor="#666666"

     borderopacity="1"

     objecttolerance="10"

     gridtolerance="10"

     guidetolerance="10"

     inkscape:pageopacity="0"

     inkscape:pageshadow="2"

     inkscape:window-width="1920"

     inkscape:window-height="1056"

     id="namedview12"

     showgrid="false"

     inkscape:zoom="2.18"

     inkscape:cx="75"

     inkscape:cy="50"

     inkscape:window-x="0"

     inkscape:window-y="24"

     inkscape:window-maximized="0"

     inkscape:current-layer="layer1" />

  <defs

     id="defs3346" />

  <metadata

     id="metadata3349">

    <rdf:RDF>

      <cc:Work

         rdf:about="">

        <dc:format>image/svg+xml</dc:format>

        <dc:type

           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

        <dc:title />

      </cc:Work>

    </rdf:RDF>

  </metadata>

  <g

     id="layer1"

     transform="translate(-17.144857,-22.362199)">

    <circle

       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

       id="circle4219"

       cx="138.57143"

       cy="106.8622"

       r="13"

       d="m 151.57143,106.8622 c 0,7.1797 -5.8203,13 -13,13 -7.17971,0 -13,-5.8203 -13,-13 0,-7.179704 5.82029,-13.000002 13,-13.000002 7.1797,0 13,5.820298 13,13.000002 z" />

  </g>

</svg>

images/drawables-pgp/status_none_dots_2.svg

0 → 100644
+69 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<svg

   xmlns:dc="http://purl.org/dc/elements/1.1/"

   xmlns:cc="http://creativecommons.org/ns#"

   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

   xmlns:svg="http://www.w3.org/2000/svg"

   xmlns="http://www.w3.org/2000/svg"

   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

   width="150"

   height="100"

   viewBox="0 0 149.99999 99.999998"

   id="svg3344"

   version="1.1"

   inkscape:version="0.48.5 r10040"

   sodipodi:docname="status_none_dots_2.svg">

  <sodipodi:namedview

     pagecolor="#ffffff"

     bordercolor="#666666"

     borderopacity="1"

     objecttolerance="10"

     gridtolerance="10"

     guidetolerance="10"

     inkscape:pageopacity="0"

     inkscape:pageshadow="2"

     inkscape:window-width="1920"

     inkscape:window-height="1056"

     id="namedview2999"

     showgrid="false"

     inkscape:zoom="2.18"

     inkscape:cx="75"

     inkscape:cy="50"

     inkscape:window-x="0"

     inkscape:window-y="24"

     inkscape:window-maximized="0"

     inkscape:current-layer="layer1" />

  <defs

     id="defs3346" />

  <metadata

     id="metadata3349">

    <rdf:RDF>

      <cc:Work

         rdf:about="">

        <dc:format>image/svg+xml</dc:format>

        <dc:type

           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

        <dc:title />

      </cc:Work>

    </rdf:RDF>

  </metadata>

  <g

     id="layer1"

     transform="translate(-17.144857,-22.362199)">

    <circle

       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

       id="circle4219"

       cx="138.57143"

       cy="106.8622"

       r="13"

       d="m 151.57143,106.8622 c 0,7.1797 -5.8203,13 -13,13 -7.17971,0 -13,-5.8203 -13,-13 0,-7.179704 5.82029,-13.000002 13,-13.000002 7.1797,0 13,5.820298 13,13.000002 z" />

    <circle

       r="13"

       cy="72.362198"

       cx="138.57143"

       id="circle4741"

       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

       d="m 151.57143,72.362198 c 0,7.179702 -5.8203,13 -13,13 -7.17971,0 -13,-5.820298 -13,-13 0,-7.179702 5.82029,-13 13,-13 7.1797,0 13,5.820298 13,13 z" />

  </g>

</svg>

images/drawables-pgp/status_none_dots_3.svg

0 → 100644
+76 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<svg

   xmlns:dc="http://purl.org/dc/elements/1.1/"

   xmlns:cc="http://creativecommons.org/ns#"

   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

   xmlns:svg="http://www.w3.org/2000/svg"

   xmlns="http://www.w3.org/2000/svg"

   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

   width="150"

   height="100"

   viewBox="0 0 149.99999 99.999998"

   id="svg3344"

   version="1.1"

   inkscape:version="0.48.5 r10040"

   sodipodi:docname="status_none_dots_3.svg">

  <sodipodi:namedview

     pagecolor="#ffffff"

     bordercolor="#666666"

     borderopacity="1"

     objecttolerance="10"

     gridtolerance="10"

     guidetolerance="10"

     inkscape:pageopacity="0"

     inkscape:pageshadow="2"

     inkscape:window-width="1920"

     inkscape:window-height="1056"

     id="namedview3011"

     showgrid="false"

     inkscape:zoom="2.18"

     inkscape:cx="75"

     inkscape:cy="50"

     inkscape:window-x="0"

     inkscape:window-y="24"

     inkscape:window-maximized="0"

     inkscape:current-layer="layer1" />

  <defs

     id="defs3346" />

  <metadata

     id="metadata3349">

    <rdf:RDF>

      <cc:Work

         rdf:about="">

        <dc:format>image/svg+xml</dc:format>

        <dc:type

           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

        <dc:title />

      </cc:Work>

    </rdf:RDF>

  </metadata>

  <g

     id="layer1"

     transform="translate(-17.144857,-22.362199)">

    <circle

       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

       id="circle4219"

       cx="138.57143"

       cy="106.8622"

       r="13"

       d="m 151.57143,106.8622 c 0,7.1797 -5.8203,13 -13,13 -7.17971,0 -13,-5.8203 -13,-13 0,-7.179704 5.82029,-13.000002 13,-13.000002 7.1797,0 13,5.820298 13,13.000002 z" />

    <circle

       r="13"

       cy="72.362198"

       cx="138.57143"

       id="circle4741"

       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

       d="m 151.57143,72.362198 c 0,7.179702 -5.8203,13 -13,13 -7.17971,0 -13,-5.820298 -13,-13 0,-7.179702 5.82029,-13 13,-13 7.1797,0 13,5.820298 13,13 z" />

    <circle

       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

       id="circle4743"

       cx="138.57143"

       cy="37.862198"

       r="13"

       d="m 151.57143,37.862198 c 0,7.179702 -5.8203,13 -13,13 -7.17971,0 -13,-5.820298 -13,-13 0,-7.179702 5.82029,-13 13,-13 7.1797,0 13,5.820298 13,13 z" />

  </g>

</svg>

images/update-drawables-pgp.sh

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ inkscape -w 48 -h 48 -e "$XDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" 
inkscape -w 64 -h 64 -e "$XXDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"

done



for NAME in "status_check_dots_1" "status_check_dots_1" "status_check_dots_3" "status_dots" "status_lock_none_dots_1" "status_lock_disabled_dots_1" "status_lock_dots_1" "status_lock_error_dots_1" "status_lock_dots_2" "status_lock_dots_3"

for NAME in "status_none_dots_1" "status_none_dots_2" "status_none_dots_3" "status_check_dots_1" "status_check_dots_1" "status_check_dots_3" "status_dots" "status_lock_none_dots_1" "status_lock_disabled_dots_1" "status_lock_dots_1" "status_lock_error_dots_1" "status_lock_dots_2" "status_lock_dots_3"

do

echo $NAME

inkscape -w 36 -h 24 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"

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

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ public class MessageDecryptVerifier { 
        return isSameMimeType(part.getMimeType(), MULTIPART_ENCRYPTED);

    }



    // TODO also guess by mime-type of contained part?

    public static boolean isPgpMimeEncryptedOrSignedPart(Part part) {

        String contentType = part.getContentType();

        String protocolParameter = MimeUtility.getHeaderParameter(contentType, PROTOCOL_PARAMETER);