Skip to content

Commit f189039

Browse files
tomholubtomholub
authored
Merge pull request #143 from FlowCrypt/0.3.0
0.3.0: Key Mismatch Handling
2 parents 70ecf83 + b24ad72 commit f189039

File tree

312 files changed

+1922
-623
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

312 files changed

+1922
-623
lines changed

‎.idea/misc.xml‎

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎FlowCrypt/build.gradle‎

Lines changed: 41 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
2+
* Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
33
* Use limitations apply. See https://github.com/FlowCrypt/flowcrypt-android/blob/master/LICENSE
44
* Contributors: DenBond7
55
*/
@@ -32,6 +32,7 @@ android {
3232
versionCode APP_VERSION_CODE as int
3333
versionName APP_VERSION_NAME as String
3434
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
35+
multiDexEnabled true
3536
}
3637

3738
signingConfigs {
@@ -98,46 +99,55 @@ android {
9899
}
99100

100101
dependencies {
101-
debugCompile "com.squareup.leakcanary:leakcanary-android:${LEAKCANARY_VERSION}"
102+
debugImplementation "com.squareup.leakcanary:leakcanary-android:${LEAKCANARY_VERSION}"
102103

103-
releaseCompile "com.squareup.leakcanary:leakcanary-android-no-op:${LEAKCANARY_VERSION}"
104+
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${LEAKCANARY_VERSION}"
104105

105-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
106+
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
106107
exclude group: 'com.android.support', module: 'support-annotations'
107108
})
108109

109-
testCompile "com.squareup.leakcanary:leakcanary-android-no-op:${LEAKCANARY_VERSION}"
110-
testCompile "junit:junit:${JUNIT_VERSION}"
111-
112-
compile fileTree(include: ['*.jar'], dir: 'libs')
113-
114-
compile "com.android.support:support-v4:${ANDROID_SUPPORT_VERSION}"
115-
compile "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}"
116-
compile "com.android.support:design:${ANDROID_SUPPORT_VERSION}"
117-
compile "com.android.support:preference-v14:${ANDROID_SUPPORT_VERSION}"
118-
compile "com.android.support:cardview-v7:${ANDROID_SUPPORT_VERSION}"
119-
compile "com.android.support:customtabs:${ANDROID_SUPPORT_VERSION}"
120-
compile 'com.android.support.constraint:constraint-layout:1.0.2'
121-
122-
compile "com.google.android.gms:play-services-base:${PLAY_SERVICES_VERSION}"
123-
compile "com.google.android.gms:play-services-auth:${PLAY_SERVICES_VERSION}"
124-
compile 'com.google.code.gson:gson:2.8.2'
110+
testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${LEAKCANARY_VERSION}"
111+
testImplementation "junit:junit:${JUNIT_VERSION}"
112+
113+
implementation fileTree(include: ['*.jar'], dir: 'libs')
114+
115+
implementation "com.android.support:support-v4:${ANDROID_SUPPORT_VERSION}"
116+
implementation "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}"
117+
implementation "com.android.support:design:${ANDROID_SUPPORT_VERSION}"
118+
implementation "com.android.support:preference-v14:${ANDROID_SUPPORT_VERSION}"
119+
implementation "com.android.support:cardview-v7:${ANDROID_SUPPORT_VERSION}"
120+
implementation "com.android.support:customtabs:${ANDROID_SUPPORT_VERSION}"
121+
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
122+
implementation 'com.android.support:multidex:1.0.2'
123+
124+
implementation "com.google.android.gms:play-services-base:${PLAY_SERVICES_VERSION}"
125+
implementation "com.google.android.gms:play-services-auth:${PLAY_SERVICES_VERSION}"
126+
implementation 'com.google.code.gson:gson:2.8.2'
127+
implementation('com.google.api-client:google-api-client-android:1.23.0') {
128+
exclude group: 'org.apache.httpcomponents'
129+
exclude group: 'com.google.code.findbugs'
130+
}
131+
implementation('com.google.apis:google-api-services-gmail:v1-rev72-1.23.0') {
132+
exclude group: 'org.apache.httpcomponents'
133+
exclude group: 'com.google.code.findbugs'
134+
}
125135

126-
compile "com.squareup.retrofit2:retrofit:${RETROFIT_VERSION}"
127-
compile "com.squareup.retrofit2:converter-gson:${RETROFIT_VERSION}"
128-
compile "com.squareup.okhttp3:logging-interceptor:${OKHTTP_VERSION}"
136+
implementation "com.squareup.retrofit2:retrofit:${RETROFIT_VERSION}"
137+
implementation "com.squareup.retrofit2:converter-gson:${RETROFIT_VERSION}"
138+
implementation "com.squareup.okhttp3:logging-interceptor:${OKHTTP_VERSION}"
129139

