Merge pull request #186 from FlowCrypt/0.4.2

0.4.2

Author: tomholub

.idea/misc.xml

@@ -0,0 +1,14 @@
+language: android
+android:
+        components:
+                - platform-tools
+                - build-tools-27.0.2
+                - android-26
+                - extra-android-m2repository
+script:
+        - ./gradlew build
+before_install:
+        - chmod +x gradlew
+branches:
+        only:
+                - master

.travis.yml

@@ -33,6 +33,7 @@ android {
         versionName APP_VERSION_NAME as String
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
+
     }
 
     signingConfigs {
@@ -103,9 +104,9 @@ dependencies {
 
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${LEAKCANARY_VERSION}"
 
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
+    androidTestImplementation "com.android.support.test.espresso:espresso-core:${ESPRESSO_VERSION}"
+    androidTestImplementation "com.android.support.test.espresso:espresso-contrib:${ESPRESSO_VERSION}"
+    androidTestImplementation 'com.android.support.test:runner:1.0.1'
 
     testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${LEAKCANARY_VERSION}"
     testImplementation "junit:junit:${JUNIT_VERSION}"

FlowCrypt/build.gradle

@@ -144,6 +144,7 @@
 -keep class com.bumptech.glide.** { *; }
 -keep interface com.bumptech.glide.** { *; }
 -keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
 -keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
   **[] $VALUES;
   public *;

FlowCrypt/proguard-rules.pro

@@ -0,0 +1,33 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: Keybase OpenPGP v1.0.0
+Comment: https://keybase.io/crypto
+
+xo0EWjKHfwEEAMZwHz6/npVZkfumMudTzu/V4MV/iwDVPF/N36eort0mrvJxWlA3
+qlCHJkBm4jv6INIYmS5SJR8YLoE8vKbv4QjOih+TrtkbECVwRckxsq4lAVlE6IRq
+mQfn+BOzBy4BX33g8yrzOFL03M58gI8rM8JLtxZM0POYmFYMWUpbEWaXABEBAAHN
+F0JlbiA8YmVuQGZsb3djcnlwdC5jb20+wq0EEwEKABcFAloyh38CGy8DCwkHAxUK
+CAIeAQIXgAAKCRABjAofJqYxOsB/A/9CZHwdGDlLFO0CYKP+9sXOm6G2HA9A/9g7
+IIrDlGmxuL3ZavmOmY39jfCUSK9lDh+B4vl4xY1VzrK1IHYqDnNLLLfDFWQKafT2
+g6/y1/7Udf+qIEcdQcIU7RcLFmGOCNnn9uYgYYM/ENacGdUQngMrER7o9Xt3Aq3g
+qO+SXKDEU86NBFoyh38BBACs/+Pku9lrPvxzju/P5lvWUv09ELIB01nZQLtqFFd5
+waGTlW/UZL1CW0Q6z7l37MjJEMCPa0ebaTnbCr1C1SIh3qzCT1vv9OJUh2l+GyY+
+8S69wYk+rV++D8qUhUDbXU3xsTvCziIi4QJUS62IEiVdjpqjOn+HCOk9L3vTRpEN
+xQARAQABwsCDBBgBCgAPBQJaMod/BQkPCZwAAhsuAKgJEAGMCh8mpjE6nSAEGQEK
+AAYFAloyh38ACgkQakOS0I1xPZ8q/AP/RCrOUPP+H0IkCIZ44DkAS+2s8sRAgEeW
+skvvCQa0qvhpnTg9mR8mSxmPxYSD1SqNeJp3umdGiyyhlCd3Ic5nFAf4rNOy7TXI
+59RxrzxgUOxgSAetKUiaIxZHOxBmE4W6+Xh/PKcFPkNNoRm8IQ4Br4zMH3Ne2qcl
+CVzJpGHwpe8WGgP/aXF4uCO0VYWjbm5cGd4nONL2Q29p6dnlZNXHtFg02iBj4dog
+uWEsEYMxEztaN82wF4DHQXnbhuPLKyMSNBxpGI1JheV/dEBlBAqk+v0FuBmLX/iL
+WAvct6wch8U8WOkmZApYl82HJ7kdY0BiG9bXLOJu68dEzQGyDdLeMHb4An3OjQRa
+Mod/AQQAvZAeLtuNwxbUjnesG3O+DUkZ/DjPsC7OLisNPhCnAkXCuTllh6AMuYFg
+vF6RVCoH0J9FAv97eaAb/tEDUkQ6Xl/OCETTpyOO2N+EzsMaXXGjpfQ+WBTcf1QD
+YCujdCPE3Jclc4lFSYnpEuJ/u51lcXhWmTZ/xMOPUz2YAqLm39kAEQEAAcLAgwQY
+AQoADwUCWjKHfwUJDwmcAAIbLgCoCRABjAofJqYxOp0gBBkBCgAGBQJaMod/AAoJ
+EAR/bq81nbCqK7gD/07ZkJu8nv/Xyj4lNUGZ56Ry4XIfFxBr1q7yuBqwGyQmKOfH
+r4AAjxMudsTEgw+wk4gC+nWs82D0G62qAI5BrlKLWwnDP82vj+w9a65tF7ZUQtF3
+hkneQDIIk001a1JGqEW/HkbLYJQzXDazUZcXkBP4NfUde3z7NHmgGBTpUNcpcIME
+ALMnkCH0ZYGjzzF3yEGT8rUvc1ifnsJJWcIvLm5jsLXEnZt/7ztAK4THEhWpD91A
+4nq8+/qo3T5hij0REuQmKRa+RP48okZasyuD6PWcRmVK0ip7JB3D6aRklnvM6UDm
+OqxrJcb5SKOlagE4MC62v8hEw/c70dzmPz22b6s8uROM
+=+pUU
+-----END PGP PUBLIC KEY BLOCK-----

FlowCrypt/src/androidTest/assets/pgp/1_mb_image.jpg

@@ -0,0 +1,57 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+Version: Keybase OpenPGP v1.0.0
+Comment: https://keybase.io/crypto
+
+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
+w/c70dzmPz22b6s8uROM
+=XR0L
+-----END PGP PRIVATE KEY BLOCK-----

FlowCrypt/src/androidTest/assets/pgp/1_mb_image.jpg.pgp

@@ -0,0 +1,32 @@
+Content-Type: multipart/mixed;
+ boundary="----sinikael-?=_1-15133302664520.125841259040949"
+In-Reply-To: <>
+References: <>
+To: Den <[email protected]>
+From: [email protected]
+Subject: Test message
+Date: Fri, 15 Dec 2017 09:31:06 +0000
+Message-Id: <[email protected]>
+MIME-Version: 1.0
+
+------sinikael-?=_1-15133302664520.125841259040949
+Content-Type: text/plain
+Content-Transfer-Encoding: quoted-printable
+
+-----BEGIN PGP MESSAGE-----
+Version: FlowCrypt Android 0.4.1 Gmail Encryption flowcrypt.com
+Comment: Seamlessly send, receive and search encrypted email
+
+wYwDtlaP7aHvWGEBA/9iFsQqoIIQXzj4X4GjTWi6DcltmfeAZ/4jrFV0zxac
+CxUbsYaOYAmmazu+ct1niOwDDhV/K9zmGKNONC+k+QnhsLA4f5TXZ8qEF1ms
+Odx7B7Le/A6gEcurM4qtoqEIvYp2XdKFewTY7iTnJZ4vxuaoQWvDwxQEvfDS
+l6acfMu1asGMA2pDktCNcT2fAQP/dTfest9cog1ETF/VuYYiZNG8QocnP3g9
+MEuf2qDzKQqHKjPnBUQFTbeuBp7+8Tiuob3oRkdBF9sY7B24WdbiQIpGj0I2
+mMGhkLdfiyLD5OFJgb5HmC0eOIa0LslbIRcxhTWBqVPP9oCFWkawov3r0/Y/
+leZ47qZ+rqdaHGpzLUDSXwEiPYPgRQAtpHHxdXRfuQfKlGBIu/8xdFRndCjj
+pl3LLafJ8JsRpmRGNUhluWtaVuTksKkKEN9K+EAkXqhysLdq8l8BjEB60yLZ
+cg6kPb8EzJDdsCrhHPVb8KLrG/5B
+=3DVSGm
+-----END PGP MESSAGE-----
+
+------sinikael-?=_1-15133302664520.125841259040949--

FlowCrypt/src/androidTest/assets/pgp/[email protected]

@@ -0,0 +1,33 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: Keybase OpenPGP v1.0.0
+Comment: https://keybase.io/crypto
+
+xo0EWjKIlgEEALl+COgbYwuqIwJ03NLeZBPiBk1KWW37Wyq9ADEGB6PYHRtD795f
+3x/R3EODPsZEhwh7pjctmM6g7fA4FgB6D+U9IxoEjiRz21nFn8Rad8L9YeWiUqur
+tuV1AjXPB79B2LKBT8JCeRF4iYCjQ6PBSltM6ahD8imyT0DLxCoVWs63ABEBAAHN
+F0RlbiA8ZGVuQGZsb3djcnlwdC5jb20+wq0EEwEKABcFAloyiJYCGy8DCwkHAxUK
+CAIeAQIXgAAKCRAcwbRkHAZSzE3PA/9a8iJJmaDG+acnAzxoIudC+ajAPeat2xDq
+qXvSPT/ehMnXR5Nims5kCXTIZoGIJYykrD+ar9cXKTznPegQT0lyrY18NJr0YpvT
+EaXsRgbfhQJHFI6fZUR045M495wUHnERa8QZDzecAFu2+TVnWsSrVeYv6zxjzfIk
+8MGftkfZCM6NBFoyiJYBBAChqm2ahhb6pqauffP+H94OhRmnga/a2//Jdt+DM11U
+woQU1/DxRKXrtoiterMgm+czuvcSRPqygwILykciS/Ir7+NkVgGY2ng9+vOogSdU
+6kjeDehtlYd0X+k45//IqtwiYEB0UBtt2Vdr97WBxg1N2If1BzkcdDo9+fmqJlqq
+HwARAQABwsCDBBgBCgAPBQJaMoiWBQkPCZwAAhsuAKgJEBzBtGQcBlLMnSAEGQEK
+AAYFAloyiJYACgkQtlaP7aHvWGEDlgP/Q6xXa3J7vfvOj0MyFvxes/ugI1kAGV7v
+j8iYsIuQzhhuMWOpBfuUiBDN8j1b0lTYf6clvPyTGJdlUsUj1SYyMxtNSePW04FR
+AaS4XvECWdy4CPcHHU4rvxvHp5cMd3aB6xeEU0gHKUKjOFl62XcWPf00SD405aFH
+SKLjejG3xsapgAQAoifzW6mvy6FuR8Xbg7Wnx6/xJHffl/QFKtTKwdY/3NanD+BE
+9gcIOgpTyGAD/pW5kooWxpYRH8abjBMomZhfhV9zXHbZC+1g/XtbRuBaWW1cOFsS
+lwpZTo+Vxi0JErQFrmqiQLghVTDV/nSCSvSSyzr421zRwv/Q0Ugv/rA6QuLOjQRa
+MoiWAQQAv5HwNNY9VhnIbpzbo4fEBVH8hnCQo2ikc5818P3wALXhG6/imIHJZYuZ
+rTntN0h0z5xGwBtktxmo9A5oQOdTL9SxiBPM/oYGRlcCeWSSrHZr+zaH5qyF898V
+qyLuf3VX/Iv4lM11jjH0AIJbQ6BQT+iojxccu4qj8s5oMFhqN1cAEQEAAcLAgwQY
+AQoADwUCWjKIlgUJDwmcAAIbLgCoCRAcwbRkHAZSzJ0gBBkBCgAGBQJaMoiWAAoJ
+EG3VBgnTBNkKBEID/3uCmKwJrTfbzhbcQkJzydwRQj7D0BJjD+gnitIrnRozv7Yk
+CTNRBG3xizjFRT4TzPdP2FxDlmlmTeETA3qVE5elLqK1To45SnB+A/qnSTYOdLid
+JSrDtGKL9DvaiSTN+6IblGeS+57X1a6vm5sYBb3wQd8WIDs6qhkv6sUXDJOp9cYE
+AJBP+dn/Xte+4EbyqWTsaszdlpnmF/ZsZZmBzU2QOze/zTHu/ku6Qesqf3UCPYhO
++c+j1Q0Srcm61SWXF9oAst8J37yapVlgFB+tuM+JXVdpd2KmFySuGIq2oHLC2KO2
+NNwMZmCW/S+HKC+V0cfKgUkRdeM2YJCHY0IhOP6jhX8U
+=YEZX
+-----END PGP PUBLIC KEY BLOCK-----