Merge remote-tracking branch 'origin/master' into v/multi-decrypt

23 files changed, 460 insertions, 197 deletions

diff --git a/Graphics/drawables/ic_stat_notify.svg b/Graphics/drawables/ic_stat_notify.svg
new file mode 100644
index 000000000..ae82d7147
--- /dev/null
+++ b/Graphics/drawables/ic_stat_notify.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="626px"
+   height="626px"
+   viewBox="0 0 626 626"
+   enable-background="new 0 0 626 626"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ic_stat_notify.svg"><metadata
+     id="metadata36"><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><defs
+     id="defs34" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2558"
+     inkscape:window-height="1419"
+     id="namedview32"
+     showgrid="false"
+     inkscape:zoom="1.066308"
+     inkscape:cx="338.58371"
+     inkscape:cy="291.05308"
+     inkscape:window-x="0"
+     inkscape:window-y="19"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><rect
+     style="fill:#000000;fill-opacity:1;stroke:none"
+     id="rect3061"
+     width="991.27081"
+     height="833.71783"
+     x="-1041.9932"
+     y="-121.61116" /><path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     d="M 313 67.96875 C 177.67445 67.96875 67.96875 177.67445 67.96875 313 C 67.96875 448.32555 177.67445 558.03125 313 558.03125 C 346.28067 558.03125 378.00686 551.39443 406.9375 539.375 L 361.03125 494.28125 L 349.28125 481.6875 C 337.58171 484.19233 325.44744 485.5 313 485.5 C 217.73326 485.5 140.5 408.26674 140.5 313 C 140.5 217.73326 217.73326 140.5 313 140.5 C 408.26674 140.5 485.5 217.73326 485.5 313 C 485.5 335.18469 481.31599 356.39409 473.6875 375.875 C 501.45629 405.73338 520.78366 426.83966 526.625 433.09375 C 546.61998 397.60419 558.03125 356.63734 558.03125 313 C 558.03125 177.67445 448.32555 67.96875 313 67.96875 z M 464.3125 395.90625 C 448.62246 424.4791 425.05924 448.1265 396.5625 463.9375 C 419.18842 453.23201 445.28941 433.65488 464.3125 395.90625 z "
+     id="path4081" /><path
+     style="fill:#94c061;fill-rule:evenodd"
+     inkscape:connector-curvature="0"
+     id="path14"
+     d="m 415.298,-360.17398 -79.39409,79.13921 c -47.06722,-48.09353 -70.60084,-105.92166 -70.60084,-173.48607 0,-0.28376 0,-0.53694 0,-0.76463 0.15123,-61.1806 19.69177,-114.42094 58.62164,-159.72272 3.23693,-3.76198 6.6064,-7.47128 10.11011,-11.12961 1.36784,-1.42222 2.75606,-2.83933 4.16298,-4.24795 7.6463,-7.6463 15.60525,-14.72677 23.87345,-21.23972 0.28037,-0.2209 0.56413,-0.44859 0.84959,-0.67967 0.57093,-0.44859 1.13675,-0.88697 1.69918,-1.31687 0.26167,-0.2022 0.51655,-0.3993 0.76463,-0.59471 l 22.34419,-15.20764 c 1.27778,-0.77823 2.56746,-1.54286 3.86563,-2.29389 l 0,0.0425 c 0.69666,-0.40441 1.38993,-0.81391 2.08149,-1.23191 l 2.08149,-1.14694 c 0.79692,-0.4248 1.58874,-0.84959 2.37885,-1.27438 7.68708,-4.10522 15.56108,-7.75675 23.61858,-10.9597 6.87317,-2.72039 13.88398,-5.11283 21.02732,-7.17903 1.99994,-0.57772 4.01006,-1.12995 6.03208,-1.6567 20.62972,-5.38129 42.3775,-8.07109 65.24844,-8.07109 15.63073,0 30.72623,1.27438 45.28139,3.82315 5.09753,0.84959 10.19507,1.89798 15.2926,3.14348 12.84069,3.08401 25.25828,7.18922 37.25447,12.31904 23.88359,7.88391 -10.10015,24.79841 4.817,34.16003 -4.83471,78.85212 20.58246,73.23946 -44.79016,57.68053 -0.3959,-0.11214 -0.76463,-0.1988 -1.10446,-0.25487 -2.43662,-0.56583 -4.9548,-1.07558 -7.56134,-1.52926 -0.33814,-0.0561 -0.59472,-0.085 -0.76293,-0.085 -9.00735,-1.18943 -14.01822,-1.81303 -15.03943,-1.8691 l -0.085,0 c -32.2283,-2.15286 -61.39809,4.72881 -87.50766,20.64501 -7.19262,4.36179 -14.13036,9.43044 -20.81493,15.20765 -0.16992,0.11214 -0.28376,0.25487 -0.33983,0.42479 -0.22599,0.16992 -0.48087,0.39591 -0.76463,0.67967 -0.90057,0.78502 -1.79433,1.57854 -2.67451,2.37885 -3.48501,3.17576 -6.76952,6.46197 -9.85523,9.85523 -2.0628,-2.54707 -4.00156,-5.15191 -5.81969,-7.81622 1.73147,-1.93536 3.03304,-3.9166 3.90811,-5.94712 0.73745,-1.47489 1.33216,-3.00415 1.78414,-4.58778 0.79352,-2.6762 1.18943,-5.50704 1.18943,-8.49589 0,-7.49337 -2.46381,-14.00802 -7.39143,-19.54054 l -0.25488,-0.29736 c -0.12064,-0.11215 -0.27696,-0.26847 -0.46727,-0.46727 -0.11724,-0.12914 -0.24468,-0.27017 -0.38231,-0.4248 -0.0867,-0.0867 -0.17332,-0.17162 -0.25488,-0.25488 -1.07558,-1.07558 -2.23782,-2.0679 -3.48332,-2.97356 -3.84014,-2.8801 -8.10168,-4.63535 -12.78631,-5.26745 l -0.0425,0 c -0.73404,-0.16992 -1.52586,-0.25318 -2.37885,-0.25488 -0.73744,-0.11214 -1.47318,-0.16991 -2.20893,-0.16991 -0.56583,0 -1.10446,0.0578 -1.61422,0.16991 -1.13335,0 -2.23782,0.085 -3.31339,0.25488 l -0.085,0 c -0.43499,0.0697 -0.85979,0.15463 -1.27439,0.25488 l -3.73819,1.0195 c -0.74764,0.28037 -1.48508,0.59132 -2.20893,0.93455 -0.1988,0.085 -0.39591,0.16992 -0.59471,0.25488 -2.94128,1.35594 -5.66166,3.28111 -8.15606,5.7772 -0.33983,0.33984 -0.65078,0.70856 -0.93454,1.10447 -0.10535,0.11215 -0.20391,0.22599 -0.29736,0.33984 -3.23523,3.59715 -5.40169,7.6463 -6.49936,12.14912 -0.56582,2.37885 -0.84958,4.84265 -0.84958,7.39142 0,5.9896 1.54285,11.32842 4.63026,16.01475 1.11466,1.68049 2.43152,3.28112 3.95058,4.80018 2.57766,2.57765 5.3813,4.58778 8.41093,6.03208 3.82825,1.81302 8.02012,2.71869 12.57392,2.71869 3.58357,0 6.93944,-0.55224 10.06763,-1.6567 2.71699,3.67532 5.66336,7.25719 8.83573,10.7473 0.0663,-0.0901 0.13763,-0.17502 0.21239,-0.25488 -0.6066,0.81221 -1.20302,1.63291 -1.78413,2.46381 -1.18943,1.69918 -2.29389,3.39836 -3.3134,5.09753 -2.71869,4.1358 -5.23857,8.43982 -7.56134,12.91545 -0.0272,0.0561 -0.0561,0.11215 -0.085,0.16992 -1.72297,3.56997 -3.33719,7.16544 -4.84266,10.78978 -1.07558,2.72039 -2.0662,5.49344 -2.97356,8.32597 -3.85204,11.83818 -6.25807,24.44098 -7.22151,37.80671 -2.58614,36.25366 6.46198,68.69437 27.14437,97.31872 z m 272.71805,-271.95343 c -67.56645,59.01822 -26.3037,18.5581 -51.23021,-39.29349 18.15062,10.49243 35.22566,23.59139 51.23021,39.29349 z m -170.04522,100.93117 c -0.0969,-0.11724 -0.19541,-0.23109 -0.29736,-0.33983 0.43159,0.29905 0.85638,0.61 1.27438,0.93454 -0.32284,-0.2056 -0.64738,-0.4044 -0.97702,-0.59471 z"
+     clip-rule="evenodd"
+     sodipodi:nodetypes="ccscccccccccccccccccscccccccccccccccccccscccccccccscccccccccccscscsccccccccccccccccccc" /><path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     d="m 311.15625,162.40625 c -27.54488,0.0769 -52.73447,7.08376 -75.5625,21.03125 -7.17053,4.38388 -14.10585,9.46363 -20.8125,15.21875 -0.16822,0.11215 -0.28765,0.26759 -0.34375,0.4375 -0.22599,0.16992 -0.46624,0.37248 -0.75,0.65625 -9.23333,8.0439 -17.18571,16.79238 -23.8125,26.25 -1.18942,1.69918 -2.29299,3.42582 -3.3125,5.125 -2.71868,4.1358 -5.23972,8.43061 -7.5625,12.90625 -1.75525,3.62435 -3.37699,7.25708 -4.90625,10.9375 -1.07728,2.73228 -2.09433,5.52651 -3,8.34375 -3.85373,11.84497 -6.25872,24.45356 -7.21875,37.8125 -2.46551,34.57997 5.6511,65.67368 24.34375,93.3125 3.64304,5.35072 7.69695,10.58657 12.125,15.6875 0.13594,0.15293 0.25842,0.31243 0.40625,0.46875 1.79603,2.05431 3.6428,4.02828 5.5,5.96875 3.69742,3.78237 7.48456,7.32689 11.40625,10.625 4.70162,4.02025 9.66532,7.72022 14.875,11.0625 17.04786,11.15681 36.11939,18.37004 57.1875,21.65625 10.23118,0.92672 14.45425,0.67625 25.1875,-0.8125 2.59124,-0.15462 5.03797,-0.3501 7.34375,-0.5625 8.66581,-0.79182 17.49435,-2.01315 26.5,-3.65625 l 2.375,2.40625 1.03125,1 58.4375,58.53125 25.9375,25.9375 -0.0937,0 34.15625,34.15625 c 1.99144,2.80364 4.23455,5.32638 6.71875,7.5625 10.3293,9.25882 24.91593,13.56177 43.8125,12.96875 19.99422,-0.68137 35.04377,-1.86332 45.125,-3.5625 1.6414,-0.34153 3.14066,-0.66016 4.5,-1 1.58703,-0.22769 3.04691,-0.81309 4.40625,-1.71875 0.51146,-0.33984 1.05917,-0.69784 1.625,-1.09375 l 0.25,-0.5 c 1.41541,-1.69918 2.32284,-3.54831 2.71875,-5.53125 2.32278,-9.91131 3.89398,-26.54019 4.6875,-49.875 0.50296,-17.38259 -3.67277,-31.01127 -12.5,-40.875 -2.13756,-2.36526 -4.54085,-4.49704 -7.21875,-6.4375 l -45.28125,11.875 -0.15625,0.1875 0,-0.1875 c -0.0748,0.0119 -0.15245,0.0455 -0.21875,0.0625 -0.60661,0.0663 -1.19437,0.0262 -1.75,-0.125 -0.56582,-0.33984 -1.00391,-0.80918 -1.34375,-1.375 -0.11382,-0.11215 -0.1875,-0.23633 -0.1875,-0.40625 -0.22773,-0.56752 -0.26366,-1.15292 -0.0937,-1.71875 l 0.0937,-0.0937 L 527.25,452.5 c 0.16817,-0.73574 0.13394,-1.44533 -0.0937,-2.125 -0.45198,-0.6219 -0.96543,-1.05998 -1.53125,-1.34375 -0.6236,-0.45363 -1.2938,-0.48966 -2.03125,-0.0937 l -43.03125,11.3125 -0.0312,0 0,0.0625 c -0.6236,0.11214 -1.28908,0.0714 -1.96875,-0.15625 -0.32624,-0.16142 -0.60417,-0.39864 -0.84375,-0.6875 -0.1954,-0.22259 -0.35726,-0.46284 -0.5,-0.75 l 0,-0.25 c -0.22769,-0.56582 -0.22769,-1.15766 0,-1.78125 l -0.0937,0.15625 11.8125,-43.40625 c 0.17162,-0.67797 0.0898,-1.38756 -0.25,-2.125 -0.28377,-0.6219 -0.71542,-1.17132 -1.28125,-1.625 -0.22769,-0.0578 -13.86279,-14.91591 -40.9375,-44.59375 3.34229,-6.51465 6.85725,-17.19233 10.59375,-32.03125 0.54372,-2.20043 1.05311,-4.36753 1.5,-6.5 0.92944,-4.52151 1.63902,-8.89981 2.125,-13.15625 0.79521,-7.17734 0.95132,-13.99931 0.46875,-20.4375 0.0561,-0.6236 0.0561,-1.33148 0,-2.125 -0.67967,-4.47563 -1.50701,-8.92418 -2.46875,-13.34375 -4.53,-19.4267 -13.16241,-37.58911 -25.90625,-54.46875 -2.265,-2.8886 -4.5916,-5.72997 -6.96875,-8.5625 -2.49269,-2.8886 -5.01373,-5.64516 -7.5625,-8.25 -0.77482,-0.77822 -1.56043,-1.53191 -2.34375,-2.28125 -3.16897,-3.06192 -12.49571,-11.12846 -15.8125,-13.84375 -0.0175,0.0325 -0.0449,0.0613 -0.0625,0.0937 0.019,0.0117 0.0435,0.0195 0.0625,0.0312 -15.80815,26.64295 -82.81482,28.45557 -77.23469,63.0171 1.07615,6.6653 -9.75353,-8.45181 -15.70281,7.6704 -0.007,0.0297 -0.0274,0.0654 -0.0312,0.0937 -1.8708,8.27839 -7.67138,20.68401 -14.4375,26.59375 -0.11215,0.0561 -0.26588,0.21151 -0.4375,0.4375 -0.16818,0.0561 -0.25,0.13786 -0.25,0.25 -0.16991,0.0561 -0.28765,0.13786 -0.34375,0.25 -0.73745,0.6253 -1.45006,1.2514 -2.1875,1.875 -0.17162,0.0561 -0.36133,0.17214 -0.53125,0.34375 -4.1341,3.05682 -8.31456,5.11192 -12.5625,6.1875 l -4.84375,1.03125 c -0.45368,0 -0.88534,0.0754 -1.28125,0.1875 -1.69917,0.16817 -3.43867,0.25 -5.25,0.25 l -0.53125,0 -0.5,0 -0.5,0 c -0.22769,-0.11551 -0.49918,-0.1875 -0.78125,-0.1875 l -0.40625,0 c -8.51118,-0.56073 -15.87986,-3.3597 -22.09375,-8.40625 -1.6669,-1.36614 -3.24283,-2.90476 -4.75,-4.59375 -0.22769,-0.24468 -0.46151,-0.48662 -0.6875,-0.75 l -0.1875,0 c -0.0289,-0.0305 -0.0319,-0.0666 -0.0625,-0.0937 -4.58608,-5.32523 -7.61414,-11.08331 -9.03125,-17.3125 -0.25658,-1.22681 -0.45442,-2.48581 -0.59375,-3.75 -0.32288,-2.64052 -0.40293,-5.35941 -0.25,-8.15625 l 0,-0.25 c 0.0884,-1.33046 0.2438,-2.63187 0.4375,-3.90625 0.0782,-0.47067 0.1599,-0.94238 0.25,-1.40625 0.0255,-0.15463 0.0615,-0.31412 0.0937,-0.46875 0.29226,-1.45619 0.65027,-2.87367 1.09375,-4.25 0.65759,-2.03052 1.48663,-3.96039 2.46875,-5.8125 l 0.0937,-0.21875 c 0.54714,-1.01271 1.14066,-2.00022 1.78125,-2.96875 2.04071,-3.05003 4.56175,-5.84898 7.5625,-8.40625 0.33814,-0.33983 0.69784,-0.65374 1.09375,-0.9375 5.45945,-4.83246 11.52672,-7.94703 18.1875,-9.34375 3.56657,-0.74593 7.30895,-1.01744 11.21875,-0.78125 8.17475,0.68817 15.1908,3.12846 21.09375,7.28125 0.43159,0.29906 0.86325,0.61466 1.28125,0.9375 0.59132,0.44519 1.18247,0.88564 1.75,1.375 0.31435,0.28037 0.62825,0.58954 0.9375,0.875 3.45613,3.28621 6.01957,6.87144 7.71875,10.78125 0.16991,0.33814 0.32838,0.65374 0.5,0.9375 1.54625,2.85802 2.72518,5.85246 3.5,8.96875 1.95589,6.42618 1.94908,8.21988 1.25777,14.57075 0.69428,-7.86605 29.12532,9.42629 47.82432,-0.87225 29.74605,-16.38273 53.89536,-60.71838 46.58793,-70.41036 -12.44511,-10.39363 -38.41388,-20.78513 -53.70127,-24.31939 -0.39591,-0.11385 -0.75391,-0.1939 -1.09375,-0.25 -2.43492,-0.56582 -4.95596,-1.07757 -7.5625,-1.53125 -0.33814,-0.0561 -0.61133,-0.0625 -0.78125,-0.0625 -9.00734,-1.18942 -14.01005,-1.8189 -15.03125,-1.875 l -0.0937,0 c -4.0313,-0.27208 -8.00252,-0.41724 -11.9375,-0.40625 z"
+     id="path20"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccscccscccccccccccccccccccccccccccccscccccccsc" /></svg>
\ No newline at end of file
diff --git a/Graphics/update-drawables.sh b/Graphics/update-drawables.sh
index 61dc51099..5acfba19a 100755
--- a/Graphics/update-drawables.sh
+++ b/Graphics/update-drawables.sh
@@ -22,7 +22,7 @@ SRC_DIR=./drawables/
 #inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg
 
 