130-
compile "com.sun.mail:android-mail:${JAVA_MAIL_VERSION}"
131-
compile "com.sun.mail:android-activation:${JAVA_MAIL_VERSION}"
132-
compile("com.sun.mail:gimap:${JAVA_MAIL_VERSION}") {
140+
implementation "com.sun.mail:android-mail:${JAVA_MAIL_VERSION}"
141+
implementation "com.sun.mail:android-activation:${JAVA_MAIL_VERSION}"
142+
implementation("com.sun.mail:gimap:${JAVA_MAIL_VERSION}") {
133143
exclude group: 'com.sun.mail'
134144
}
135145

136-
compile "com.github.bumptech.glide:glide:${GLIDE_VERSION}"
146+
implementation "com.github.bumptech.glide:glide:${GLIDE_VERSION}"
137147
annotationProcessor "com.github.bumptech.glide:compiler:${GLIDE_VERSION}"
138148

139-
compile 'com.eclipsesource.j2v8:j2v8:4.8.0@aar'
140-
compile 'commons-io:commons-io:2.5'
141-
compile 'ch.acra:acra:4.9.2'
142-
compile 'com.hootsuite.android:nachos:1.1.1'
149+
implementation 'com.eclipsesource.j2v8:j2v8:4.8.0@aar'
150+
implementation 'commons-io:commons-io:2.5'
151+
implementation 'ch.acra:acra:4.9.2'
152+
implementation 'com.hootsuite.android:nachos:1.1.1'
143153
}

‎FlowCrypt/proguard-rules.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#/*
2-
# * Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
2+
# * Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
33
# * Use limitations apply. See https://github.com/FlowCrypt/flowcrypt-android/blob/master/LICENSE
44
# * Contributors: DenBond7
55
# */

‎FlowCrypt/src/androidTest/java/com/flowcrypt/email/ExampleInstrumentedTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
2+
* Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
33
* Use limitations apply. See https://github.com/FlowCrypt/flowcrypt-android/blob/master/LICENSE
44
* Contributors: DenBond7
55
*/

‎FlowCrypt/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?><!--
2-
~ Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
2+
~ Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
33
~ Use limitations apply. See https://github.com/FlowCrypt/flowcrypt-android/blob/master/LICENSE
44
~ Contributors: DenBond7
55
-->

‎FlowCrypt/src/main/assets/html/email_intro.template.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Business Source License 1.0 © 2016 FlowCrypt Limited ([email protected]). Use limitations apply. This version will change to GPLv3 on 2020-01-01. See https://github.com/CryptUp/cryptup-browser/tree/master/src/LICENCE -->
1+
<!-- Business Source License 1.0 © 2016 FlowCrypt Limited ([email protected]). Use limitations apply. This version will change to GPLv3 on 2020-01-01. See https://github.com/CryptUp/cryptup-browser/tree/master/src/LICENCE -->
22

33
<div dir="ltr">
44
<div style="font-size:12.8px">This email contains a key backup. It will help you access your
@@ -11,7 +11,7 @@
1111
</div>
1212
<br>
1313
<div style="font-size:12.8px;">
14-
<span style="color: red;">DO NOT DELETE THIS EMAIL.</span> Write me at [email protected] so
14+
<span style="color: red;">DO NOT DELETE THIS EMAIL.</span> Write me at [email protected] so
1515
that I can help. I respond very promptly.
1616
</div>
1717
</div>

‎FlowCrypt/src/main/assets/html/license.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
~ Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
2+
~ Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
33
~ Use limitations apply. See https://github.com/FlowCrypt/flowcrypt-android/blob/master/LICENSE
44
~ Contributors: Tom James Holub
55
-->

‎FlowCrypt/src/main/assets/html/privacy.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
~ Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
2+
~ Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
33
~ Use limitations apply. See https://github.com/FlowCrypt/flowcrypt-android/blob/master/LICENSE
44
~ Contributors: Tom James Holub
55
-->
@@ -202,6 +202,6 @@ <h2>Feedback</h2>
202202
<p>This privacy policy is subject to change without prior notice based on feedback from the
203203
community. Such changes and prior versions will be visible on project's public repository
204204
and also mentioned in project's changelog if/when such changes occur.</p>
205-
<p>Please send me your feedback or requests for clarification at [email protected]</p>
205+
<p>Please send me your feedback or requests for clarification at [email protected]</p>
206206

207207
</div>

‎FlowCrypt/src/main/assets/html/security.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
~ Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
2+
~ Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
33
~ Use limitations apply. See https://github.com/FlowCrypt/flowcrypt-android/blob/master/LICENSE
44
~ Contributors: Tom James Holub
55
-->

‎FlowCrypt/src/main/assets/html/sources.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
~ Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
2+
~ Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
33
~ Use limitations apply. See https://github.com/FlowCrypt/flowcrypt-android/blob/master/LICENSE
44
~ Contributors: Tom James Holub
55
-->

0 commit comments

Comments
 (0)