wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5759 from k9mail/updates

Browse source 
Update all the things
This commit is contained in:
cketti 2021-10-31 19:04:43 +01:00 committed by GitHub
commit 3887681d58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 276 additions and 221 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/autodiscovery/providersxml/build.gradle
View file

@ -16,7 +16,7 @@ dependencies {
testImplementation "com.google.truth:truth:${versions.truth}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "org.koin:koin-test:${versions.koin}"
testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
}
android {

2
app/autodiscovery/srvrecords/build.gradle
View file

@ -17,7 +17,7 @@ dependencies {
testImplementation "com.google.truth:truth:${versions.truth}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "org.koin:koin-test:${versions.koin}"
testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
}
android {

2
app/autodiscovery/thunderbird/build.gradle
View file

@ -17,7 +17,7 @@ dependencies {
testImplementation "com.google.truth:truth:${versions.truth}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "org.koin:koin-test:${versions.koin}"
testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
}
android {

4
app/core/build.gradle
View file

@ -8,7 +8,7 @@ dependencies {
implementation project(':plugins:openpgp-api-lib:openpgp-api')
api "org.koin:koin-androidx-viewmodel:${versions.koin}"
api "io.insert-koin:koin-android:${versions.koin}"
api "androidx.annotation:annotation:${versions.androidxAnnotation}"
@ -37,7 +37,7 @@ dependencies {
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "org.jdom:jdom2:2.0.6"
testImplementation "org.koin:koin-test:${versions.koin}"
testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
}
android {

16
app/core/src/main/AndroidManifest.xml
View file

@ -7,11 +7,21 @@
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
<application>
<provider
android:name="androidx.work.impl.WorkManagerInitializer"
android:authorities="${applicationId}.workmanager-init"
android:name="androidx.startup.InitializationProvider"
android:authorities="${applicationId}.androidx-startup"
android:exported="false"
tools:node="remove" />
tools:node="merge">
<!-- We initialize WorkManager manually -->
<meta-data
android:name="androidx.work.WorkManagerInitializer"
android:value="androidx.startup"
tools:node="remove" />
</provider>
</application>
</manifest>

6
app/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java
View file

@ -53,14 +53,14 @@ import org.robolectric.shadows.ShadowLog;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
@ -330,7 +330,7 @@ public class MessagingControllerTest extends K9RobolectricTest {
controller.sendPendingMessagesSynchronous(account);
verifyZeroInteractions(listener);
verifyNoMoreInteractions(listener);
}
@Test

4
app/core/src/test/java/com/fsck/k9/helper/ReplyToParserTest.java
View file

@ -17,8 +17,8 @@ import org.junit.Test;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

2
app/core/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java
View file

@ -50,7 +50,7 @@ import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNull;
import static junit.framework.Assert.assertSame;
import static junit.framework.Assert.assertTrue;
import static org.mockito.Matchers.anyString;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;

4
app/core/src/test/java/com/fsck/k9/message/MessageBuilderTest.java
View file

@ -38,8 +38,8 @@ import org.robolectric.annotation.LooperMode;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;

2
app/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt
View file

@ -76,7 +76,7 @@ class AuthenticationErrorNotificationControllerTest : RobolectricTest() {
verify(builder).setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
}
private fun createFakeNotificationBuilder(notification: Notification?): NotificationCompat.Builder {
private fun createFakeNotificationBuilder(notification: Notification): NotificationCompat.Builder {
return mockBuilder {
on { build() } doReturn notification
}

2
app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt
View file

@ -54,7 +54,7 @@ class SendFailedNotificationControllerTest : RobolectricTest() {
verify(notificationManager).cancel(notificationId)
}
private fun createFakeNotificationBuilder(notification: Notification?): NotificationCompat.Builder {
private fun createFakeNotificationBuilder(notification: Notification): NotificationCompat.Builder {
return mockBuilder {
on { build() } doReturn notification
}

2
app/k9mail-jmap/build.gradle
View file

@ -36,7 +36,7 @@ dependencies {
testImplementation "com.google.truth:truth:${versions.truth}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "org.koin:koin-test:${versions.koin}"
testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
}
android {

12
app/k9mail-jmap/src/test/java/com/fsck/k9/DependencyInjectionTest.kt
View file

@ -10,7 +10,7 @@ import com.fsck.k9.ui.folders.FolderNameFormatter
import com.fsck.k9.ui.helper.SizeFormatter
import org.junit.Test
import org.junit.runner.RunWith
import org.koin.core.annotation.KoinInternal
import org.koin.core.annotation.KoinInternalApi
import org.koin.core.logger.PrintLogger
import org.koin.core.parameter.parametersOf
import org.koin.java.KoinJavaComponent
@ -31,17 +31,17 @@ class DependencyInjectionTest : AutoCloseKoinTest() {
}
val autocryptTransferView = mock<AutocryptKeyTransferActivity>()
@KoinInternal
@KoinInternalApi
@Test
fun testDependencyTree() {
KoinJavaComponent.getKoin().setupLogger(PrintLogger())
getKoin().checkModules {
create<OpenPgpApiManager> { parametersOf(lifecycleOwner) }
withParameter<OpenPgpApiManager> { lifecycleOwner }
create<AutocryptKeyTransferPresenter> { parametersOf(lifecycleOwner, autocryptTransferView) }
create<FolderNameFormatter> { parametersOf(RuntimeEnvironment.application) }
create<SizeFormatter> { parametersOf(RuntimeEnvironment.application) }
create<ChangelogViewModel> { parametersOf(ChangeLogMode.CHANGE_LOG) }
withParameter<FolderNameFormatter> { RuntimeEnvironment.application }
withParameter<SizeFormatter> { RuntimeEnvironment.application }
withParameter<ChangelogViewModel> { ChangeLogMode.CHANGE_LOG }
}
}
}

7
app/k9mail/build.gradle
View file

@ -36,7 +36,7 @@ dependencies {
testImplementation "com.google.truth:truth:${versions.truth}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "org.koin:koin-test:${versions.koin}"
testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
}
android {
@ -89,9 +89,12 @@ android {
}
}
// Do not abort build if lint finds errors
lintOptions {
checkDependencies true
// Do not abort build if lint finds errors
abortOnError false
lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
}

12
app/k9mail/src/test/java/com/fsck/k9/DependencyInjectionTest.kt
View file

@ -10,7 +10,7 @@ import com.fsck.k9.ui.folders.FolderNameFormatter
import com.fsck.k9.ui.helper.SizeFormatter
import org.junit.Test
import org.junit.runner.RunWith
import org.koin.core.annotation.KoinInternal
import org.koin.core.annotation.KoinInternalApi
import org.koin.core.logger.PrintLogger
import org.koin.core.parameter.parametersOf
import org.koin.java.KoinJavaComponent
@ -31,17 +31,17 @@ class DependencyInjectionTest : AutoCloseKoinTest() {
}
val autocryptTransferView = mock<AutocryptKeyTransferActivity>()
@KoinInternal
@KoinInternalApi
@Test
fun testDependencyTree() {
KoinJavaComponent.getKoin().setupLogger(PrintLogger())
getKoin().checkModules {
create<OpenPgpApiManager> { parametersOf(lifecycleOwner) }
withParameter<OpenPgpApiManager> { lifecycleOwner }
create<AutocryptKeyTransferPresenter> { parametersOf(lifecycleOwner, autocryptTransferView) }
create<FolderNameFormatter> { parametersOf(RuntimeEnvironment.application) }
create<SizeFormatter> { parametersOf(RuntimeEnvironment.application) }
create<ChangelogViewModel> { parametersOf(ChangeLogMode.CHANGE_LOG) }
withParameter<FolderNameFormatter> { RuntimeEnvironment.application }
withParameter<SizeFormatter> { RuntimeEnvironment.application }
withParameter<ChangelogViewModel> { ChangeLogMode.CHANGE_LOG }
}
}
}

4
app/storage/build.gradle
View file

@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
apply plugin: 'org.jetbrains.kotlin.android'
dependencies {
api "org.koin:koin-core:${versions.koin}"
api "io.insert-koin:koin-core:${versions.koin}"
implementation project(":app:core")
implementation "androidx.core:core-ktx:${versions.androidxCore}"
@ -18,7 +18,7 @@ dependencies {
testImplementation "com.google.truth:truth:${versions.truth}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "org.koin:koin-test:${versions.koin}"
testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
testImplementation "commons-io:commons-io:${versions.commonsIo}"
}

4
app/storage/src/test/java/com/fsck/k9/storage/StoreSchemaDefinitionTest.java
View file

@ -31,8 +31,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

2
app/testing/build.gradle
View file

@ -6,7 +6,7 @@ dependencies {
api "junit:junit:${versions.junit}"
api "org.robolectric:robolectric:${versions.robolectric}"
api "org.koin:koin-core:${versions.koin}"
api "io.insert-koin:koin-core:${versions.koin}"
api "org.mockito:mockito-core:${versions.mockito}"
api "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
}

1
app/ui/base/build.gradle
View file

@ -5,6 +5,7 @@ dependencies {
implementation project(":app:core")
api "androidx.appcompat:appcompat:${versions.androidxAppCompat}"
api "androidx.activity:activity:${versions.androidxActivity}"
api "com.google.android.material:material:${versions.materialComponents}"
api "androidx.navigation:navigation-fragment-ktx:${versions.androidxNavigation}"
api "androidx.navigation:navigation-ui-ktx:${versions.androidxNavigation}"

2
app/ui/legacy/build.gradle
View file

@ -62,7 +62,7 @@ dependencies {
testImplementation "com.google.truth:truth:${versions.truth}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "org.koin:koin-test:${versions.koin}"
testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
}
android {

2
app/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt
View file

@ -101,7 +101,7 @@ class EditIdentity : K9Activity() {
outState.putParcelable(EXTRA_IDENTITY, identity)
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.edit_identity_menu, menu)
return true
}

8
app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientLoaderTest.java
View file

@ -26,8 +26,8 @@ import static android.provider.ContactsContract.CommonDataKinds.Email.TYPE_HOME;
import static org.junit.Assert.assertEquals;
import static org.mockito.AdditionalMatchers.aryEq;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isNull;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -322,8 +322,8 @@ public class RecipientLoaderTest extends RobolectricTest {
when(contentResolver
.query(eq(Email.CONTENT_URI),
aryEq(PROJECTION),
isNull(String.class),
isNull(String[].class),
isNull(),
isNull(),
nullable(String.class))).thenReturn(cursor);
}

4
app/ui/legacy/src/test/java/com/fsck/k9/ui/crypto/MessageCryptoHelperTest.java
View file

@ -41,8 +41,8 @@ import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertSame;
import static junit.framework.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.same;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;

2
app/ui/setup/build.gradle
View file

@ -22,7 +22,7 @@ dependencies {
testImplementation "com.google.truth:truth:${versions.truth}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "org.koin:koin-test:${versions.koin}"
testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
}
android {

4
backend/imap/src/test/java/com/fsck/k9/backend/imap/ImapSyncTest.java
View file

@ -33,8 +33,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;

49
build.gradle
View file

@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
buildscript {
ext {
buildConfig = [
'compileSdk': 30,
'compileSdk': 31,
'targetSdk': 30,
'minSdk': 21,
'buildTools': '30.0.3',
@ -11,41 +11,42 @@ buildscript {
]
versions = [
'kotlin': '1.5.30',
'kotlinCoroutines': '1.5.1',
'androidxAppCompat': '1.2.0',
'androidxRecyclerView': '1.1.0',
'androidxLifecycle': '2.3.1',
'kotlin': '1.5.31',
'kotlinCoroutines': '1.5.2',
'androidxAppCompat': '1.3.1',
'androidxActivity': '1.4.0',
'androidxRecyclerView': '1.2.1',
'androidxLifecycle': '2.4.0',
'androidxAnnotation': '1.2.0',
'androidxBiometric': '1.1.0',
'androidxNavigation': '2.3.5',
'androidxConstraintLayout': '2.0.4',
'androidxWorkManager': '2.5.0',
'androidxFragment': '1.3.3',
'androidxConstraintLayout': '2.1.1',
'androidxWorkManager': '2.7.0',
'androidxFragment': '1.3.6',
'androidxLocalBroadcastManager': '1.0.0',
'androidxCore': '1.3.2',
'androidxCore': '1.7.0',
'androidxCardView': '1.0.0',
'androidxPreference': '1.1.1',
'androidxTestCore': '1.3.0',
'materialComponents': '1.3.0',
'fastAdapter': '5.4.1',
'androidxTestCore': '1.4.0',
'materialComponents': '1.4.0',
'fastAdapter': '5.5.1',
'preferencesFix': '1.1.0',
'okio': '2.10.0',
'moshi': '1.12.0',
'timber': '4.7.1',
'koin': '2.2.2',
'commonsIo': '2.6',
'mime4j': '0.8.3',
'okhttp': '4.9.1',
'timber': '5.0.1',
'koin': '3.1.3',
'commonsIo': '2.11.0',
'mime4j': '0.8.6',
'okhttp': '4.9.2',
'minidns': '1.0.0',
'glide': '4.12.0',
'androidxTestRunner': '1.3.0',
'androidxTestRunner': '1.4.0',
'junit': '4.13.2',
'robolectric': '4.5.1',
'mockito': '3.9.0',
'mockitoKotlin': '3.1.0',
'truth': '1.1.2',
'robolectric': '4.6.1',
'mockito': '4.0.0',
'mockitoKotlin': '4.0.0',
'truth': '1.1.3',
'ktlint': '0.40.0'
]
@ -62,7 +63,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:7.0.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath "org.jlleitschuh.gradle:ktlint-gradle:10.0.0"
}

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

269
gradlew vendored
View file

@ -1,7 +1,7 @@
#!/usr/bin/env sh
#!/bin/sh
#
# Copyright 2015 the original author or authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -17,67 +17,101 @@
#
##############################################################################
##
## Gradle start up script for UN*X
##
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
MAX_FD=maximum
warn () {
echo "$*"
}
} >&2
die () {
echo
echo "$*"
echo
exit 1
}
} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD="$JAVA_HOME/bin/java"
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@ -106,80 +140,95 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"

2
mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapStoreTest.java
View file

@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.anyString;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;

12
mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3ConnectionTest.java
View file

@ -24,14 +24,14 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
@ -118,7 +118,7 @@ public class Pop3ConnectionTest {
new Pop3Connection(settings, mockTrustedSocketFactory);
verifyZeroInteractions(mockTrustedSocketFactory);
verifyNoMoreInteractions(mockTrustedSocketFactory);
}
//Using MockSocketFactory

6
mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3StoreTest.java
View file

@ -19,9 +19,9 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

4
mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportTest.java
View file

@ -26,8 +26,8 @@ import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.fail;
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

39
mail/protocols/webdav/src/test/java/com/fsck/k9/mail/store/webdav/WebDavFolderTest.java
View file

@ -26,7 +26,6 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.invocation.InvocationOnMock;
@ -36,13 +35,14 @@ import static java.util.Collections.singletonList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyMap;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyMapOf;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@ -139,8 +139,7 @@ public class WebDavFolderTest {
@Test
public void folder_can_fetch_less_than_10_envelopes() throws MessagingException {
when(mockStore.processRequest(anyString(), anyString(), anyString(), anyMapOf(String.class, String.class)))
.thenReturn(mockDataSet);
when(mockStore.processRequest(anyString(), anyString(), anyString(), anyMap())).thenReturn(mockDataSet);
List<WebDavMessage> messages = new ArrayList<>();
for (int i = 0; i < 5; i++) {
@ -155,9 +154,7 @@ public class WebDavFolderTest {
@Test
public void folder_can_fetch_more_than_10_envelopes() throws MessagingException {
when(mockStore.processRequest(anyString(), anyString(), anyString(),
anyMapOf(String.class, String.class)))
.thenReturn(mockDataSet);
when(mockStore.processRequest(anyString(), anyString(), anyString(), anyMap())).thenReturn(mockDataSet);
List<WebDavMessage> messages = new ArrayList<>();
for (int i = 0; i < 15; i++) {
@ -171,9 +168,7 @@ public class WebDavFolderTest {
@Test
public void folder_can_fetch_less_than_20_flags() throws MessagingException {
when(mockStore.processRequest(anyString(), anyString(), anyString(),
anyMapOf(String.class, String.class)))
.thenReturn(mockDataSet);
when(mockStore.processRequest(anyString(), anyString(), anyString(), anyMap())).thenReturn(mockDataSet);
List<WebDavMessage> messages = new ArrayList<>();
for (int i = 0; i < 5; i++) {
@ -187,9 +182,7 @@ public class WebDavFolderTest {
@Test
public void folder_can_fetch_more_than_20_flags() throws MessagingException {
when(mockStore.processRequest(anyString(), anyString(), anyString(),
anyMapOf(String.class, String.class)))
.thenReturn(mockDataSet);
when(mockStore.processRequest(anyString(), anyString(), anyString(), anyMap())).thenReturn(mockDataSet);
List<WebDavMessage> messages = new ArrayList<>();
for (int i = 0; i < 25; i++) {
@ -236,9 +229,7 @@ public class WebDavFolderTest {
public void folder_does_not_notify_listener_twice_when_fetching_flags_and_bodies()
throws MessagingException, IOException, URISyntaxException {
setupStoreForMessageFetching();
when(mockStore.processRequest(anyString(), anyString(), anyString(),
anyMapOf(String.class, String.class)))
.thenReturn(mockDataSet);
when(mockStore.processRequest(anyString(), anyString(), anyString(), anyMap())).thenReturn(mockDataSet);
List<WebDavMessage> messages = setup25MessagesToFetch();
when(mockHttpClient.executeOverride(any(HttpUriRequest.class), nullable(HttpContext.class))).thenAnswer(
new Answer<HttpResponse>() {
@ -396,7 +387,7 @@ public class WebDavFolderTest {
buildSearchResponse(mockDataSet);
when(mockStore.getMessagesXml()).thenReturn(messagesXml);
when(mockStore.processRequest(eq("https://localhost/webDavStoreUrl/testFolder"), eq("SEARCH"),
eq(messagesXml), Matchers.<Map<String, String>>any())).thenReturn(mockDataSet);
eq(messagesXml), any())).thenReturn(mockDataSet);
folder.getMessages(messageStart, messageEnd, listener);
@ -414,7 +405,7 @@ public class WebDavFolderTest {
buildSearchResponse(mockDataSet);
when(mockStore.getMessagesXml()).thenReturn(messagesXml);
when(mockStore.processRequest(eq("https://localhost/webDavStoreUrl/testFolder"), eq("SEARCH"),
eq(messagesXml), Matchers.<Map<String, String>>any())).thenReturn(mockDataSet);
eq(messagesXml), any())).thenReturn(mockDataSet);
folder.getMessages(messageStart, messageEnd, listener);
@ -524,7 +515,7 @@ public class WebDavFolderTest {
folder.appendWebDavMessages(existingMessages);
verify(mockStore).sendRequest(urlCaptor.capture(), eq("PUT"), entityCaptor.capture(),
Matchers.<Map<String, String>>eq(null), eq(true));
isNull(), eq(true));
assertTrue(urlCaptor.getValue().startsWith(storeUrl + "/" + folderName + "/" + messageUid));
assertTrue(urlCaptor.getValue().endsWith(".eml"));
}

2
mail/protocols/webdav/src/test/java/com/fsck/k9/mail/store/webdav/WebDavStoreTest.java
View file

@ -47,7 +47,7 @@ import org.mockito.stubbing.OngoingStubbing;
import static junit.framework.Assert.assertSame;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;