-for NAME in "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "yubi_icon"
+for NAME in "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "yubi_icon" "ic_stat_notify"
 do
 echo $NAME
 inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg"
diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/TestHelpers.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/TestHelpers.java
index 6f7e193cd..958c589cb 100644
--- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/TestHelpers.java
+++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/TestHelpers.java
@@ -41,7 +41,9 @@ import org.hamcrest.CoreMatchers;
 import org.hamcrest.Matcher;
 import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
 import org.sufficientlysecure.keychain.pgp.UncachedKeyRing.IteratorWithIOThrow;
+import org.sufficientlysecure.keychain.provider.KeychainDatabase;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.service.PassphraseCacheService;
 import org.sufficientlysecure.keychain.ui.util.Notify.Style;
 import org.sufficientlysecure.keychain.util.ProgressScaler;
 
@@ -148,5 +150,16 @@ public class TestHelpers {
         return passbuilder.toString();
     }
 
+    public static void cleanupForTests(Context context) throws Exception {
+
+        new KeychainDatabase(context).clearDatabase();
+
+        // import these two, make sure they're there
+        importKeysFromResource(context, "x.sec.asc");
+
+        // make sure no passphrases are cached
+        PassphraseCacheService.clearCachedPassphrases(context);
+
+    }
 
 }
diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/remote/OpenPgpServiceTest.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/remote/OpenPgpServiceTest.java
new file mode 100644
index 000000000..aaf7499b7
--- /dev/null
+++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/remote/OpenPgpServiceTest.java
@@ -0,0 +1,171 @@
+package org.sufficientlysecure.keychain.remote;
+
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.os.IBinder;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ServiceTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.LargeTest;
+import android.widget.AdapterView;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.openintents.openpgp.IOpenPgpService;
+import org.openintents.openpgp.util.OpenPgpApi;
+import org.sufficientlysecure.keychain.R;
+
+import static android.support.test.espresso.Espresso.onData;
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.action.ViewActions.typeText;
+import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+import static org.sufficientlysecure.keychain.TestHelpers.cleanupForTests;
+import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withKeyItemId;
+
+
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class OpenPgpServiceTest {
+
+    @Rule
+    public final ServiceTestRule mServiceRule = new ServiceTestRule();
+
+    OpenPgpApi mApi;
+
+    @Before
+    public void setUp() throws Exception {
+
+        cleanupForTests(InstrumentationRegistry.getTargetContext());
+
+        Intent serviceIntent = new Intent(InstrumentationRegistry.getTargetContext(), OpenPgpService.class);
+        IBinder binder = mServiceRule.bindService(serviceIntent);
+
+        mApi = new OpenPgpApi(InstrumentationRegistry.getTargetContext(),
+                IOpenPgpService.Stub.asInterface(binder));
+
+    }
+
+    @Test
+    public void testStuff() throws Exception {
+
+        // TODO why does this not ask for general usage permissions?!
+
+        {
+            Intent intent = new Intent();
+            intent.setAction(OpenPgpApi.ACTION_ENCRYPT);
+            intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
+            intent.putExtra(OpenPgpApi.EXTRA_KEY_IDS, new long[] { 0x9D604D2F310716A3L });
+
+            ByteArrayInputStream is = new ByteArrayInputStream("swag".getBytes());
+            ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+            Intent result = mApi.executeApi(intent, is, os);
+
+            assertThat("result is pending accept",
+                    result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR),
+                    is(OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED));
+
+            PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT);
+            pi.send();
+
+            onView(withText(R.string.api_register_allow)).perform(click());
+
+        }
+
+        byte[] ciphertext;
+        {
+            Intent intent = new Intent();
+            intent.setAction(OpenPgpApi.ACTION_ENCRYPT);
+            intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
+            intent.putExtra(OpenPgpApi.EXTRA_KEY_IDS, new long[] { 0x9D604D2F310716A3L });
+
+            ByteArrayInputStream is = new ByteArrayInputStream("swag".getBytes());
+            ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+            Intent result = mApi.executeApi(intent, is, os);
+
+            assertThat("result is ok",
+                    result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR),
+                    is(OpenPgpApi.RESULT_CODE_SUCCESS));
+
+            ciphertext = os.toByteArray();
+        }
+
+        { // decrypt
+            Intent intent = new Intent();
+            intent.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY);
+
+            ByteArrayInputStream is = new ByteArrayInputStream(ciphertext);
+            ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+            Intent result = mApi.executeApi(intent, is, os);
+
+            assertThat("result is pending input",
+                    result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR),
+                    is(OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED));
+
+            PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT);
+            pi.send();
+
+            onData(withKeyItemId(0x9D604D2F310716A3L))
+                    .inAdapterView(isAssignableFrom(AdapterView.class))
+                    .perform(click());
+
+            onView(withText(R.string.api_settings_save)).perform(click());
+
+            // unfortunately, getting the activity result from the
+
+        }
+
+        { // decrypt again, this time pending passphrase
+            Intent intent = new Intent();
+            intent.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY);
+
+            ByteArrayInputStream is = new ByteArrayInputStream(ciphertext);
+            ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+            Intent result = mApi.executeApi(intent, is, os);
+
+            assertThat("result is pending passphrase",
+                    result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR),
+                    is(OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED));
+
+            PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT);
+            pi.send();
+
+            onView(withId(R.id.passphrase_passphrase)).perform(typeText("x"));
+            onView(withText(R.string.btn_unlock)).perform(click());
+        }
+
+        { // decrypt again, NOW it should work with passphrase cached =)
+            Intent intent = new Intent();
+            intent.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY);
+
+            ByteArrayInputStream is = new ByteArrayInputStream(ciphertext);
+            ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+            Intent result = mApi.executeApi(intent, is, os);
+
+            assertThat("result is pending passphrase",
+                    result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR),
+                    is(OpenPgpApi.RESULT_CODE_SUCCESS));
+
+            byte[] plaintext = os.toByteArray();
+            assertThat("decrypted plaintext matches plaintext", new String(plaintext), is("swag"));
+
+        }
+
+    }
+
+}
diff --git a/OpenKeychain/src/debug/res/drawable-hdpi/ic_stat_notify.png b/OpenKeychain/src/debug/res/drawable-hdpi/ic_stat_notify.png
new file mode 100644
index 000000000..b31481995
--- /dev/null
+++ b/OpenKeychain/src/debug/res/drawable-hdpi/ic_stat_notify.png
diff --git a/OpenKeychain/src/debug/res/drawable-mdpi/ic_stat_notify.png b/OpenKeychain/src/debug/res/drawable-mdpi/ic_stat_notify.png
new file mode 100644
index 000000000..39e799e5a
--- /dev/null
+++ b/OpenKeychain/src/debug/res/drawable-mdpi/ic_stat_notify.png
diff --git a/OpenKeychain/src/debug/res/drawable-xhdpi/ic_stat_notify.png b/OpenKeychain/src/debug/res/drawable-xhdpi/ic_stat_notify.png
new file mode 100644
index 000000000..af1613d40
--- /dev/null
+++ b/OpenKeychain/src/debug/res/drawable-xhdpi/ic_stat_notify.png
diff --git a/OpenKeychain/src/debug/res/drawable-xxhdpi/ic_stat_notify.png b/OpenKeychain/src/debug/res/drawable-xxhdpi/ic_stat_notify.png
new file mode 100644
index 000000000..9da107396
--- /dev/null
+++ b/OpenKeychain/src/debug/res/drawable-xxhdpi/ic_stat_notify.png
diff --git a/OpenKeychain/src/debug/res/drawable-xxxhdpi/ic_stat_notify.png b/OpenKeychain/src/debug/res/drawable-xxxhdpi/ic_stat_notify.png
new file mode 100644
index 000000000..5c81db8bf
--- /dev/null
+++ b/OpenKeychain/src/debug/res/drawable-xxxhdpi/ic_stat_notify.png
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
index ecf68890e..7be61d9c8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
@@ -219,7 +219,7 @@ public class UncachedKeyRing {
         Iterator<PGPPublicKey> it = mRing.getPublicKeys();
         while (it.hasNext()) {
             if (KeyFormattingUtils.convertFingerprintToHex(
-                    it.next().getFingerprint()).equals(expectedFingerprint)) {
+                    it.next().getFingerprint()).equalsIgnoreCase(expectedFingerprint)) {
                 return true;
             }
         }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
index a91eca453..3346926ec 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
@@ -430,6 +430,9 @@ public class KeychainDatabase extends SQLiteOpenHelper {
     // DANGEROUS, use in test code ONLY!
     public void clearDatabase() {
         getWritableDatabase().execSQL("delete from " + Tables.KEY_RINGS_PUBLIC);
+        getWritableDatabase().execSQL("delete from " + Tables.API_ACCOUNTS);
+        getWritableDatabase().execSQL("delete from " + Tables.API_ALLOWED_KEYS);
+        getWritableDatabase().execSQL("delete from " + Tables.API_APPS);
     }
 
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsAllowedKeysListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsAllowedKeysListFragment.java
index b880525ca..caa173f03 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsAllowedKeysListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsAllowedKeysListFragment.java
@@ -17,10 +17,11 @@
 
 package org.sufficientlysecure.keychain.remote.ui;
 
-import android.content.Context;
+
+import java.util.Set;
+
 import android.content.OperationApplicationException;
 import android.database.Cursor;
-import android.database.DatabaseUtils;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.RemoteException;
@@ -35,23 +36,17 @@ import android.widget.ListView;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.compatibility.ListFragmentWorkaround;
-import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
-import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
+import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
-import org.sufficientlysecure.keychain.ui.adapter.SelectKeyCursorAdapter;
+import org.sufficientlysecure.keychain.ui.adapter.KeyAdapter;
+import org.sufficientlysecure.keychain.ui.adapter.KeySelectableAdapter;
 import org.sufficientlysecure.keychain.ui.widget.FixedListView;
 import org.sufficientlysecure.keychain.util.Log;
 
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.Vector;
-
 public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround implements LoaderManager.LoaderCallbacks<Cursor> {
     private static final String ARG_DATA_URI = "uri";
 
-    private SelectKeyCursorAdapter mAdapter;
-    private Set<Long> mSelectedMasterKeyIds;
+    private KeySelectableAdapter mAdapter;
     private ProviderHelper mProviderHelper;
 
     private Uri mDataUri;
@@ -80,8 +75,7 @@ public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround i
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        View layout = super.onCreateView(inflater, container,
-                savedInstanceState);
+        View layout = super.onCreateView(inflater, container, savedInstanceState);
         ListView lv = (ListView) layout.findViewById(android.R.id.list);
         ViewGroup parent = (ViewGroup) lv.getParent();
 
@@ -109,67 +103,29 @@ public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround i
 
         mDataUri = getArguments().getParcelable(ARG_DATA_URI);
 
-        getListView().setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
-
         // Give some text to display if there is no data. In a real
         // application this would come from a resource.
         setEmptyText(getString(R.string.list_empty));
 
-        mAdapter = new SecretKeyCursorAdapter(getActivity(), null, 0, getListView());
-
+        Set<Long> checked = mProviderHelper.getAllKeyIdsForApp(mDataUri);
+        mAdapter = new KeySelectableAdapter(getActivity(), null, 0, checked);
         setListAdapter(mAdapter);
+        getListView().setOnItemClickListener(mAdapter);
 
         // Start out with a progress indicator.
         setListShown(false);
 
-        mSelectedMasterKeyIds = mProviderHelper.getAllKeyIdsForApp(mDataUri);
-        Log.d(Constants.TAG, "allowed: " + mSelectedMasterKeyIds.toString());
-
         // Prepare the loader. Either re-connect with an existing one,
         // or start a new one.
         getLoaderManager().initLoader(0, null, this);
-    }
 
-    /**
-     * Selects items based on master key ids in list view
-     *
-     * @param masterKeyIds
-     */
-    private void preselectMasterKeyIds(Set<Long> masterKeyIds) {
-        for (int i = 0; i < getListView().getCount(); ++i) {
-            long listKeyId = mAdapter.getMasterKeyId(i);
-            for (long keyId : masterKeyIds) {
-                if (listKeyId == keyId) {
-                    getListView().setItemChecked(i, true);
-                    break;
-                }
-            }
-        }
     }
-
-    /**
-     * Returns all selected master key ids
-     *
-     * @return
-     */
+    /** Returns all selected master key ids. */
     public Set<Long> getSelectedMasterKeyIds() {
-        // mListView.getCheckedItemIds() would give the row ids of the KeyRings not the master key
-        // ids!
-        Set<Long> keyIds = new HashSet<>();
-        for (int i = 0; i < getListView().getCount(); ++i) {
-            if (getListView().isItemChecked(i)) {
-                keyIds.add(mAdapter.getMasterKeyId(i));
-            }
-        }
-
-        return keyIds;
+        return mAdapter.getSelectedMasterKeyIds();
     }
 
-    /**
-     * Returns all selected user ids
-     *
-     * @return
-     */
+    /** Returns all selected user ids.
     public String[] getSelectedUserIds() {
         Vector<String> userIds = new Vector<>();
         for (int i = 0; i < getListView().getCount(); ++i) {
@@ -181,7 +137,7 @@ public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround i
         // make empty array to not return null
         String userIdArray[] = new String[0];
         return userIds.toArray(userIdArray);
-    }
+    } */
 
     public void saveAllowedKeys() {
         try {
@@ -192,46 +148,11 @@ public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround i
     }
 
     @Override
-    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-        Uri baseUri = KeyRings.buildUnifiedKeyRingsUri();
-
-        // These are the rows that we will retrieve.
-        String[] projection = new String[]{
-                KeyRings._ID,
-                KeyRings.MASTER_KEY_ID,
-                KeyRings.USER_ID,
-                KeyRings.IS_EXPIRED,
-                KeyRings.IS_REVOKED,
-                KeyRings.HAS_ENCRYPT,
-                KeyRings.VERIFIED,
-                KeyRings.HAS_ANY_SECRET,
-                KeyRings.HAS_DUPLICATE_USER_ID,
-                KeyRings.CREATION,
-        };
-
-        String inMasterKeyList = null;
-        if (mSelectedMasterKeyIds != null && mSelectedMasterKeyIds.size() > 0) {
-            inMasterKeyList = Tables.KEYS + "." + KeyRings.MASTER_KEY_ID + " IN (";
-            Iterator iter = mSelectedMasterKeyIds.iterator();
-            while (iter.hasNext()) {
-                inMasterKeyList += DatabaseUtils.sqlEscapeString("" + iter.next());
-                if (iter.hasNext()) {
-                    inMasterKeyList += ", ";
-                }
-            }
-            inMasterKeyList += ")";
-        }
-
-        String selection = KeyRings.HAS_ANY_SECRET + " != 0";
+    public Loader<Cursor> onCreateLoader(int loaderId, Bundle data) {
+        Uri baseUri = KeychainContract.KeyRings.buildUnifiedKeyRingsUri();
+        String where = KeychainContract.KeyRings.HAS_ANY_SECRET + " = 1";
 
-        String orderBy = KeyRings.USER_ID + " ASC";
-        if (inMasterKeyList != null) {
-            // sort by selected master keys
-            orderBy = inMasterKeyList + " DESC, " + orderBy;
-        }
-        // Now create and return a CursorLoader that will take care of
-        // creating a Cursor for the data being displayed.
-        return new CursorLoader(getActivity(), baseUri, projection, selection, null, orderBy);
+        return new CursorLoader(getActivity(), baseUri, KeyAdapter.PROJECTION, where, null, null);
     }
 
     @Override
@@ -246,9 +167,6 @@ public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround i
         } else {
             setListShownNoAnimation(true);
         }
-
-        // preselect given master keys
-        preselectMasterKeyIds(mSelectedMasterKeyIds);
     }
 
     @Override
@@ -259,36 +177,4 @@ public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround i
         mAdapter.swapCursor(null);
     }
 
-    private class SecretKeyCursorAdapter extends SelectKeyCursorAdapter {
-
-        public SecretKeyCursorAdapter(Context context, Cursor c, int flags, ListView listView) {
-            super(context, c, flags, listView);
-        }
-
-        @Override
-        protected void initIndex(Cursor cursor) {
-            super.initIndex(cursor);
-        }
-
-        @Override
-        public void bindView(View view, Context context, Cursor cursor) {
-            super.bindView(view, context, cursor);
-            ViewHolderItem h = (ViewHolderItem) view.getTag();
-
-            // We care about the checkbox
-            h.selected.setVisibility(View.VISIBLE);
-            // the getListView works because this is not a static subclass!
-            h.selected.setChecked(getListView().isItemChecked(cursor.getPosition()));
-
-            boolean enabled = false;
-            if ((Boolean) h.statusIcon.getTag()) {
-                h.statusIcon.setVisibility(View.GONE);
-                enabled = true;
-            }
-
-            h.setEnabled(enabled);
-        }
-
-    }
-
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index dbbfe3133..a0b470add 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -17,6 +17,9 @@
 
 package org.sufficientlysecure.keychain.service;
 
+
+import java.util.Date;
+
 import android.app.AlarmManager;
 import android.app.Notification;
 import android.app.PendingIntent;
@@ -25,8 +28,13 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
 import android.os.Binder;
 import android.os.Build;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -46,8 +54,6 @@ import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.Passphrase;
 import org.sufficientlysecure.keychain.util.Preferences;
 
-import java.util.Date;
-
 /**
  * This service runs in its own process, but is available to all other processes as the main
  * passphrase cache. Use the static methods addCachedPassphrase and getCachedPassphrase for
@@ -317,7 +323,7 @@ public class PassphraseCacheService extends Service {
 
                     if (action.equals(BROADCAST_ACTION_PASSPHRASE_CACHE_SERVICE)) {
                         long keyId = intent.getLongExtra(EXTRA_KEY_ID, -1);
-                        timeout(context, keyId);
+                        timeout(keyId);
                     }
                 }
             };
@@ -452,7 +458,7 @@ public class PassphraseCacheService extends Service {
     /**
      * Called when one specific passphrase for keyId timed out
      */
-    private void timeout(Context context, long keyId) {
+    private void timeout(long keyId) {
         CachedPassphrase cPass = mPassphraseCache.get(keyId);
         // clean internal char[] from memory!
         cPass.getPassphrase().removeFromMemory();
@@ -474,59 +480,67 @@ public class PassphraseCacheService extends Service {
         }
     }
 
+    // from de.azapps.mirakel.helper.Helpers from https://github.com/MirakelX/mirakel-android
+    private static Bitmap getBitmap(int resId, Context context) {
+        int mLargeIconWidth = (int) context.getResources().getDimension(
+                                  android.R.dimen.notification_large_icon_width);
+        int mLargeIconHeight = (int) context.getResources().getDimension(
+                                   android.R.dimen.notification_large_icon_height);
+        Drawable d;
+        if (VERSION.SDK_INT < VERSION_CODES.LOLLIPOP) {
+            // noinspection deprecation (can't help it at this api level)
+            d = context.getResources().getDrawable(resId);
+        } else {
+            d = context.getDrawable(resId);
+        }
+        if (d == null) {
+            return null;
+        }
+        Bitmap b = Bitmap.createBitmap(mLargeIconWidth, mLargeIconHeight, Bitmap.Config.ARGB_8888);
+        Canvas c = new Canvas(b);
+        d.setBounds(0, 0, mLargeIconWidth, mLargeIconHeight);
+        d.draw(c);
+        return b;
+    }
+
     private Notification getNotification() {
         NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
+        builder.setSmallIcon(R.drawable.ic_stat_notify_24dp)
+                .setLargeIcon(getBitmap(R.drawable.ic_launcher, getBaseContext()))
+                .setContentTitle(getResources().getQuantityString(R.plurals.passp_cache_notif_n_keys,
+                        mPassphraseCache.size(), mPassphraseCache.size()))
+                .setContentText(getString(R.string.passp_cache_notif_click_to_clear));
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            builder.setSmallIcon(R.drawable.ic_launcher)
-                    .setContentTitle(getString(R.string.app_name))
-                    .setContentText(String.format(getString(R.string.passp_cache_notif_n_keys),
-                            mPassphraseCache.size()));
+        NotificationCompat.InboxStyle inboxStyle = new NotificationCompat.InboxStyle();
 
-            NotificationCompat.InboxStyle inboxStyle = new NotificationCompat.InboxStyle();
+        inboxStyle.setBigContentTitle(getString(R.string.passp_cache_notif_keys));
 
-            inboxStyle.setBigContentTitle(getString(R.string.passp_cache_notif_keys));
+        // Moves events into the big view
+        for (int i = 0; i < mPassphraseCache.size(); i++) {
+            inboxStyle.addLine(mPassphraseCache.valueAt(i).getPrimaryUserID());
+        }
 
-            // Moves events into the big view
-            for (int i = 0; i < mPassphraseCache.size(); i++) {
-                inboxStyle.addLine(mPassphraseCache.valueAt(i).getPrimaryUserID());
-            }
+        // Moves the big view style object into the notification object.
+        builder.setStyle(inboxStyle);
 
-            // Moves the big view style object into the notification object.
-            builder.setStyle(inboxStyle);
-
-            // Add purging action
-            Intent intent = new Intent(getApplicationContext(), PassphraseCacheService.class);
-            intent.setAction(ACTION_PASSPHRASE_CACHE_CLEAR);
-            builder.addAction(
-                    R.drawable.abc_ic_clear_mtrl_alpha,
-                    getString(R.string.passp_cache_notif_clear),
-                    PendingIntent.getService(
-                            getApplicationContext(),
-                            0,
-                            intent,
-                            PendingIntent.FLAG_UPDATE_CURRENT
-                    )
-            );
-        } else {
-            // Fallback, since expandable notifications weren't available back then
-            builder.setSmallIcon(R.drawable.ic_launcher)
-                    .setContentTitle(String.format(getString(R.string.passp_cache_notif_n_keys),
-                            mPassphraseCache.size()))
-                    .setContentText(getString(R.string.passp_cache_notif_click_to_clear));
-
-            Intent intent = new Intent(getApplicationContext(), PassphraseCacheService.class);
-            intent.setAction(ACTION_PASSPHRASE_CACHE_CLEAR);
-
-            builder.setContentIntent(
-                    PendingIntent.getService(
-                            getApplicationContext(),
-                            0,
-                            intent,
-                            PendingIntent.FLAG_UPDATE_CURRENT
-                    )
-            );
-        }
+        Intent intent = new Intent(getApplicationContext(), PassphraseCacheService.class);
+        intent.setAction(ACTION_PASSPHRASE_CACHE_CLEAR);
+        PendingIntent clearCachePi = PendingIntent.getService(
+                getApplicationContext(),
+                0,
+                intent,
+                PendingIntent.FLAG_UPDATE_CURRENT
+        );
+
+        // Add cache clear PI to normal touch
+        builder.setContentIntent(clearCachePi);
+
+        // Add clear PI action below text
+        builder.addAction(
+                R.drawable.abc_ic_clear_mtrl_alpha,
+                getString(R.string.passp_cache_notif_clear),
+                clearCachePi
+        );
 
         return builder.build();
     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
index 1fc24775b..e545b007b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
@@ -95,6 +95,8 @@ public class KeyAdapter extends CursorAdapter {
         public View mSlinger;
         public ImageButton mSlingerButton;
 
+        public KeyItem mDisplayedItem;
+
         public KeyItemViewHolder(View view) {
             mView = view;
             mMainUserId = (TextView) view.findViewById(R.id.key_list_item_name);
@@ -107,6 +109,8 @@ public class KeyAdapter extends CursorAdapter {
 
         public void setData(Context context, KeyItem item, Highlighter highlighter) {
 
+            mDisplayedItem = item;
+
             { // set name and stuff, common to both key types
                 KeyRing.UserId userIdSplit = item.mUserId;
                 if (userIdSplit.name != null) {
@@ -143,6 +147,9 @@ public class KeyAdapter extends CursorAdapter {
                 } else if (item.mIsSecret) {
                     mStatus.setVisibility(View.GONE);
                     if (mSlingerButton.hasOnClickListeners()) {
+                        mSlingerButton.setColorFilter(
+                                context.getResources().getColor(R.color.tertiary_text_light),
+                                PorterDuff.Mode.SRC_IN);
                         mSlinger.setVisibility(View.VISIBLE);
                     } else {
                         mSlinger.setVisibility(View.GONE);
@@ -192,8 +199,6 @@ public class KeyAdapter extends CursorAdapter {
         View view = mInflater.inflate(R.layout.key_list_item, parent, false);
         KeyItemViewHolder holder = new KeyItemViewHolder(view);
         view.setTag(holder);
-        holder.mSlingerButton.setColorFilter(context.getResources().getColor(R.color.tertiary_text_light),
-                PorterDuff.Mode.SRC_IN);
         return view;
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySelectableAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySelectableAdapter.java
new file mode 100644
index 000000000..471a20411
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySelectableAdapter.java
@@ -0,0 +1,87 @@
+package org.sufficientlysecure.keychain.ui.adapter;
+
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.support.v7.internal.widget.AdapterViewCompat;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.CheckBox;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.util.Log;
+
+
+public class KeySelectableAdapter extends KeyAdapter implements OnItemClickListener {
+
+    HashSet<Long> mSelectedItems = new HashSet<>();
+
+    public KeySelectableAdapter(Context context, Cursor c, int flags, Set<Long> initialChecked) {
+        super(context, c, flags);
+        if (initialChecked != null) {
+            mSelectedItems.addAll(initialChecked);
+        }
+    }
+
+    public static class KeySelectableItemViewHolder extends KeyItemViewHolder {
+
+        public CheckBox mCheckbox;
+
+        public KeySelectableItemViewHolder(View view) {
+            super(view);
+            mCheckbox = (CheckBox) view.findViewById(R.id.selected);
+        }
+
+        public void setCheckedState(boolean checked) {
+            mCheckbox.setChecked(checked);
+        }
+
+    }
+
+    @Override
+    public View newView(Context context, Cursor cursor, ViewGroup parent) {
+        View view = mInflater.inflate(R.layout.key_list_selectable_item, parent, false);
+        KeySelectableItemViewHolder holder = new KeySelectableItemViewHolder(view);
+        view.setTag(holder);
+        return view;
+    }
+
+    @Override
+    public void bindView(View view, Context context, Cursor cursor) {
+        super.bindView(view, context, cursor);
+
+        KeySelectableItemViewHolder h = (KeySelectableItemViewHolder) view.getTag();
+        h.setCheckedState(mSelectedItems.contains(h.mDisplayedItem.mKeyId));
+
+    }
+
+    public void setCheckedStates(Set<Long> checked) {
+        mSelectedItems.clear();
+        mSelectedItems.addAll(checked);
+        notifyDataSetChanged();
+    }
+
+    public Set<Long> getSelectedMasterKeyIds() {
+        return Collections.unmodifiableSet(mSelectedItems);
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        Log.d(Constants.TAG, "clicked id: " + id);
+        long masterKeyId = getMasterKeyId(position);
+        if (mSelectedItems.contains(masterKeyId)) {
+            mSelectedItems.remove(masterKeyId);
+        } else {
+            mSelectedItems.add(masterKeyId);
+        }
+        notifyDataSetChanged();
+    }
+
+}
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify_24dp.png
new file mode 100644
index 000000000..2b7f41971
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify_24dp.png
new file mode 100644
index 000000000..c24b41148
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify_24dp.png
new file mode 100644
index 000000000..b9198e624
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify_24dp.png
new file mode 100644
index 000000000..8ff2b8041
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify_24dp.png
new file mode 100644
index 000000000..9dad48842
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify_24dp.png
diff --git a/OpenKeychain/src/main/res/layout/key_list_selectable_item.xml b/OpenKeychain/src/main/res/layout/key_list_selectable_item.xml
new file mode 100644
index 000000000..311eaabd6
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/key_list_selectable_item.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:singleLine="true"
+    android:orientation="horizontal"
+    android:descendantFocusability="blocksDescendants"
+    android:focusable="false">
+
+    <CheckBox
+        android:id="@+id/selected"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:clickable="false"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:layout_margin="6dp" />
+
+    <include layout="@layout/key_list_item" />
+
+</LinearLayout>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 1f1acc2a8..e05186c61 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1221,9 +1221,12 @@
     <string name="msg_export_log_success">"Log exported successfully!"</string>
 
     <!-- PassphraseCache -->
-    <string name="passp_cache_notif_click_to_clear">"Click to clear cached passwords"</string>
-    <string name="passp_cache_notif_n_keys">"OpenKeychain has cached %d passwords"</string>
-    <string name="passp_cache_notif_keys">"Cached Passwords:"</string>
+    <string name="passp_cache_notif_click_to_clear">"Touch to clear password cache."</string>
+    <plurals name="passp_cache_notif_n_keys">
+        <item quantity="one">"%d password cached"</item>
+        <item quantity="other">"%d passwords cached"</item>
+    </plurals>
+    <string name="passp_cache_notif_keys">"Cached passwords"</string>
     <string name="passp_cache_notif_clear">"Clear Cache"</string>
     <string name="passp_cache_notif_pwd">"Password"</string>
 
diff --git a/README.md b/README.md
index 7a75b5ec8..d4bb8dfe3 100644
--- a/README.md
+++ b/README.md
@@ -202,17 +202,11 @@ Some parts and some libraries are Apache License v2, MIT X11 License (see below)
 See [In-app about screen](https://github.com/open-keychain/open-keychain/blob/HEAD/OpenKeychain/src/main/res/raw/help_about.md)
 
 ### Images
-* icon.svg  
-  modified version of kgpg_key2_kopete.svgz
-  
 * Actionbar icons  
   http://developer.android.com/design/downloads/index.html#action-bar-icon-pack
-  
+
 * QR Code Actionbar icon  
   https://github.com/openintents/openintents/blob/master/extensions/qrcode_ext/icons/ic_menu_qr_code/ic_menu_qr_code_holo_light/ic_menu_qr_code.svg
 
 * Key status icons by the ModernPGP working group  
   https://github.com/ModernPGP
-  
-* Purple color scheme  
-  http://android-holo-colors.com/