?) {
- requireNotNull(uids)
+ kotlin.requireNotNull(uids)
for (uid in uids) {
requireNotLocalUid(uid)
}
}
private fun requireNotLocalUid(uid: String?) {
- requireNotNull(uid)
+ kotlin.requireNotNull(uid)
require(!uid.startsWith(K9.LOCAL_UID_PREFIX)) { "Local UID found: $uid" }
}
diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt b/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt
index b47eba89a645c5c6e09aaadda009d44c2fc972c8..2b7a284cba90a45b5a3e31d3e752b22712d6c672 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt
@@ -12,7 +12,6 @@ import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.cancel
-import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch
import timber.log.Timber
@@ -22,7 +21,7 @@ internal class AccountPushController(
private val preferences: Preferences,
private val folderRepository: FolderRepository,
backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO,
- private val account: Account
+ private val account: Account,
) {
private val coroutineScope = CoroutineScope(backgroundDispatcher)
diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt b/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt
index 7091496d69ae22a5b744dcc7443cc79cf806bfbf..3fedeb4fc6fa04460cbe593f4f5f6e3b123da7f0 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt
@@ -10,7 +10,7 @@ internal class AccountPushControllerFactory(
private val backendManager: BackendManager,
private val messagingController: MessagingController,
private val folderRepository: FolderRepository,
- private val preferences: Preferences
+ private val preferences: Preferences,
) {
fun create(account: Account): AccountPushController {
return AccountPushController(
@@ -18,7 +18,7 @@ internal class AccountPushControllerFactory(
messagingController,
preferences,
folderRepository,
- account = account
+ account = account,
)
}
}
diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/BootCompleteReceiver.kt b/app/core/src/main/java/com/fsck/k9/controller/push/BootCompleteReceiver.kt
index 558b119d712bae4ec51a96d5602a6e803508a102..c2a0295157c3990cfa4e009ccd6ad0708ade2d9d 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/push/BootCompleteReceiver.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/push/BootCompleteReceiver.kt
@@ -7,7 +7,6 @@ import android.content.Intent
import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED
import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED
import android.content.pm.PackageManager.DONT_KILL_APP
-import java.lang.Exception
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import timber.log.Timber
diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt b/app/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt
index 86b0ae1227472ca8d155a618ca54c9ef49b11666..d9e14a761bde12cd062f4387740aab07ef0344c0 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt
@@ -11,7 +11,7 @@ internal val controllerPushModule = module {
backendManager = get(),
messagingController = get(),
folderRepository = get(),
- preferences = get()
+ preferences = get(),
)
}
single {
@@ -25,7 +25,7 @@ internal val controllerPushModule = module {
pushNotificationManager = get(),
connectivityManager = get(),
accountPushControllerFactory = get(),
- context = get()
+ context = get(),
)
}
}
diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/PushController.kt b/app/core/src/main/java/com/fsck/k9/controller/push/PushController.kt
index 206ae842219977907acef7df96fe2b88d8ab62b9..96e067fcb5eeed07ff724250dafb20757ff43f00 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/push/PushController.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/push/PushController.kt
@@ -42,7 +42,7 @@ class PushController internal constructor(
private val accountPushControllerFactory: AccountPushControllerFactory,
private val coroutineScope: CoroutineScope = GlobalScope,
private val coroutineDispatcher: CoroutineDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher(),
- private val context: Context
+ private val context: Context,
) {
private val lock = Any()
private var initializationStarted = false
@@ -217,6 +217,7 @@ class PushController internal constructor(
account.folderPushMode != FolderMode.NONE && OsAccountManagerUtil.isSyncEnable(context, account.email) && backendManager.getBackend(account)?.isPushCapable ?: false
}
}
+
private fun setPushNotificationState(notificationState: PushNotificationState) {
pushNotificationManager.notificationState = notificationState
}
diff --git a/app/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt b/app/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt
index 52e0ed59fd3f2d33a72815c740c9c86bf416214e..97c5b472dace93b5e689ae5e1e83f6ad5d1c1305 100644
--- a/app/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt
+++ b/app/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt
@@ -13,5 +13,5 @@ data class EncryptionResult(
val attachmentCount: Int,
val previewResult: PreviewResult = PreviewResult.encrypted(),
val textForSearchIndex: String? = null,
- val extraContentValues: ContentValues? = null
+ val extraContentValues: ContentValues? = null,
)
diff --git a/app/core/src/main/java/com/fsck/k9/helper/ContactNameProvider.kt b/app/core/src/main/java/com/fsck/k9/helper/ContactNameProvider.kt
index 4abbb732d8fd5cc4163a19dc337d3dbcc5b5a9c7..4d16061b9649f81ec408b54a21b488ffcafdfc57 100644
--- a/app/core/src/main/java/com/fsck/k9/helper/ContactNameProvider.kt
+++ b/app/core/src/main/java/com/fsck/k9/helper/ContactNameProvider.kt
@@ -1,11 +1,16 @@
package com.fsck.k9.helper
+import app.k9mail.core.android.common.contact.ContactRepository
+import app.k9mail.core.common.mail.EmailAddress
+
interface ContactNameProvider {
fun getNameForAddress(address: String): String?
}
-class RealContactNameProvider(private val contacts: Contacts) : ContactNameProvider {
+class RealContactNameProvider(
+ private val contactRepository: ContactRepository,
+) : ContactNameProvider {
override fun getNameForAddress(address: String): String? {
- return contacts.getNameForAddress(address)
+ return contactRepository.getContactFor(EmailAddress(address))?.name
}
}
diff --git a/app/core/src/main/java/com/fsck/k9/helper/Contacts.java b/app/core/src/main/java/com/fsck/k9/helper/Contacts.java
deleted file mode 100644
index d2642f7d04438e6a01e8400fc630f1d454552166..0000000000000000000000000000000000000000
--- a/app/core/src/main/java/com/fsck/k9/helper/Contacts.java
+++ /dev/null
@@ -1,312 +0,0 @@
-package com.fsck.k9.helper;
-
-
-import java.util.HashMap;
-
-import android.Manifest;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.Photo;
-
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import com.fsck.k9.mail.Address;
-import timber.log.Timber;
-
-/**
- * Helper class to access the contacts stored on the device.
- */
-public class Contacts {
- /**
- * The order in which the search results are returned by
- * {@link #getContactByAddress(String)}.
- */
- protected static final String SORT_ORDER =
- ContactsContract.CommonDataKinds.Email.TIMES_CONTACTED + " DESC, " +
- ContactsContract.Contacts.DISPLAY_NAME + ", " +
- ContactsContract.CommonDataKinds.Email._ID;
-
- /**
- * Array of columns to load from the database.
- */
- protected static final String PROJECTION[] = {
- ContactsContract.CommonDataKinds.Email._ID,
- ContactsContract.Contacts.DISPLAY_NAME,
- ContactsContract.CommonDataKinds.Email.CONTACT_ID,
- Photo.PHOTO_URI,
- ContactsContract.Contacts.LOOKUP_KEY
- };
-
- /**
- * Index of the name field in the projection. This must match the order in
- * {@link #PROJECTION}.
- */
- protected static final int NAME_INDEX = 1;
-
- /**
- * Index of the contact id field in the projection. This must match the order in
- * {@link #PROJECTION}.
- */
- protected static final int CONTACT_ID_INDEX = 2;
-
- protected static final int LOOKUP_KEY_INDEX = 4;
-
-
- /**
- * Get instance of the Contacts class.
- *
- * Note: This is left over from the days when we needed to have SDK-specific code to access
- * the contacts.
- *
- * @param context A {@link Context} instance.
- * @return Appropriate {@link Contacts} instance for this device.
- */
- public static Contacts getInstance(Context context) {
- return new Contacts(context);
- }
-
-
- protected Context mContext;
- protected ContentResolver mContentResolver;
- private static HashMap nameCache = new HashMap<>();
-
-
- /**
- * Constructor
- *
- * @param context A {@link Context} instance.
- */
- protected Contacts(Context context) {
- mContext = context;
- mContentResolver = context.getContentResolver();
- }
-
- /**
- * Start the activity to add information to an existing contact or add a
- * new one.
- *
- * @param email An {@link Address} instance containing the email address
- * of the entity you want to add to the contacts. Optionally
- * the instance also contains the (display) name of that
- * entity.
- */
- public void createContact(final Address email) {
- final Uri contactUri = Uri.fromParts("mailto", email.getAddress(), null);
-
- final Intent contactIntent = new Intent(ContactsContract.Intents.SHOW_OR_CREATE_CONTACT);
- contactIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- contactIntent.setData(contactUri);
-
- // Pass along full email string for possible create dialog
- contactIntent.putExtra(ContactsContract.Intents.EXTRA_CREATE_DESCRIPTION,
- email.toString());
-
- // Only provide personal name hint if we have one
- final String senderPersonal = email.getPersonal();
- if (senderPersonal != null) {
- contactIntent.putExtra(ContactsContract.Intents.Insert.NAME, senderPersonal);
- }
-
- mContext.startActivity(contactIntent);
- clearCache();
- }
-
- /**
- * Start the activity to add a phone number to an existing contact or add a new one.
- *
- * @param phoneNumber
- * The phone number to add to a contact, or to use when creating a new contact.
- */
- public void addPhoneContact(final String phoneNumber) {
- Intent addIntent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
- addIntent.setType(ContactsContract.Contacts.CONTENT_ITEM_TYPE);
- addIntent.putExtra(ContactsContract.Intents.Insert.PHONE, Uri.decode(phoneNumber));
- addIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- mContext.startActivity(addIntent);
- clearCache();
- }
-
- /**
- * Check whether the provided email address belongs to one of the contacts.
- *
- * @param emailAddress The email address to look for.
- * @return true, if the email address belongs to a contact.
- * false, otherwise.
- */
- public boolean isInContacts(final String emailAddress) {
- boolean result = false;
-
- final Cursor c = getContactByAddress(emailAddress);
-
- if (c != null) {
- if (c.getCount() > 0) {
- result = true;
- }
- c.close();
- }
-
- return result;
- }
-
- /**
- * Check whether one of the provided addresses belongs to one of the contacts.
- *
- * @param addresses The addresses to search in contacts
- * @return true, if one address belongs to a contact.
- * false, otherwise.
- */
- public boolean isAnyInContacts(final Address[] addresses) {
- if (addresses == null) {
- return false;
- }
-
- for (Address addr : addresses) {
- if (isInContacts(addr.getAddress())) {
- return true;
- }
- }
- return false;
- }
-
- @Nullable
- public Uri getContactUri(String emailAddress) {
- Cursor cursor = getContactByAddress(emailAddress);
- if (cursor == null) {
- return null;
- }
-
- try (cursor) {
- if (!cursor.moveToFirst()) {
- return null;
- }
-
- long contactId = cursor.getLong(CONTACT_ID_INDEX);
- String lookupKey = cursor.getString(LOOKUP_KEY_INDEX);
- return ContactsContract.Contacts.getLookupUri(contactId, lookupKey);
- }
- }
-
- /**
- * Get the name of the contact an email address belongs to.
- *
- * @param address The email address to search for.
- * @return The name of the contact the email address belongs to. Or
- * null if there's no matching contact.
- */
- public String getNameForAddress(String address) {
- if (address == null) {
- return null;
- } else if (nameCache.containsKey(address)) {
- return nameCache.get(address);
- }
-
- final Cursor c = getContactByAddress(address);
-
- String name = null;
- if (c != null) {
- if (c.getCount() > 0) {
- c.moveToFirst();
- name = c.getString(NAME_INDEX);
- }
- c.close();
- }
-
- nameCache.put(address, name);
- return name;
- }
-
- /**
- * Mark contacts with the provided email addresses as contacted.
- */
- public void markAsContacted(final Address[] addresses) {
- //TODO: Keep track of this information in a local database. Then use this information when sorting contacts for
- // auto-completion.
- }
-
- /**
- * Creates the intent necessary to open a contact picker.
- *
- * @return The intent necessary to open a contact picker.
- */
- public Intent contactPickerIntent() {
- return new Intent(Intent.ACTION_PICK, ContactsContract.CommonDataKinds.Email.CONTENT_URI);
- }
-
- /**
- * Get URI to the picture of the contact with the supplied email address.
- *
- * @param address
- * An email address. The contact database is searched for a contact with this email
- * address.
- *
- * @return URI to the picture of the contact with the supplied email address. {@code null} if
- * no such contact could be found or the contact doesn't have a picture.
- */
- public Uri getPhotoUri(String address) {
- try {
- final Cursor c = getContactByAddress(address);
- if (c == null) {
- return null;
- }
-
- try {
- if (!c.moveToFirst()) {
- return null;
- }
- int columnIndex = c.getColumnIndex(Photo.PHOTO_URI);
- final String uriString = c.getString(columnIndex);
- if (uriString == null)
- return null;
- return Uri.parse(uriString);
- } catch (IllegalStateException e) {
- return null;
- } finally {
- c.close();
- }
- } catch (Exception e) {
- Timber.e(e, "Couldn't fetch photo for contact with email %s", address);
- return null;
- }
- }
-
- private boolean hasContactPermission() {
- return ContextCompat.checkSelfPermission(mContext,
- Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED;
- }
-
- /**
- * Return a {@link Cursor} instance that can be used to fetch information
- * about the contact with the given email address.
- *
- * @param address The email address to search for.
- * @return A {@link Cursor} instance that can be used to fetch information
- * about the contact with the given email address
- */
- private Cursor getContactByAddress(final String address) {
- final Uri uri = Uri.withAppendedPath(ContactsContract.CommonDataKinds.Email.CONTENT_LOOKUP_URI, Uri.encode(address));
-
- if (hasContactPermission()) {
- return mContentResolver.query(
- uri,
- PROJECTION,
- null,
- null,
- SORT_ORDER);
- } else {
- return new EmptyCursor();
- }
- }
-
- /**
- * Clears the cache for names and photo uris
- */
- public static void clearCache() {
- nameCache.clear();
- }
-
-}
diff --git a/app/core/src/main/java/com/fsck/k9/helper/Contacts.kt b/app/core/src/main/java/com/fsck/k9/helper/Contacts.kt
new file mode 100644
index 0000000000000000000000000000000000000000..50501ab9cb6b0f4105285d1119823837e0c839e8
--- /dev/null
+++ b/app/core/src/main/java/com/fsck/k9/helper/Contacts.kt
@@ -0,0 +1,16 @@
+package com.fsck.k9.helper
+
+import com.fsck.k9.mail.Address
+
+/**
+ * Helper class to access the contacts stored on the device.
+ */
+class Contacts {
+ /**
+ * Mark contacts with the provided email addresses as contacted.
+ */
+ fun markAsContacted(addresses: Array?) {
+ // TODO: Keep track of this information in a local database. Then use this information when sorting contacts for
+ // auto-completion.
+ }
+}
diff --git a/app/core/src/main/java/com/fsck/k9/helper/EmptyCursor.java b/app/core/src/main/java/com/fsck/k9/helper/EmptyCursor.java
deleted file mode 100644
index 7f2f87ae37efac4d350879d2d22565e4ce0cd0c7..0000000000000000000000000000000000000000
--- a/app/core/src/main/java/com/fsck/k9/helper/EmptyCursor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.fsck.k9.helper;
-
-import android.database.AbstractCursor;
-
-
-/**
- * A dummy class that provides a empty cursor
- */
-public class EmptyCursor extends AbstractCursor {
- @Override
- public int getCount() {
- return 0;
- }
-
- @Override
- public String[] getColumnNames() {
- return new String[0];
- }
-
- @Override
- public String getString(int column) {
- return null;
- }
-
- @Override
- public short getShort(int column) {
- return 0;
- }
-
- @Override
- public int getInt(int column) {
- return 0;
- }
-
- @Override
- public long getLong(int column) {
- return 0;
- }
-
- @Override
- public float getFloat(int column) {
- return 0;
- }
-
- @Override
- public double getDouble(int column) {
- return 0;
- }
-
- @Override
- public boolean isNull(int column) {
- return false;
- }
-}
\ No newline at end of file
diff --git a/app/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt b/app/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt
index b85683af4ed325651a60174aefee1d2e852bf3b8..26b0f1b65a6924a73801dbb07ffa0a02cc617841 100644
--- a/app/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt
+++ b/app/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt
@@ -11,7 +11,7 @@ object IdentityHelper {
RecipientType.CC,
RecipientType.X_ORIGINAL_TO,
RecipientType.DELIVERED_TO,
- RecipientType.X_ENVELOPE_TO
+ RecipientType.X_ENVELOPE_TO,
)
/**
diff --git a/app/core/src/main/java/com/fsck/k9/helper/KoinModule.kt b/app/core/src/main/java/com/fsck/k9/helper/KoinModule.kt
index 1b1a97a932c4c5e809e0161ab54e3011de1215ba..547d68bd98b623541b13f09df46bbdcddf01ffb1 100644
--- a/app/core/src/main/java/com/fsck/k9/helper/KoinModule.kt
+++ b/app/core/src/main/java/com/fsck/k9/helper/KoinModule.kt
@@ -7,8 +7,9 @@ import org.koin.dsl.module
val helperModule = module {
single { ClipboardManager(get()) }
- single { MessageHelper.getInstance(get()) }
+ single { MessageHelper(resourceProvider = get(), contactRepository = get()) }
factory { AndroidKeyStoreDirectoryProvider(context = get()) }
factory { get().getSystemService(Context.ALARM_SERVICE) as AlarmManager }
single { AlarmManagerCompat(alarmManager = get()) }
+ factory { RealContactNameProvider(contactRepository = get()) }
}
diff --git a/app/core/src/main/java/com/fsck/k9/helper/MessageHelper.java b/app/core/src/main/java/com/fsck/k9/helper/MessageHelper.java
deleted file mode 100644
index a01c25477c197c08f267f473a4ab9f7ee0806959..0000000000000000000000000000000000000000
--- a/app/core/src/main/java/com/fsck/k9/helper/MessageHelper.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.fsck.k9.helper;
-
-
-import java.util.List;
-import java.util.regex.Pattern;
-
-import android.content.Context;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.SpannableStringBuilder;
-import android.text.TextUtils;
-import android.text.style.ForegroundColorSpan;
-
-import com.fsck.k9.Account;
-import com.fsck.k9.CoreResourceProvider;
-import com.fsck.k9.DI;
-import com.fsck.k9.K9;
-import com.fsck.k9.mail.Address;
-
-public class MessageHelper {
- /**
- * If the number of addresses exceeds this value the addresses aren't
- * resolved to the names of Android contacts.
- *
- *
- * TODO: This number was chosen arbitrarily and should be determined by
- * performance tests.
- *
- *
- * @see #toFriendly(Address[], com.fsck.k9.helper.Contacts)
- */
- private static final int TOO_MANY_ADDRESSES = 50;
- private static final Pattern SPOOF_ADDRESS_PATTERN = Pattern.compile("[^(]@");
-
- private static MessageHelper sInstance;
-
- public synchronized static MessageHelper getInstance(final Context context) {
- if (sInstance == null) {
- CoreResourceProvider resourceProvider = DI.get(CoreResourceProvider.class);
- sInstance = new MessageHelper(context, resourceProvider);
- }
- return sInstance;
- }
-
- private final CoreResourceProvider resourceProvider;
- private Context mContext;
-
- private MessageHelper(Context context, CoreResourceProvider resourceProvider) {
- mContext = context;
- this.resourceProvider = resourceProvider;
- }
-
- public CharSequence getSenderDisplayName(Address address) {
- if (address == null) {
- return resourceProvider.contactUnknownSender();
- }
-
- Contacts contactHelper = K9.isShowContactName() ? Contacts.getInstance(mContext) : null;
- return toFriendly(address, contactHelper);
- }
-
- public CharSequence getRecipientDisplayNames(Address[] addresses) {
- if (addresses == null || addresses.length == 0) {
- return resourceProvider.contactUnknownRecipient();
- }
-
- Contacts contactHelper = K9.isShowContactName() ? Contacts.getInstance(mContext) : null;
- CharSequence recipients = toFriendly(addresses, contactHelper);
- return new SpannableStringBuilder(resourceProvider.contactDisplayNamePrefix()).append(recipients);
- }
-
- public boolean toMe(Account account, List toAddrs) {
- for (Address address : toAddrs) {
- if (account.isAnIdentity(address)) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Returns the name of the contact this email address belongs to if
- * the {@link Contacts contacts} parameter is not {@code null} and a
- * contact is found. Otherwise the personal portion of the {@link Address}
- * is returned. If that isn't available either, the email address is
- * returned.
- *
- * @param address An {@link com.fsck.k9.mail.Address}
- * @param contacts A {@link Contacts} instance or {@code null}.
- * @return A "friendly" name for this {@link Address}.
- */
- public static CharSequence toFriendly(Address address, Contacts contacts) {
- return toFriendly(address,contacts,
- K9.isShowCorrespondentNames(),
- K9.isChangeContactNameColor(),
- K9.getContactNameColor());
- }
-
- public static CharSequence toFriendly(Address[] addresses, Contacts contacts) {
- if (addresses == null) {
- return null;
- }
-
- if (addresses.length >= TOO_MANY_ADDRESSES) {
- // Don't look up contacts if the number of addresses is very high.
- contacts = null;
- }
-
- SpannableStringBuilder sb = new SpannableStringBuilder();
- for (int i = 0; i < addresses.length; i++) {
- sb.append(toFriendly(addresses[i], contacts));
- if (i < addresses.length - 1) {
- sb.append(',');
- }
- }
- return sb;
- }
-
- /* package, for testing */ static CharSequence toFriendly(Address address, Contacts contacts,
- boolean showCorrespondentNames,
- boolean changeContactNameColor,
- int contactNameColor) {
- if (!showCorrespondentNames) {
- return address.getAddress();
- } else if (contacts != null) {
- final String name = contacts.getNameForAddress(address.getAddress());
- if (name != null) {
- if (changeContactNameColor) {
- final SpannableString coloredName = new SpannableString(name);
- coloredName.setSpan(new ForegroundColorSpan(contactNameColor),
- 0,
- coloredName.length(),
- Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
- );
- return coloredName;
- } else {
- return name;
- }
- }
- }
-
- if (!TextUtils.isEmpty(address.getPersonal()) && !isSpoofAddress(address.getPersonal())) {
- return address.getPersonal();
- } else {
- return address.getAddress();
- }
- }
-
- private static boolean isSpoofAddress(String displayName) {
- return displayName.contains("@") && SPOOF_ADDRESS_PATTERN.matcher(displayName).find();
- }
-}
diff --git a/app/core/src/main/java/com/fsck/k9/helper/MessageHelper.kt b/app/core/src/main/java/com/fsck/k9/helper/MessageHelper.kt
new file mode 100644
index 0000000000000000000000000000000000000000..f5a7a160d96340fcd8a9c6c66ce23a6836ab68c5
--- /dev/null
+++ b/app/core/src/main/java/com/fsck/k9/helper/MessageHelper.kt
@@ -0,0 +1,131 @@
+package com.fsck.k9.helper
+
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.SpannableStringBuilder
+import android.text.TextUtils
+import android.text.style.ForegroundColorSpan
+import app.k9mail.core.android.common.contact.ContactRepository
+import app.k9mail.core.common.mail.EmailAddress
+import com.fsck.k9.CoreResourceProvider
+import com.fsck.k9.K9.contactNameColor
+import com.fsck.k9.K9.isChangeContactNameColor
+import com.fsck.k9.K9.isShowContactName
+import com.fsck.k9.K9.isShowCorrespondentNames
+import com.fsck.k9.mail.Address
+import java.util.regex.Pattern
+
+class MessageHelper(
+ private val resourceProvider: CoreResourceProvider,
+ private val contactRepository: ContactRepository,
+) {
+
+ fun getSenderDisplayName(address: Address?): CharSequence {
+ if (address == null) {
+ return resourceProvider.contactUnknownSender()
+ }
+ val repository = if (isShowContactName) contactRepository else null
+ return toFriendly(address, repository)
+ }
+
+ fun getRecipientDisplayNames(addresses: Array?): CharSequence {
+ if (addresses == null || addresses.isEmpty()) {
+ return resourceProvider.contactUnknownRecipient()
+ }
+ val repository = if (isShowContactName) contactRepository else null
+ val recipients = toFriendly(addresses, repository)
+ return SpannableStringBuilder(resourceProvider.contactDisplayNamePrefix()).append(recipients)
+ }
+
+ companion object {
+ /**
+ * If the number of addresses exceeds this value the addresses aren't
+ * resolved to the names of Android contacts.
+ *
+ * TODO: This number was chosen arbitrarily and should be determined by performance tests.
+ *
+ * @see .toFriendly
+ */
+ private const val TOO_MANY_ADDRESSES = 50
+ private val SPOOF_ADDRESS_PATTERN = Pattern.compile("[^(]@")
+
+ /**
+ * Returns the name of the contact this email address belongs to if
+ * the [contacts][Contacts] parameter is not `null` and a
+ * contact is found. Otherwise the personal portion of the [Address]
+ * is returned. If that isn't available either, the email address is
+ * returned.
+ *
+ * @param address An [com.fsck.k9.mail.Address]
+ * @param contacts A [Contacts] instance or `null`.
+ * @return A "friendly" name for this [Address].
+ */
+ fun toFriendly(address: Address, contactRepository: ContactRepository?): CharSequence {
+ return toFriendly(
+ address,
+ contactRepository,
+ isShowCorrespondentNames,
+ isChangeContactNameColor,
+ contactNameColor,
+ )
+ }
+
+ fun toFriendly(addresses: Array?, contactRepository: ContactRepository?): CharSequence? {
+ var repository = contactRepository
+ if (addresses == null) {
+ return null
+ }
+ if (addresses.size >= TOO_MANY_ADDRESSES) {
+ // Don't look up contacts if the number of addresses is very high.
+ repository = null
+ }
+ val stringBuilder = SpannableStringBuilder()
+ for (i in addresses.indices) {
+ stringBuilder.append(toFriendly(addresses[i], repository))
+ if (i < addresses.size - 1) {
+ stringBuilder.append(',')
+ }
+ }
+ return stringBuilder
+ }
+
+ /* package, for testing */
+ @JvmStatic
+ fun toFriendly(
+ address: Address,
+ contactRepository: ContactRepository?,
+ showCorrespondentNames: Boolean,
+ changeContactNameColor: Boolean,
+ contactNameColor: Int,
+ ): CharSequence {
+ if (!showCorrespondentNames) {
+ return address.address
+ } else if (contactRepository != null) {
+ val name = contactRepository.getContactFor(EmailAddress(address.address))?.name
+ if (name != null) {
+ return if (changeContactNameColor) {
+ val coloredName = SpannableString(name)
+ coloredName.setSpan(
+ ForegroundColorSpan(contactNameColor),
+ 0,
+ coloredName.length,
+ Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
+ )
+ coloredName
+ } else {
+ name
+ }
+ }
+ }
+ return if (!TextUtils.isEmpty(address.personal) && !isSpoofAddress(address.personal)) {
+ address.personal
+ } else {
+ address.address
+ }
+ }
+
+ private fun isSpoofAddress(displayName: String): Boolean {
+ return displayName.contains("@") && SPOOF_ADDRESS_PATTERN.matcher(displayName).find()
+ }
+ }
+}
diff --git a/app/core/src/main/java/com/fsck/k9/helper/NamedThreadFactory.kt b/app/core/src/main/java/com/fsck/k9/helper/NamedThreadFactory.kt
index 265ea4ccc723553c7e34b67b318202de4e1f1f01..8323dddb19f62f2da3f55375e5d1dfb2d332e1ae 100644
--- a/app/core/src/main/java/com/fsck/k9/helper/NamedThreadFactory.kt
+++ b/app/core/src/main/java/com/fsck/k9/helper/NamedThreadFactory.kt
@@ -5,5 +5,5 @@ import java.util.concurrent.ThreadFactory
class NamedThreadFactory(private val threadNamePrefix: String) : ThreadFactory {
var counter: Int = 0
- override fun newThread(runnable: Runnable) = Thread(runnable, "$threadNamePrefix-${ counter++ }")
+ override fun newThread(runnable: Runnable) = Thread(runnable, "$threadNamePrefix-${counter++}")
}
diff --git a/app/core/src/main/java/com/fsck/k9/helper/Preconditions.java b/app/core/src/main/java/com/fsck/k9/helper/Preconditions.java
deleted file mode 100644
index 9f379eb4482a2426b17c156c9249984de41f12ec..0000000000000000000000000000000000000000
--- a/app/core/src/main/java/com/fsck/k9/helper/Preconditions.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.fsck.k9.helper;
-
-
-public class Preconditions {
- public static T checkNotNull(T reference) {
- if (reference == null) {
- throw new NullPointerException();
- }
-
- return reference;
- }
-}
diff --git a/app/core/src/main/java/com/fsck/k9/job/K9JobManager.kt b/app/core/src/main/java/com/fsck/k9/job/K9JobManager.kt
index 227909e9425b11d777ceaeba799ad6fa3ac791b3..1328476521e8f93c9c3a4c3398bc52704741e48d 100644
--- a/app/core/src/main/java/com/fsck/k9/job/K9JobManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/job/K9JobManager.kt
@@ -8,7 +8,7 @@ import timber.log.Timber
class K9JobManager(
private val workManager: WorkManager,
private val preferences: Preferences,
- private val mailSyncWorkerManager: MailSyncWorkerManager
+ private val mailSyncWorkerManager: MailSyncWorkerManager,
) {
fun scheduleAllMailJobs() {
Timber.v("scheduling all jobs")
diff --git a/app/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt b/app/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt
index 9251fb4862aea1ea760aecdef2e9e9efc2fa995c..155d9f2766697aa93ece5eb3ae501b56a3f98727 100644
--- a/app/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt
+++ b/app/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt
@@ -11,7 +11,7 @@ class K9WorkerFactory : WorkerFactory() {
override fun createWorker(
appContext: Context,
workerClassName: String,
- workerParameters: WorkerParameters
+ workerParameters: WorkerParameters,
): ListenableWorker? {
val workerClass = Class.forName(workerClassName).kotlin
return getKoin().getOrNull(workerClass) { parametersOf(workerParameters) }
diff --git a/app/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt b/app/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt
index e39d6404d3ec1b89e23a048f87bf427980914a39..841e7667b82c223a6c1fd0c8820e5f9fbbd61915 100644
--- a/app/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt
+++ b/app/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt
@@ -17,7 +17,7 @@ class MailSyncWorker(
private val messagingController: MessagingController,
private val preferences: Preferences,
private val context: Context,
- parameters: WorkerParameters
+ parameters: WorkerParameters,
) : Worker(context, parameters) {
override fun doWork(): Result {
diff --git a/app/core/src/main/java/com/fsck/k9/job/MailSyncWorkerManager.kt b/app/core/src/main/java/com/fsck/k9/job/MailSyncWorkerManager.kt
index 81e655fa0a179cf31bfc94010307ecd3c10271b2..a373aba3397f98522ad3039349496b907304fb69 100644
--- a/app/core/src/main/java/com/fsck/k9/job/MailSyncWorkerManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/job/MailSyncWorkerManager.kt
@@ -9,13 +9,16 @@ import androidx.work.PeriodicWorkRequestBuilder
import androidx.work.WorkManager
import androidx.work.workDataOf
import com.fsck.k9.Account
-import com.fsck.k9.Clock
import com.fsck.k9.K9
import com.fsck.k9.OsAccountManagerUtil
import java.util.concurrent.TimeUnit
+import kotlinx.datetime.Clock
import timber.log.Timber
-class MailSyncWorkerManager(private val workManager: WorkManager, val clock: Clock, private val context: Context) {
+class MailSyncWorkerManager(
+ private val workManager: WorkManager,
+ val clock: Clock,
+ private val context: Context) {
fun cancelMailSync(account: Account) {
Timber.v("Canceling mail sync worker for %s", account)
@@ -72,7 +75,7 @@ class MailSyncWorkerManager(private val workManager: WorkManager, val clock: Clo
}
private fun calculateInitialDelay(lastSyncTime: Long, syncIntervalMinutes: Long): Long {
- val now = clock.time
+ val now = clock.now().toEpochMilliseconds()
val nextSyncTime = lastSyncTime + (syncIntervalMinutes * 60L * 1000L)
return if (lastSyncTime > now || nextSyncTime <= now) {
diff --git a/app/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt b/app/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt
index 831637708c60816293d6a86a109a3a11c7c14bb3..0797c006b716a75e0792d39dd608284b50f91b86 100644
--- a/app/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt
+++ b/app/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt
@@ -15,7 +15,7 @@ interface LogFileWriter {
class LogcatLogFileWriter(
private val contentResolver: ContentResolver,
private val processExecutor: ProcessExecutor,
- private val coroutineDispatcher: CoroutineDispatcher = Dispatchers.IO
+ private val coroutineDispatcher: CoroutineDispatcher = Dispatchers.IO,
) : LogFileWriter {
override suspend fun writeLogTo(contentUri: Uri) {
return withContext(coroutineDispatcher) {
diff --git a/app/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt b/app/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt
index 1a5597c58fa101a3477da069d84b994d87331535..4972f9073c1c7f2191ee1d98b27be6fcc1e7c8eb 100644
--- a/app/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt
+++ b/app/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt
@@ -2,5 +2,5 @@ package com.fsck.k9.mail
enum class MailServerDirection {
INCOMING,
- OUTGOING
+ OUTGOING,
}
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt b/app/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt
index f709798876940cd6947ca3af3df5d1d5a09e431f..e6a4e50ceefd7c59bc0905116d052e36470357d3 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.Preferences
class AutoExpandFolderBackendFoldersRefreshListener(
private val preferences: Preferences,
private val account: Account,
- private val folderRepository: FolderRepository
+ private val folderRepository: FolderRepository,
) : BackendFoldersRefreshListener {
private var isFirstSync = false
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt b/app/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt
index 775effd710f4936a97fa8bcebec68148afc0a8f9..1baf99bc8af178e0de0f9f539f7c0ce0a5bb6946 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt
@@ -4,7 +4,7 @@ import com.fsck.k9.mail.Flag
internal class CacheAwareMessageMapper(
private val cache: MessageListCache,
- private val messageMapper: MessageMapper
+ private val messageMapper: MessageMapper,
) : MessageMapper {
override fun map(message: MessageDetailsAccessor): T? {
val messageId = message.id
@@ -21,7 +21,7 @@ internal class CacheAwareMessageMapper(
private class CacheAwareMessageDetailsAccessor(
private val cache: MessageListCache,
- private val message: MessageDetailsAccessor
+ private val message: MessageDetailsAccessor,
) : MessageDetailsAccessor by message {
override val isRead: Boolean
get() {
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt b/app/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt
index c2a0b4774b1f2003dd4b182c426c79519424ee00..82a26f0744ecd6148bf52da6eb5b359c8ad7bf77 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt
@@ -6,5 +6,5 @@ data class CreateFolderInfo(
val serverId: String,
val name: String,
val type: FolderType,
- val settings: FolderSettings
+ val settings: FolderSettings,
)
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt b/app/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt
index 3fcd8f1e3a3ece180da860a31ab7dbfebdd08d9a..47d037fa07cf2c0541dd95f7ab4cdcc8085b651e 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt
@@ -26,7 +26,7 @@ import com.fsck.k9.mail.FolderType as RemoteFolderType
class FolderRepository(
private val messageStoreManager: MessageStoreManager,
private val accountManager: AccountManager,
- private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO
+ private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
) {
private val sortForDisplay =
compareByDescending { it.folder.type == FolderType.INBOX }
@@ -39,18 +39,18 @@ class FolderRepository(
val messageStore = messageStoreManager.getMessageStore(account)
return messageStore.getDisplayFolders(
displayMode = displayMode ?: account.folderDisplayMode,
- outboxFolderId = account.outboxFolderId
+ outboxFolderId = account.outboxFolderId,
) { folder ->
DisplayFolder(
folder = Folder(
id = folder.id,
name = folder.name,
type = folderTypeOf(account, folder.id),
- isLocalOnly = folder.isLocalOnly
+ isLocalOnly = folder.isLocalOnly,
),
isInTopGroup = folder.isInTopGroup,
unreadMessageCount = folder.unreadMessageCount,
- starredMessageCount = folder.starredMessageCount
+ starredMessageCount = folder.starredMessageCount,
)
}.sortedWith(sortForDisplay)
}
@@ -103,7 +103,7 @@ class FolderRepository(
id = folder.id,
name = folder.name,
type = folderTypeOf(account, folder.id),
- isLocalOnly = folder.isLocalOnly
+ isLocalOnly = folder.isLocalOnly,
)
}
}
@@ -116,14 +116,14 @@ class FolderRepository(
id = folder.id,
name = folder.name,
type = folderTypeOf(account, folder.id),
- isLocalOnly = folder.isLocalOnly
+ isLocalOnly = folder.isLocalOnly,
),
isInTopGroup = folder.isInTopGroup,
isIntegrate = folder.isIntegrate,
syncClass = folder.syncClass,
displayClass = folder.displayClass,
notifyClass = folder.notifyClass,
- pushClass = folder.pushClass
+ pushClass = folder.pushClass,
)
}
}
@@ -135,7 +135,7 @@ class FolderRepository(
id = folder.id,
serverId = folder.serverIdOrThrow(),
name = folder.name,
- type = folder.type.toFolderType()
+ type = folder.type.toFolderType(),
)
}
}
@@ -148,14 +148,14 @@ class FolderRepository(
id = folder.id,
serverId = folder.serverIdOrThrow(),
name = folder.name,
- type = folder.type.toFolderType()
+ type = folder.type.toFolderType(),
),
isInTopGroup = folder.isInTopGroup,
isIntegrate = folder.isIntegrate,
syncClass = folder.syncClass,
displayClass = folder.displayClass,
notifyClass = folder.notifyClass,
- pushClass = folder.pushClass
+ pushClass = folder.pushClass,
)
}
}
@@ -288,7 +288,7 @@ class FolderRepository(
private data class AccountContainer(
val account: Account,
- val folderDisplayMode: FolderMode
+ val folderDisplayMode: FolderMode,
)
data class Folder(val id: Long, val name: String, val type: FolderType, val isLocalOnly: Boolean)
@@ -302,7 +302,7 @@ data class FolderDetails(
val syncClass: FolderClass,
val displayClass: FolderClass,
val notifyClass: FolderClass,
- val pushClass: FolderClass
+ val pushClass: FolderClass,
)
data class RemoteFolderDetails(
@@ -312,14 +312,14 @@ data class RemoteFolderDetails(
val syncClass: FolderClass,
val displayClass: FolderClass,
val notifyClass: FolderClass,
- val pushClass: FolderClass
+ val pushClass: FolderClass,
)
data class DisplayFolder(
val folder: Folder,
val isInTopGroup: Boolean,
val unreadMessageCount: Int,
- val starredMessageCount: Int
+ val starredMessageCount: Int,
)
enum class FolderType {
@@ -330,5 +330,5 @@ enum class FolderType {
TRASH,
DRAFTS,
ARCHIVE,
- SPAM
+ SPAM,
}
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt
index c00daf0ea2c543e5a1950caa103a54aece94aafa..7840816d32f1225d2b0e45a5979f4ca18153bf73 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt
@@ -11,7 +11,7 @@ import com.fsck.k9.mailstore.MoreMessages as StoreMoreMessages
class K9BackendFolder(
private val messageStore: MessageStore,
private val saveMessageDataCreator: SaveMessageDataCreator,
- folderServerId: String
+ folderServerId: String,
) : BackendFolder {
private val databaseId: String
private val folderId: Long
@@ -25,7 +25,7 @@ class K9BackendFolder(
Init(
folderId = folder.id,
name = folder.name,
- visibleLimit = folder.visibleLimit
+ visibleLimit = folder.visibleLimit,
)
} ?: error("Couldn't find folder $folderServerId")
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt
index 566a13ca454e32939123b73d77559417c19ab0d2..450c9059e940b1ae95d43cbc44df7ae0782c3a08 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt
@@ -10,7 +10,7 @@ class K9BackendStorage(
private val messageStore: MessageStore,
private val folderSettingsProvider: FolderSettingsProvider,
private val saveMessageDataCreator: SaveMessageDataCreator,
- private val listeners: List
+ private val listeners: List,
) : BackendStorage {
override fun getFolder(folderServerId: String): BackendFolder {
return K9BackendFolder(messageStore, saveMessageDataCreator, folderServerId)
@@ -53,7 +53,7 @@ class K9BackendStorage(
serverId = folderInfo.serverId,
name = folderInfo.name,
type = folderInfo.type,
- settings = folderSettingsProvider.getFolderSettings(folderInfo.serverId)
+ settings = folderSettingsProvider.getFolderSettings(folderInfo.serverId),
)
}
messageStore.createFolders(createFolderInfo)
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt
index 211c74a57cfdbe5fb4316b6671cd93142b54a621..9edc7dfeb2180c57883fcd0b714c018b4feb087a 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt
@@ -8,7 +8,7 @@ class K9BackendStorageFactory(
private val folderRepository: FolderRepository,
private val messageStoreManager: MessageStoreManager,
private val specialFolderSelectionStrategy: SpecialFolderSelectionStrategy,
- private val saveMessageDataCreator: SaveMessageDataCreator
+ private val saveMessageDataCreator: SaveMessageDataCreator,
) {
fun createBackendStorage(account: Account): K9BackendStorage {
val messageStore = messageStoreManager.getMessageStore(account)
@@ -17,10 +17,14 @@ class K9BackendStorageFactory(
preferences,
folderRepository,
specialFolderSelectionStrategy,
- account
+ account,
)
val specialFolderListener = SpecialFolderBackendFoldersRefreshListener(specialFolderUpdater)
- val autoExpandFolderListener = AutoExpandFolderBackendFoldersRefreshListener(preferences, account, folderRepository)
+ val autoExpandFolderListener = AutoExpandFolderBackendFoldersRefreshListener(
+ preferences,
+ account,
+ folderRepository,
+ )
val listeners = listOf(specialFolderListener, autoExpandFolderListener)
return K9BackendStorage(messageStore, folderSettingsProvider, saveMessageDataCreator, listeners)
}
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt b/app/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt
index 8575c3bf55fc94f5b0531955cb67ca5bde7391d3..b485d6911d04e6ae61e9afab3ca96e51f48197e8 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt
@@ -17,7 +17,7 @@ val mailStoreModule = module {
folderRepository = get(),
messageStoreManager = get(),
specialFolderSelectionStrategy = get(),
- saveMessageDataCreator = get()
+ saveMessageDataCreator = get(),
)
}
factory { SpecialLocalFoldersCreator(preferences = get(), localStoreProvider = get()) }
@@ -31,7 +31,7 @@ val mailStoreModule = module {
encryptionExtractor = get(),
messagePreviewCreator = get(),
messageFulltextCreator = get(),
- attachmentCounter = get()
+ attachmentCounter = get(),
)
}
single { MessageListRepository(messageStoreManager = get()) }
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/LocalStore.java b/app/core/src/main/java/com/fsck/k9/mailstore/LocalStore.java
index 27e3e11736e9a1d94074986385d0c483ce4618ca..517bef2c387be037f1c41f5482e0768584e846ca 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/LocalStore.java
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/LocalStore.java
@@ -27,7 +27,6 @@ import android.text.TextUtils;
import androidx.core.database.CursorKt;
import com.fsck.k9.Account;
-import com.fsck.k9.Clock;
import com.fsck.k9.DI;
import com.fsck.k9.Preferences;
import com.fsck.k9.controller.MessagingControllerCommands.PendingCommand;
@@ -52,6 +51,7 @@ import com.fsck.k9.search.LocalSearch;
import com.fsck.k9.search.SearchSpecification.Attribute;
import com.fsck.k9.search.SearchSpecification.SearchField;
import com.fsck.k9.search.SqlQueryBuilder;
+import kotlinx.datetime.Clock;
import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.codec.Base64InputStream;
import org.apache.james.mime4j.codec.QuotedPrintableInputStream;
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt
index 19c14855f3e02ae3176ee85b4f943afa07850ab2..aa681c89082ad64b64178b641a15944040ab43fb 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt
@@ -10,7 +10,7 @@ data class MessageDetails(
val replyTo: List,
val to: List,
val cc: List,
- val bcc: List
+ val bcc: List,
)
sealed interface MessageDate {
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt
index 2bea1c5340779581f540848aa56542a34cd52ee3..c9c13d38257805af91eff28b0c2c7b71f4934248 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt
@@ -3,7 +3,7 @@ package com.fsck.k9.mailstore
import java.util.concurrent.CopyOnWriteArraySet
class MessageListRepository(
- private val messageStoreManager: MessageStoreManager
+ private val messageStoreManager: MessageStoreManager,
) {
private val globalListeners = CopyOnWriteArraySet()
private val accountListeners = CopyOnWriteArraySet>()
@@ -45,7 +45,7 @@ class MessageListRepository(
selection: String,
selectionArgs: Array,
sortOrder: String,
- messageMapper: MessageMapper
+ messageMapper: MessageMapper,
): List {
val messageStore = messageStoreManager.getMessageStore(accountUuid)
val cache = MessageListCache.getCache(accountUuid)
@@ -62,7 +62,7 @@ class MessageListRepository(
selection: String,
selectionArgs: Array,
sortOrder: String,
- messageMapper: MessageMapper
+ messageMapper: MessageMapper,
): List {
val messageStore = messageStoreManager.getMessageStore(accountUuid)
val cache = MessageListCache.getCache(accountUuid)
@@ -78,7 +78,7 @@ class MessageListRepository(
accountUuid: String,
threadId: Long,
sortOrder: String,
- messageMapper: MessageMapper
+ messageMapper: MessageMapper,
): List {
val messageStore = messageStoreManager.getMessageStore(accountUuid)
val cache = MessageListCache.getCache(accountUuid)
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt
index e2fc950b16e3b13206e118a36438f7da244d5afa..a8f0271fbf6aef68f8afafefbaca3b72a4cf2c6e 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt
@@ -32,7 +32,7 @@ class MessageRepository(private val messageStoreManager: MessageStoreManager) {
replyTo = replyToAddresses,
to = toAddresses,
cc = ccAddresses,
- bcc = bccAddresses
+ bcc = bccAddresses,
)
}
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt
index a93c705ee5c0ff87f75029a20d7152d1fc0468fb..2ce10b6781c55dade508c883c37fc97171e2788e 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt
@@ -128,7 +128,7 @@ interface MessageStore {
selection: String,
selectionArgs: Array,
sortOrder: String,
- messageMapper: MessageMapper
+ messageMapper: MessageMapper,
): List
/**
@@ -138,7 +138,7 @@ interface MessageStore {
selection: String,
selectionArgs: Array,
sortOrder: String,
- messageMapper: MessageMapper
+ messageMapper: MessageMapper,
): List
/**
@@ -235,12 +235,12 @@ interface MessageStore {
/**
* Retrieve the number of unread messages matching [conditions].
*/
- fun getUnreadMessageCount(conditions: ConditionsTreeNode): Int
+ fun getUnreadMessageCount(conditions: ConditionsTreeNode?): Int
/**
* Retrieve the number of starred messages matching [conditions].
*/
- fun getStarredMessageCount(conditions: ConditionsTreeNode): Int
+ fun getStarredMessageCount(conditions: ConditionsTreeNode?): Int
/**
* Update a folder's name and type.
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageStoreManager.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageStoreManager.kt
index efe6990860b0867a72fe4ace282e0bb26f8e4c45..ea97029e938263ec881985b663ca04885c24298c 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageStoreManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageStoreManager.kt
@@ -4,7 +4,10 @@ import com.fsck.k9.Account
import com.fsck.k9.preferences.AccountManager
import java.util.concurrent.ConcurrentHashMap
-class MessageStoreManager(private val accountManager: AccountManager, private val messageStoreFactory: MessageStoreFactory) {
+class MessageStoreManager(
+ private val accountManager: AccountManager,
+ private val messageStoreFactory: MessageStoreFactory,
+) {
private val messageStores = ConcurrentHashMap()
init {
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt
index e72132c4abaf17d73eb75fa981e31b521fa9e28b..98194d8cf75c97583e195ccf06f653b5f75b38a4 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt
@@ -8,7 +8,7 @@ import com.fsck.k9.message.html.HtmlSettings
class MessageViewInfoExtractorFactory(
private val attachmentInfoExtractor: AttachmentInfoExtractor,
private val htmlProcessorFactory: HtmlProcessorFactory,
- private val resourceProvider: CoreResourceProvider
+ private val resourceProvider: CoreResourceProvider,
) {
fun create(settings: HtmlSettings): MessageViewInfoExtractor {
val htmlProcessor = htmlProcessorFactory.create(settings)
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt b/app/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt
index dddb1073c8e61da65a54f5fb31d06689498e37c1..99b7375b4d6189a57bb2d758257226ac0f959a68 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt
@@ -3,5 +3,5 @@ package com.fsck.k9.mailstore
data class NotificationMessage(
val message: LocalMessage,
val notificationId: Int?,
- val timestamp: Long
+ val timestamp: Long,
)
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt b/app/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt
index 0a63f3076a540f42f9efbfc8f0f89fe34c6fc5e6..94adaebb8420d98f82e8d754db266c8249a21ccf 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt
@@ -7,7 +7,7 @@ import com.fsck.k9.mail.Flag
*/
class NotifierMessageStore(
private val messageStore: MessageStore,
- private val localStore: LocalStore
+ private val localStore: LocalStore,
) : MessageStore by messageStore {
override fun saveRemoteMessage(folderId: Long, messageServerId: String, messageData: SaveMessageData) {
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt b/app/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt
index c024d01be9b3ca8081674efc9262ccdec7976e2b..f6600883e3c0034332885190d15a7ceef2a5ba40 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt
@@ -4,5 +4,5 @@ data class OutboxState(
val sendState: SendState,
val numberOfSendAttempts: Int,
val sendError: String?,
- val sendErrorTimestamp: Long
+ val sendErrorTimestamp: Long,
)
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt b/app/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt
index c2c11aa932f6977b9b137d310384c7c2cbc6609a..b819854ad9eb79584940cb05baddddbc28c96966 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt
@@ -1,13 +1,16 @@
package com.fsck.k9.mailstore
import android.content.ContentValues
-import com.fsck.k9.Clock
-import com.fsck.k9.helper.getIntOrThrow
-import com.fsck.k9.helper.getLongOrThrow
-import com.fsck.k9.helper.getStringOrNull
-import com.fsck.k9.helper.getStringOrThrow
+import app.k9mail.core.android.common.database.getIntOrThrow
+import app.k9mail.core.android.common.database.getLongOrThrow
+import app.k9mail.core.android.common.database.getStringOrNull
+import app.k9mail.core.android.common.database.getStringOrThrow
+import kotlinx.datetime.Clock
-class OutboxStateRepository(private val database: LockableDatabase, private val clock: Clock) {
+class OutboxStateRepository(
+ private val database: LockableDatabase,
+ private val clock: Clock,
+) {
fun getOutboxState(messageId: Long): OutboxState {
return database.execute(false) { db ->
@@ -15,7 +18,10 @@ class OutboxStateRepository(private val database: LockableDatabase, private val
TABLE_NAME,
COLUMNS,
"$COLUMN_MESSAGE_ID = ?",
- arrayOf(messageId.toString()), null, null, null
+ arrayOf(messageId.toString()),
+ null,
+ null,
+ null,
).use { cursor ->
if (!cursor.moveToFirst()) {
throw IllegalStateException("No outbox_state entry for message with id $messageId")
@@ -56,7 +62,7 @@ class OutboxStateRepository(private val database: LockableDatabase, private val
"UPDATE $TABLE_NAME " +
"SET $COLUMN_NUMBER_OF_SEND_ATTEMPTS = $COLUMN_NUMBER_OF_SEND_ATTEMPTS + 1 " +
"WHERE $COLUMN_MESSAGE_ID = ?",
- arrayOf(messageId.toString())
+ arrayOf(messageId.toString()),
)
}
}
@@ -67,13 +73,13 @@ class OutboxStateRepository(private val database: LockableDatabase, private val
"UPDATE $TABLE_NAME " +
"SET $COLUMN_NUMBER_OF_SEND_ATTEMPTS = $COLUMN_NUMBER_OF_SEND_ATTEMPTS - 1 " +
"WHERE $COLUMN_MESSAGE_ID = ?",
- arrayOf(messageId.toString())
+ arrayOf(messageId.toString()),
)
}
}
fun setSendAttemptError(messageId: Long, errorMessage: String) {
- val sendErrorTimestamp = clock.time
+ val sendErrorTimestamp = clock.now().toEpochMilliseconds()
database.execute(false) { db ->
val contentValues = ContentValues().apply {
@@ -87,7 +93,7 @@ class OutboxStateRepository(private val database: LockableDatabase, private val
}
fun setSendAttemptsExceeded(messageId: Long) {
- val sendErrorTimestamp = clock.time
+ val sendErrorTimestamp = clock.now().toEpochMilliseconds()
database.execute(false) { db ->
val contentValues = ContentValues().apply {
@@ -112,7 +118,7 @@ class OutboxStateRepository(private val database: LockableDatabase, private val
COLUMN_SEND_STATE,
COLUMN_NUMBER_OF_SEND_ATTEMPTS,
COLUMN_ERROR_TIMESTAMP,
- COLUMN_ERROR
+ COLUMN_ERROR,
)
}
}
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt
index a180becb03b5fabe84adea63018cf9c39b4c12d2..a3822256110e1253988ad7d721313143a55beef4 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt
@@ -13,5 +13,5 @@ data class SaveMessageData(
val attachmentCount: Int,
val previewResult: PreviewResult,
val textForSearchIndex: String? = null,
- val encryptionType: String?
+ val encryptionType: String?,
)
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt
index 8d649b9464f0f85f39241a8f78e9bc8dc5ef0bef..4d9cc9f99e5b51bc00743324cca7078b0510c90d 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt
@@ -11,12 +11,12 @@ class SaveMessageDataCreator(
private val encryptionExtractor: EncryptionExtractor,
private val messagePreviewCreator: MessagePreviewCreator,
private val messageFulltextCreator: MessageFulltextCreator,
- private val attachmentCounter: AttachmentCounter
+ private val attachmentCounter: AttachmentCounter,
) {
fun createSaveMessageData(
message: Message,
downloadState: MessageDownloadState,
- subject: String? = null
+ subject: String? = null,
): SaveMessageData {
val now = System.currentTimeMillis()
val date = message.sentDate?.time ?: now
@@ -34,7 +34,7 @@ class SaveMessageDataCreator(
attachmentCount = encryptionResult.attachmentCount,
previewResult = encryptionResult.previewResult,
textForSearchIndex = encryptionResult.textForSearchIndex,
- encryptionType = encryptionResult.encryptionType
+ encryptionType = encryptionResult.encryptionType,
)
} else {
SaveMessageData(
@@ -46,7 +46,7 @@ class SaveMessageDataCreator(
attachmentCount = attachmentCounter.getAttachmentCount(message),
previewResult = messagePreviewCreator.createPreview(message),
textForSearchIndex = messageFulltextCreator.createFulltext(message),
- encryptionType = null
+ encryptionType = null,
)
}
}
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt
index ba0ac59e0de9ed8abf99b03ddf6479b30b4fcb5c..cb411c02cf82cac5bd63a3da9ef0f6d73a681ddc 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt
@@ -3,7 +3,8 @@ package com.fsck.k9.mailstore
enum class SendState(val databaseName: String) {
READY("ready"),
RETRIES_EXCEEDED("retries_exceeded"),
- ERROR("error");
+ ERROR("error"),
+ ;
companion object {
@JvmStatic
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt
index 744407aeb14878d15f5587bbf8814bb3d5ce30b2..15fb008fcddfa8db03cba185ae583cd284dbd5b3 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt
@@ -4,7 +4,7 @@ package com.fsck.k9.mailstore
* Update special folders when folders are added, removed, or changed.
*/
class SpecialFolderBackendFoldersRefreshListener(
- private val specialFolderUpdater: SpecialFolderUpdater
+ private val specialFolderUpdater: SpecialFolderUpdater,
) : BackendFoldersRefreshListener {
override fun onBeforeFolderListRefresh() = Unit
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt
index e25f08c7767681e830fe2b62a4055102a78bb444..ec680c9758768064cd82a13544bf805e2e1a2aae 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt
@@ -15,7 +15,7 @@ class SpecialFolderUpdater(
private val preferences: Preferences,
private val folderRepository: FolderRepository,
private val specialFolderSelectionStrategy: SpecialFolderSelectionStrategy,
- private val account: Account
+ private val account: Account,
) {
fun updateSpecialFolders() {
val folders = folderRepository.getRemoteFolders(account)
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt
index c2cd90f605ebbe96b973ae226db28f99b2bc4c5e..2b5f5298fb311db402fcc548d42e8aa39384f650 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt
@@ -9,7 +9,7 @@ import timber.log.Timber
class SpecialLocalFoldersCreator(
private val preferences: Preferences,
- private val localStoreProvider: LocalStoreProvider
+ private val localStoreProvider: LocalStoreProvider,
) {
// TODO: When rewriting the account setup code make sure this method is only called once. Until then this can be
// called multiple times and we have to make sure folders are only created once.
diff --git a/app/core/src/main/java/com/fsck/k9/message/Attachment.kt b/app/core/src/main/java/com/fsck/k9/message/Attachment.kt
index 98a16080fa3e6b5a31ec97ad18c254724c41b7c3..a57bfb64977206c7e6fe92badc27574684ab725f 100644
--- a/app/core/src/main/java/com/fsck/k9/message/Attachment.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/Attachment.kt
@@ -12,6 +12,6 @@ interface Attachment {
URI_ONLY,
METADATA,
COMPLETE,
- CANCELLED
+ CANCELLED,
}
}
diff --git a/app/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt b/app/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt
index a208b982093a8a246b315902fe925974fee761e6..462d354deef27dbe90aa68123b27e7df3e905fab 100644
--- a/app/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt
@@ -27,10 +27,10 @@ class ReplyActionStrategy(private val replyRoParser: ReplyToParser) {
data class ReplyActions(
val defaultAction: ReplyAction?,
- val additionalActions: List = emptyList()
+ val additionalActions: List = emptyList(),
)
enum class ReplyAction {
REPLY,
- REPLY_ALL
+ REPLY_ALL,
}
diff --git a/app/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt b/app/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt
index 9643a06f312dfb34c27ef799ac53175d35a6cf85..af499f08ff0c33a7c3948c32eecaed29036ad38b 100644
--- a/app/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt
@@ -16,7 +16,7 @@ class BasicPartInfoExtractor {
return BasicPartInfo(
displayName = part.getDisplayName(contentDisposition),
- size = contentDisposition?.getParameter("size")?.toLongOrNull()
+ size = contentDisposition?.getParameter("size")?.toLongOrNull(),
)
}
@@ -47,5 +47,5 @@ class BasicPartInfoExtractor {
data class BasicPartInfo(
val displayName: String,
- val size: Long?
+ val size: Long?,
)
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt b/app/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt
index e5067fe0cce20df04e3963a5647b6cd62300c423..d7d7d800942ddb4aa8ae818ae2e67e7d6feeee32 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt
@@ -10,7 +10,7 @@ internal object DividerReplacer : TextToHtml.HtmlModifier {
"(?:" + SIMPLE_DIVIDER + "|" + ASCII_SCISSORS + ")" +
"\\s*" +
"(?:\\n|$)" +
- ")+"
+ ")+",
)
override fun findModifications(text: CharSequence): List {
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt b/app/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt
index fc487a75c23db56b197536cfecf68cfbb05e9141..81c4e2db35d0ed8ceaea88e2dbb5d21cb324579c 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt
@@ -39,7 +39,7 @@ class EmailTextToHtml private constructor(private val text: String) {
html.append(
"")
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/GenericUriParser.kt b/app/core/src/main/java/com/fsck/k9/message/html/GenericUriParser.kt
index 14cede4cdc26480a4a6e63841d4ca588d3d568df..9ce5c7bcb9cfb4d3ce46c0f1791028bc219dbd72 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/GenericUriParser.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/GenericUriParser.kt
@@ -9,6 +9,8 @@ import java.util.regex.Pattern
*/
class GenericUriParser : UriParser {
override fun parseUri(text: CharSequence, startPos: Int): UriMatch? {
+ require(startPos in text.indices) { "Invalid 'startPos' value" }
+
val matcher = PATTERN.matcher(text)
if (!matcher.find(startPos) || matcher.start() != startPos) return null
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt b/app/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt
index 555bcbe0472285ad9b35a5b2a659bf44a64fbfd4..6ea3392421d250cde89e54f66528b3cccd590348 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt
@@ -3,7 +3,7 @@ package com.fsck.k9.message.html
import app.k9mail.html.cleaner.HtmlProcessor
class HtmlProcessorFactory(
- private val displayHtmlFactory: DisplayHtmlFactory
+ private val displayHtmlFactory: DisplayHtmlFactory,
) {
fun create(settings: HtmlSettings): HtmlProcessor {
val displayHtml = displayHtmlFactory.create(settings)
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt b/app/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt
index 5d6a0592b18cc83889a4cbad1a40bbfe2c721598..0eb934e4bb9804862297a00ef710659e26da8a57 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt
@@ -2,5 +2,5 @@ package com.fsck.k9.message.html
data class HtmlSettings(
val useDarkMode: Boolean,
- val useFixedWidthFont: Boolean
+ val useFixedWidthFont: Boolean,
)
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt b/app/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt
index 009e727ad2a3d8cdacb0c914c9b80a92153b34b7..42fe638d20033c64391aeebc6c764750d1b69be3 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt
@@ -11,6 +11,8 @@ import kotlin.math.min
*/
internal class HttpUriParser : UriParser {
override fun parseUri(text: CharSequence, startPos: Int): UriMatch? {
+ require(startPos in text.indices) { "Invalid 'startPos' value" }
+
val matchResult = SCHEME_REGEX.find(text, startPos) ?: return null
if (matchResult.range.first != startPos) return null
@@ -221,7 +223,7 @@ internal class HttpUriParser : UriParser {
private fun matchUnreservedPCTEncodedSubDelimClassesGreedy(
text: CharSequence,
startPos: Int,
- additionalCharacters: String
+ additionalCharacters: String,
): Int {
val allowedCharacters = SUB_DELIM + "-._~" + additionalCharacters
var shouldBeHex = 0
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt b/app/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt
index ad0b5e6f2e68f203a2cd1ce4750949552f78575f..ab634fe6575b8cfcca8e9bd011777c2b5a8b68b3 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt
@@ -5,7 +5,7 @@ import java.util.ArrayDeque
class TextToHtml private constructor(
private val text: CharSequence,
private val html: StringBuilder,
- private val retainOriginalWhitespace: Boolean
+ private val retainOriginalWhitespace: Boolean,
) {
fun appendAsHtmlFragment() {
appendHtmlPrefix()
@@ -29,7 +29,7 @@ class TextToHtml private constructor(
if (modification.endIndex > modificationStack.peek()?.endIndex ?: Int.MAX_VALUE) {
error(
"HtmlModification $modification must be fully contained within " +
- "outer HtmlModification ${modificationStack.peek()}"
+ "outer HtmlModification ${modificationStack.peek()}",
)
}
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt b/app/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt
index 5e7b1b4cd683974d3e8466fc05975c7d22ac88bf..3a488fac93fd7c66babddd8de1bf63dbbce59ad2 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt
@@ -10,7 +10,7 @@ internal object UriLinkifier : TextToHtml.HtmlModifier {
class LinkifyUri(
startIndex: Int,
endIndex: Int,
- val uri: CharSequence
+ val uri: CharSequence,
) : HtmlModification.Wrap(startIndex, endIndex) {
override fun appendPrefix(textToHtml: TextToHtml) {
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt b/app/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt
index 6c611242310b6441f23b9114711d94e16aee2c64..3601895351c712d8af6f6b7e9f7f76549538be09 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt
@@ -3,5 +3,5 @@ package com.fsck.k9.message.html
data class UriMatch(
val startIndex: Int,
val endIndex: Int,
- val uri: CharSequence
+ val uri: CharSequence,
)
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt b/app/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt
index 44329acfdb6a7b7bb15b867b4697e5878f6d078f..891bb58524f0ccd9ad556cdf0a2b2e1538c330e7 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt
@@ -17,8 +17,8 @@ object UriMatcher {
private const val SCHEME_SEPARATORS = "\\s(\\n<"
private const val ALLOWED_SEPARATORS_PATTERN = "(?:^|[$SCHEME_SEPARATORS])"
private val URI_SCHEME = Regex(
- "$ALLOWED_SEPARATORS_PATTERN(${ SUPPORTED_URIS.keys.joinToString("|") })",
- RegexOption.IGNORE_CASE
+ "$ALLOWED_SEPARATORS_PATTERN(${SUPPORTED_URIS.keys.joinToString("|")})",
+ RegexOption.IGNORE_CASE,
)
fun findUris(text: CharSequence): List {
diff --git a/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt b/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt
index 4148660a211973fb83f5a6bae326831759dc604e..7eff37912c81f88d82feed47ad66fd2fa46d4d9e 100644
--- a/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt
@@ -8,7 +8,7 @@ import com.fsck.k9.mail.Message.RecipientType
class TextQuoteCreator(
private val quoteDateFormatter: QuoteDateFormatter,
- private val resourceProvider: CoreResourceProvider
+ private val resourceProvider: CoreResourceProvider,
) {
private val prefixInsertionRegex = Regex("(?m)^")
@@ -16,7 +16,7 @@ class TextQuoteCreator(
originalMessage: Message,
messageBody: String?,
quoteStyle: QuoteStyle,
- prefix: String
+ prefix: String,
): String {
val body = messageBody ?: ""
return when (quoteStyle) {
diff --git a/app/core/src/main/java/com/fsck/k9/message/signature/HtmlSignatureRemover.kt b/app/core/src/main/java/com/fsck/k9/message/signature/HtmlSignatureRemover.kt
index 07746c20dcbdc37d28527e382257854a50cbe5d4..d7a0de6b472b0b856a992ea464aab5c395d057c0 100644
--- a/app/core/src/main/java/com/fsck/k9/message/signature/HtmlSignatureRemover.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/signature/HtmlSignatureRemover.kt
@@ -130,7 +130,7 @@ class HtmlSignatureRemover {
}
companion object {
- private val DASH_SIGNATURE_HTML = Pattern.compile("\\s*-- \\s*", Pattern.CASE_INSENSITIVE)
+ private val DASH_SIGNATURE_HTML = Pattern.compile("\\s*--[ \u00A0]\\s*")
private val BLOCKQUOTE = Tag.valueOf("blockquote")
private val BR = Tag.valueOf("br")
diff --git a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt
index 8832f30a86bcf1109f12dde4d714dad524fa6631..cc2af899139943c431a9e0d559b986bcb81910a8 100644
--- a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt
+++ b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt
@@ -8,7 +8,7 @@ import android.net.ConnectivityManager as SystemConnectivityManager
@Suppress("DEPRECATION")
internal class ConnectivityManagerApi21(
- private val systemConnectivityManager: SystemConnectivityManager
+ private val systemConnectivityManager: SystemConnectivityManager,
) : ConnectivityManagerBase() {
private var isRunning = false
private var lastNetworkType: Int? = null
diff --git a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt
index 17fb87f3a1d85ce7695afa2e304e4f1ee3582605..615182f2d9bf1c824c07d26c1fa8c9b612c01cc4 100644
--- a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt
+++ b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt
@@ -11,7 +11,7 @@ import android.net.ConnectivityManager as SystemConnectivityManager
@RequiresApi(Build.VERSION_CODES.M)
internal class ConnectivityManagerApi23(
- private val systemConnectivityManager: SystemConnectivityManager
+ private val systemConnectivityManager: SystemConnectivityManager,
) : ConnectivityManagerBase() {
private var isRunning = false
private var lastActiveNetwork: Network? = null
diff --git a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt
index b0a3dafed9cc77e35c4ba0e9026286f34fb22f76..09dd1951297ad8c367454e23941312d821fdb732 100644
--- a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt
+++ b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt
@@ -10,7 +10,7 @@ import android.net.ConnectivityManager as SystemConnectivityManager
@RequiresApi(Build.VERSION_CODES.N)
internal class ConnectivityManagerApi24(
- private val systemConnectivityManager: SystemConnectivityManager
+ private val systemConnectivityManager: SystemConnectivityManager,
) : ConnectivityManagerBase() {
private var isRunning = false
private var isNetworkAvailable: Boolean? = null
diff --git a/app/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt b/app/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt
index 662235eb2f9714bd308c58eab09b0a426f15992a..bd2ec9913ddeae7f467d315239799d20d82ac4fe 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt
@@ -4,7 +4,7 @@ internal class AddNotificationResult private constructor(
val notificationData: NotificationData,
val notificationStoreOperations: List,
val notificationHolder: NotificationHolder,
- val shouldCancelNotification: Boolean
+ val shouldCancelNotification: Boolean,
) {
val cancelNotificationId: Int
get() {
@@ -16,26 +16,26 @@ internal class AddNotificationResult private constructor(
fun newNotification(
notificationData: NotificationData,
notificationStoreOperations: List,
- notificationHolder: NotificationHolder
+ notificationHolder: NotificationHolder,
): AddNotificationResult {
return AddNotificationResult(
notificationData,
notificationStoreOperations,
notificationHolder,
- shouldCancelNotification = false
+ shouldCancelNotification = false,
)
}
fun replaceNotification(
notificationData: NotificationData,
notificationStoreOperations: List,
- notificationHolder: NotificationHolder
+ notificationHolder: NotificationHolder,
): AddNotificationResult {
return AddNotificationResult(
notificationData,
notificationStoreOperations,
notificationHolder,
- shouldCancelNotification = true
+ shouldCancelNotification = true,
)
}
}
diff --git a/app/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt
index 332c7dbb42685c79541b61cc2f6bd882b6f9b681..9f931a07611f18b06cee02046115597a7b142a26 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.Account
internal open class AuthenticationErrorNotificationController(
private val notificationHelper: NotificationHelper,
private val actionCreator: NotificationActionCreator,
- private val resourceProvider: NotificationResourceProvider
+ private val resourceProvider: NotificationResourceProvider,
) {
fun showAuthenticationErrorNotification(account: Account, incoming: Boolean) {
val notificationId = NotificationIds.getAuthenticationErrorNotificationId(account, incoming)
diff --git a/app/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt
index 9fe65d367cad4d34c8855699a536049d8970509a..e43f5a0a47e10268c00d4a0017634ff38e5e787d 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt
@@ -17,7 +17,7 @@ internal class BaseNotificationDataCreator {
color = account.chipColor,
newMessagesCount = notificationData.newMessagesCount,
lockScreenNotificationData = createLockScreenNotificationData(notificationData),
- appearance = createNotificationAppearance(account)
+ appearance = createNotificationAppearance(account),
)
}
diff --git a/app/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt
index bae4f7e45b6098ef8b7ed889246d6dc24fe0cf97..1dd76bbe5b253488b820102a80ea0a220e28121e 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.Account
internal open class CertificateErrorNotificationController(
private val notificationHelper: NotificationHelper,
private val actionCreator: NotificationActionCreator,
- private val resourceProvider: NotificationResourceProvider
+ private val resourceProvider: NotificationResourceProvider,
) {
fun showCertificateErrorNotification(account: Account, incoming: Boolean) {
val notificationId = NotificationIds.getCertificateErrorNotificationId(account, incoming)
diff --git a/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt b/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt
index f0ac2f20ec6ad63ec33dee04d05ce7e5f988517a..7d6a80de8d18884897c16cdaedab65fff7d65c4a 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt
@@ -14,12 +14,17 @@ val coreNotificationModule = module {
authenticationErrorNotificationController = get(),
syncNotificationController = get(),
sendFailedNotificationController = get(),
- newMailNotificationController = get()
+ newMailNotificationController = get(),
)
}
single { NotificationManagerCompat.from(get()) }
single {
- NotificationHelper(context = get(), notificationManager = get(), notificationChannelManager = get(), resourceProvider = get())
+ NotificationHelper(
+ context = get(),
+ notificationManager = get(),
+ notificationChannelManager = get(),
+ resourceProvider = get(),
+ )
}
single {
NotificationChannelManager(
@@ -27,28 +32,28 @@ val coreNotificationModule = module {
backgroundExecutor = Executors.newSingleThreadExecutor(),
notificationManager = get().getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager,
resourceProvider = get(),
- notificationLightDecoder = get()
+ notificationLightDecoder = get(),
)
}
single {
AccountPreferenceSerializer(
storageManager = get(),
resourceProvider = get(),
- serverSettingsSerializer = get()
+ serverSettingsSerializer = get(),
)
}
single {
CertificateErrorNotificationController(
notificationHelper = get(),
actionCreator = get(),
- resourceProvider = get()
+ resourceProvider = get(),
)
}
single {
AuthenticationErrorNotificationController(
notificationHelper = get(),
actionCreator = get(),
- resourceProvider = get()
+ resourceProvider = get(),
)
}
single {
@@ -62,7 +67,7 @@ val coreNotificationModule = module {
notificationManager = get(),
newMailNotificationManager = get(),
summaryNotificationCreator = get(),
- singleMessageNotificationCreator = get()
+ singleMessageNotificationCreator = get(),
)
}
single {
@@ -72,10 +77,10 @@ val coreNotificationModule = module {
baseNotificationDataCreator = get(),
singleMessageNotificationDataCreator = get(),
summaryNotificationDataCreator = get(),
- clock = get()
+ clock = get(),
)
}
- factory { NotificationContentCreator(context = get(), resourceProvider = get()) }
+ factory { NotificationContentCreator(resourceProvider = get(), contactRepository = get()) }
factory { BaseNotificationDataCreator() }
factory { SingleMessageNotificationDataCreator() }
factory { SummaryNotificationDataCreator(singleMessageNotificationDataCreator = get()) }
@@ -84,7 +89,7 @@ val coreNotificationModule = module {
notificationHelper = get(),
actionCreator = get(),
resourceProvider = get(),
- lockScreenNotificationCreator = get()
+ lockScreenNotificationCreator = get(),
)
}
factory {
@@ -93,7 +98,7 @@ val coreNotificationModule = module {
actionCreator = get(),
lockScreenNotificationCreator = get(),
singleMessageNotificationCreator = get(),
- resourceProvider = get()
+ resourceProvider = get(),
)
}
factory { LockScreenNotificationCreator(notificationHelper = get(), resourceProvider = get()) }
@@ -102,7 +107,7 @@ val coreNotificationModule = module {
context = get(),
resourceProvider = get(),
notificationChannelManager = get(),
- notificationManager = get()
+ notificationManager = get(),
)
}
single {
@@ -110,7 +115,7 @@ val coreNotificationModule = module {
notificationStoreProvider = get(),
localStoreProvider = get(),
messageStoreManager = get(),
- notificationContentCreator = get()
+ notificationContentCreator = get(),
)
}
factory { NotificationLightDecoder() }
@@ -120,7 +125,9 @@ val coreNotificationModule = module {
}
factory {
NotificationSettingsUpdater(
- preferences = get(), notificationChannelManager = get(), notificationConfigurationConverter = get()
+ preferences = get(),
+ notificationChannelManager = get(),
+ notificationConfigurationConverter = get(),
)
}
}
diff --git a/app/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt
index e071201c0dac8659ebff93614f9a332094354f85..08d5d5983576fb34691b0bfef8512860a9e2a17f 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt
@@ -5,11 +5,11 @@ import androidx.core.app.NotificationCompat
internal class LockScreenNotificationCreator(
private val notificationHelper: NotificationHelper,
- private val resourceProvider: NotificationResourceProvider
+ private val resourceProvider: NotificationResourceProvider,
) {
fun configureLockScreenNotification(
builder: NotificationCompat.Builder,
- baseNotificationData: BaseNotificationData
+ baseNotificationData: BaseNotificationData,
) {
when (baseNotificationData.lockScreenNotificationData) {
LockScreenNotificationData.None -> {
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt
index 21c850da54053865d046e0528c317d89736053a9..01e70c3d50623f0f119cb3e76906b5db5d081a7e 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt
@@ -12,7 +12,7 @@ internal class NewMailNotificationController(
private val notificationManager: NotificationManagerCompat,
private val newMailNotificationManager: NewMailNotificationManager,
private val summaryNotificationCreator: SummaryNotificationCreator,
- private val singleMessageNotificationCreator: SingleMessageNotificationCreator
+ private val singleMessageNotificationCreator: SingleMessageNotificationCreator,
) {
@Synchronized
fun restoreNewMailNotifications(accounts: List) {
@@ -38,12 +38,12 @@ internal class NewMailNotificationController(
fun removeNewMailNotifications(
account: Account,
clearNewMessageState: Boolean,
- selector: (List) -> List
+ selector: (List) -> List,
) {
val notificationData = newMailNotificationManager.removeNewMailNotifications(
account,
clearNewMessageState,
- selector
+ selector,
)
if (notificationData != null) {
@@ -78,14 +78,14 @@ internal class NewMailNotificationController(
private fun createSingleNotification(
baseNotificationData: BaseNotificationData,
- singleNotificationData: SingleNotificationData
+ singleNotificationData: SingleNotificationData,
) {
singleMessageNotificationCreator.createSingleNotification(baseNotificationData, singleNotificationData)
}
private fun createSummaryNotification(
baseNotificationData: BaseNotificationData,
- summaryNotificationData: SummaryNotificationData
+ summaryNotificationData: SummaryNotificationData,
) {
summaryNotificationCreator.createSummaryNotification(baseNotificationData, summaryNotificationData)
}
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt
index 9069b4f85ada8b1d1e66f855afff48b7df5df598..89c97ade5bdf33951326aa83127bc2055949da3f 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt
@@ -7,7 +7,7 @@ internal data class NewMailNotificationData(
val cancelNotificationIds: List,
val baseNotificationData: BaseNotificationData,
val singleNotificationData: List,
- val summaryNotificationData: SummaryNotificationData?
+ val summaryNotificationData: SummaryNotificationData?,
)
internal data class BaseNotificationData(
@@ -17,7 +17,7 @@ internal data class BaseNotificationData(
val color: Int,
val newMessagesCount: Int,
val lockScreenNotificationData: LockScreenNotificationData,
- val appearance: NotificationAppearance
+ val appearance: NotificationAppearance,
)
internal sealed interface LockScreenNotificationData {
@@ -31,7 +31,7 @@ internal sealed interface LockScreenNotificationData {
internal data class NotificationAppearance(
val ringtone: String?,
val vibrationPattern: LongArray?,
- val ledColor: Int?
+ val ledColor: Int?,
)
internal data class SingleNotificationData(
@@ -41,13 +41,13 @@ internal data class SingleNotificationData(
val content: NotificationContent,
val actions: List,
val wearActions: List,
- val addLockScreenNotification: Boolean
+ val addLockScreenNotification: Boolean,
)
internal sealed interface SummaryNotificationData
internal data class SummarySingleNotificationData(
- val singleNotificationData: SingleNotificationData
+ val singleNotificationData: SingleNotificationData,
) : SummaryNotificationData
internal data class SummaryInboxNotificationData(
@@ -58,13 +58,13 @@ internal data class SummaryInboxNotificationData(
val additionalMessagesCount: Int,
val messageReferences: List,
val actions: List,
- val wearActions: List
+ val wearActions: List,
) : SummaryNotificationData
internal enum class NotificationAction {
Reply,
MarkAsRead,
- Delete
+ Delete,
}
internal enum class WearNotificationAction {
@@ -72,16 +72,16 @@ internal enum class WearNotificationAction {
MarkAsRead,
Delete,
Archive,
- Spam
+ Spam,
}
internal enum class SummaryNotificationAction {
MarkAsRead,
- Delete
+ Delete,
}
internal enum class SummaryWearNotificationAction {
MarkAsRead,
Delete,
- Archive
+ Archive,
}
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt
index 3edfdb6abb4a052246776bf94fc56dff03f8c613..d883297cd0ccaf56458840190af500581701df4a 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt
@@ -1,9 +1,9 @@
package com.fsck.k9.notification
import com.fsck.k9.Account
-import com.fsck.k9.Clock
import com.fsck.k9.controller.MessageReference
import com.fsck.k9.mailstore.LocalMessage
+import kotlinx.datetime.Clock
/**
* Manages notifications for new messages
@@ -14,7 +14,7 @@ internal class NewMailNotificationManager(
private val baseNotificationDataCreator: BaseNotificationDataCreator,
private val singleMessageNotificationDataCreator: SingleMessageNotificationDataCreator,
private val summaryNotificationDataCreator: SummaryNotificationDataCreator,
- private val clock: Clock
+ private val clock: Clock,
) {
fun restoreNewMailNotifications(account: Account): NewMailNotificationData? {
val notificationData = notificationRepository.restoreNotifications(account) ?: return null
@@ -26,7 +26,7 @@ internal class NewMailNotificationManager(
notificationId = notificationHolder.notificationId,
content = notificationHolder.content,
timestamp = notificationHolder.timestamp,
- addLockScreenNotification = addLockScreenNotification
+ addLockScreenNotification = addLockScreenNotification,
)
}
@@ -34,7 +34,7 @@ internal class NewMailNotificationManager(
cancelNotificationIds = emptyList(),
baseNotificationData = createBaseNotificationData(notificationData),
singleNotificationData = singleNotificationDataList,
- summaryNotificationData = createSummaryNotificationData(notificationData, silent = true)
+ summaryNotificationData = createSummaryNotificationData(notificationData, silent = true),
)
}
@@ -48,7 +48,7 @@ internal class NewMailNotificationManager(
notificationId = result.notificationHolder.notificationId,
content = result.notificationHolder.content,
timestamp = result.notificationHolder.timestamp,
- addLockScreenNotification = result.notificationData.isSingleMessageNotification
+ addLockScreenNotification = result.notificationData.isSingleMessageNotification,
)
return NewMailNotificationData(
@@ -59,14 +59,14 @@ internal class NewMailNotificationManager(
},
baseNotificationData = createBaseNotificationData(result.notificationData),
singleNotificationData = listOf(singleNotificationData),
- summaryNotificationData = createSummaryNotificationData(result.notificationData, silent)
+ summaryNotificationData = createSummaryNotificationData(result.notificationData, silent),
)
}
fun removeNewMailNotifications(
account: Account,
clearNewMessageState: Boolean,
- selector: (List) -> List
+ selector: (List) -> List,
): NewMailNotificationData? {
val result = notificationRepository.removeNotifications(account, clearNewMessageState, selector) ?: return null
@@ -85,7 +85,7 @@ internal class NewMailNotificationManager(
notificationId = notificationHolder.notificationId,
content = notificationHolder.content,
timestamp = notificationHolder.timestamp,
- addLockScreenNotification = result.notificationData.isSingleMessageNotification
+ addLockScreenNotification = result.notificationData.isSingleMessageNotification,
)
}
@@ -93,7 +93,7 @@ internal class NewMailNotificationManager(
cancelNotificationIds = cancelNotificationIds,
baseNotificationData = createBaseNotificationData(result.notificationData),
singleNotificationData = singleNotificationData,
- summaryNotificationData = createSummaryNotificationData(result.notificationData, silent = true)
+ summaryNotificationData = createSummaryNotificationData(result.notificationData, silent = true),
)
}
@@ -111,14 +111,14 @@ internal class NewMailNotificationManager(
notificationId: Int,
content: NotificationContent,
timestamp: Long,
- addLockScreenNotification: Boolean
+ addLockScreenNotification: Boolean,
): SingleNotificationData {
return singleMessageNotificationDataCreator.createSingleNotificationData(
account,
notificationId,
content,
timestamp,
- addLockScreenNotification
+ addLockScreenNotification,
)
}
@@ -130,5 +130,5 @@ internal class NewMailNotificationManager(
}
}
- private fun now(): Long = clock.time
+ private fun now(): Long = clock.now().toEpochMilliseconds()
}
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt
index 5dfa9a8e30a1e7529a3cd30144622cca926f9ed3..1c706f7b85a67624b2b12c666df243cab0bbc9b0 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt
@@ -174,14 +174,14 @@ class NotificationActionService : Service() {
fun createMarkAllAsReadIntent(
context: Context,
accountUuid: String,
- messageReferences: List
+ messageReferences: List,
): Intent {
return Intent(context, NotificationActionService::class.java).apply {
action = ACTION_MARK_AS_READ
putExtra(EXTRA_ACCOUNT_UUID, accountUuid)
putExtra(
EXTRA_MESSAGE_REFERENCES,
- MessageReferenceHelper.toMessageReferenceStringList(messageReferences)
+ MessageReferenceHelper.toMessageReferenceStringList(messageReferences),
)
}
}
@@ -212,14 +212,14 @@ class NotificationActionService : Service() {
fun createDeleteAllMessagesIntent(
context: Context,
accountUuid: String,
- messageReferences: List
+ messageReferences: List,
): Intent {
return Intent(context, NotificationActionService::class.java).apply {
action = ACTION_DELETE
putExtra(EXTRA_ACCOUNT_UUID, accountUuid)
putExtra(
EXTRA_MESSAGE_REFERENCES,
- MessageReferenceHelper.toMessageReferenceStringList(messageReferences)
+ MessageReferenceHelper.toMessageReferenceStringList(messageReferences),
)
}
}
@@ -235,14 +235,14 @@ class NotificationActionService : Service() {
fun createArchiveAllIntent(
context: Context,
account: Account,
- messageReferences: List
+ messageReferences: List,
): Intent {
return Intent(context, NotificationActionService::class.java).apply {
action = ACTION_ARCHIVE
putExtra(EXTRA_ACCOUNT_UUID, account.uuid)
putExtra(
EXTRA_MESSAGE_REFERENCES,
- MessageReferenceHelper.toMessageReferenceStringList(messageReferences)
+ MessageReferenceHelper.toMessageReferenceStringList(messageReferences),
)
}
}
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt
index ad33d10d281f1a7916b666967a7464e16f2ceb63..f2a7c998cd7bfb065d7036c206d2dec1bc7f4376 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt
@@ -20,7 +20,7 @@ class NotificationChannelManager(
private val backgroundExecutor: Executor,
private val notificationManager: NotificationManager,
private val resourceProvider: NotificationResourceProvider,
- private val notificationLightDecoder: NotificationLightDecoder
+ private val notificationLightDecoder: NotificationLightDecoder,
) {
val pushChannelId = "push"
@@ -55,7 +55,7 @@ class NotificationChannelManager(
@RequiresApi(api = Build.VERSION_CODES.O)
private fun addChannelsForAccounts(
notificationManager: NotificationManager,
- accounts: List
+ accounts: List,
) {
for (account in accounts) {
val groupId = account.notificationChannelGroupId
@@ -73,7 +73,7 @@ class NotificationChannelManager(
@RequiresApi(api = Build.VERSION_CODES.O)
private fun removeChannelsForNonExistingOrChangedAccounts(
notificationManager: NotificationManager,
- accounts: List
+ accounts: List,
) {
val accountUuids = accounts.map { it.uuid }.toSet()
@@ -152,7 +152,7 @@ class NotificationChannelManager(
isBlinkLightsEnabled = notificationChannel.shouldShowLights(),
lightColor = notificationChannel.lightColor,
isVibrationEnabled = notificationChannel.shouldVibrate(),
- vibrationPattern = notificationChannel.vibrationPattern?.toList()
+ vibrationPattern = notificationChannel.vibrationPattern?.toList(),
)
}
@@ -196,7 +196,7 @@ class NotificationChannelManager(
val systemLight = notificationLightDecoder.decode(
isBlinkLightsEnabled = shouldShowLights(),
lightColor = lightColor,
- accountColor = account.chipColor
+ accountColor = account.chipColor,
)
val notificationSettings = account.notificationSettings
return sound == notificationSettings.ringtoneUri &&
@@ -253,5 +253,5 @@ data class NotificationConfiguration(
val isBlinkLightsEnabled: Boolean,
val lightColor: Int,
val isVibrationEnabled: Boolean,
- val vibrationPattern: List?
+ val vibrationPattern: List?,
)
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt
index 3f40015f9d6a324509d080ddb2f865530d310497..36847ae5b3c7f07bf49c3d53cb51fbc11ea925a7 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt
@@ -8,25 +8,25 @@ import com.fsck.k9.NotificationSettings
*/
class NotificationConfigurationConverter(
private val notificationLightDecoder: NotificationLightDecoder,
- private val notificationVibrationDecoder: NotificationVibrationDecoder
+ private val notificationVibrationDecoder: NotificationVibrationDecoder,
) {
fun convert(account: Account, notificationConfiguration: NotificationConfiguration): NotificationSettings {
val light = notificationLightDecoder.decode(
isBlinkLightsEnabled = notificationConfiguration.isBlinkLightsEnabled,
lightColor = notificationConfiguration.lightColor,
- accountColor = account.chipColor
+ accountColor = account.chipColor,
)
val vibration = notificationVibrationDecoder.decode(
isVibrationEnabled = notificationConfiguration.isVibrationEnabled,
- systemPattern = notificationConfiguration.vibrationPattern
+ systemPattern = notificationConfiguration.vibrationPattern,
)
return NotificationSettings(
isRingEnabled = notificationConfiguration.sound != null,
ringtone = notificationConfiguration.sound?.toString(),
light = light,
- vibration = vibration
+ vibration = vibration,
)
}
}
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt
index 374979d2e101a7d45b7a878d7d0244b1646bf318..2d50ced47e82558b7b2edbf0f15ab76964e0190a 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt
@@ -7,5 +7,5 @@ internal data class NotificationContent(
val sender: String,
val subject: String,
val preview: CharSequence,
- val summary: CharSequence
+ val summary: CharSequence,
)
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt
index 86d85b8efa8e3e81e06f079752228d61a40d2286..9749a5dc61743cceab7bf75461a075ca31f97ea3 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt
@@ -1,18 +1,17 @@
package com.fsck.k9.notification
-import android.content.Context
import android.text.SpannableStringBuilder
+import app.k9mail.core.android.common.contact.ContactRepository
import com.fsck.k9.Account
import com.fsck.k9.K9
-import com.fsck.k9.helper.Contacts
import com.fsck.k9.helper.MessageHelper
import com.fsck.k9.mail.Message
import com.fsck.k9.mailstore.LocalMessage
import com.fsck.k9.message.extractors.PreviewResult.PreviewType
internal class NotificationContentCreator(
- private val context: Context,
- private val resourceProvider: NotificationResourceProvider
+ private val resourceProvider: NotificationResourceProvider,
+ private val contactRepository: ContactRepository,
) {
fun createFromMessage(account: Account, message: LocalMessage): NotificationContent {
val sender = getMessageSender(account, message)
@@ -22,7 +21,7 @@ internal class NotificationContentCreator(
sender = getMessageSenderForDisplay(sender),
subject = getMessageSubject(message),
preview = getMessagePreview(message),
- summary = buildMessageSummary(sender, getMessageSubject(message))
+ summary = buildMessageSummary(sender, getMessageSubject(message)),
)
}
@@ -70,14 +69,14 @@ internal class NotificationContentCreator(
}
private fun getMessageSender(account: Account, message: Message): String? {
- val contacts = if (K9.isShowContactName) Contacts.getInstance(context) else null
+ val localContactRepository = if (K9.isShowContactName) contactRepository else null
var isSelf = false
val fromAddresses = message.from
if (!fromAddresses.isNullOrEmpty()) {
isSelf = account.isAnIdentity(fromAddresses)
if (!isSelf) {
- return MessageHelper.toFriendly(fromAddresses.first(), contacts).toString()
+ return MessageHelper.toFriendly(fromAddresses.first(), localContactRepository).toString()
}
}
@@ -85,7 +84,10 @@ internal class NotificationContentCreator(
// show To: if the message was sent from me
val recipients = message.getRecipients(Message.RecipientType.TO)
if (!recipients.isNullOrEmpty()) {
- val recipientDisplayName = MessageHelper.toFriendly(recipients.first(), contacts).toString()
+ val recipientDisplayName = MessageHelper.toFriendly(
+ address = recipients.first(),
+ contactRepository = localContactRepository,
+ ).toString()
return resourceProvider.recipientDisplayName(recipientDisplayName)
}
}
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt
index 6d506852ee496ff63b78c3ed04b8bb57d90d4489..317a7afbae069057064499e611832570719a9639 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt
@@ -11,7 +11,7 @@ class NotificationController internal constructor(
private val authenticationErrorNotificationController: AuthenticationErrorNotificationController,
private val syncNotificationController: SyncNotificationController,
private val sendFailedNotificationController: SendFailedNotificationController,
- private val newMailNotificationController: NewMailNotificationController
+ private val newMailNotificationController: NewMailNotificationController,
) {
fun showCertificateErrorNotification(account: Account, incoming: Boolean) {
certificateErrorNotificationController.showCertificateErrorNotification(account, incoming)
@@ -66,7 +66,7 @@ class NotificationController internal constructor(
"Creating notification for message %s:%s:%s",
message.account.uuid,
message.folder.databaseId,
- message.uid
+ message.uid,
)
newMailNotificationController.addNewMailNotification(account, message, silent)
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt
index ab6f36399580c4ec57b0b7616f579bdebe50d17c..544a24f2adc450a2b9f986599ca852c3fdcbf09a 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.controller.MessageReference
internal data class NotificationData(
val account: Account,
val activeNotifications: List,
- val inactiveNotifications: List
+ val inactiveNotifications: List,
) {
val newMessagesCount: Int
get() = activeNotifications.size + inactiveNotifications.size
@@ -29,6 +29,9 @@ internal data class NotificationData(
}
}
+ val activeMessageReferences: List
+ get() = activeNotifications.map { it.content.messageReference }
+
fun isEmpty() = activeNotifications.isEmpty()
companion object {
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt
index 058f229e84fe1fab8e0317b1f163a5746cced036..f3e80d344e9b60c7b92120d86a54d873592bed36 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt
@@ -3,7 +3,7 @@ package com.fsck.k9.notification
import com.fsck.k9.Account
import com.fsck.k9.controller.MessageReference
-internal const val MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS = 8
+internal const val MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS = 9
/**
* Stores information about new message notifications for all accounts.
@@ -24,7 +24,7 @@ internal class NotificationDataStore {
fun initializeAccount(
account: Account,
activeNotifications: List,
- inactiveNotifications: List
+ inactiveNotifications: List,
): NotificationData {
require(activeNotifications.size <= MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS)
@@ -48,7 +48,7 @@ internal class NotificationDataStore {
return if (activeNotification != null) {
val newActiveNotification = activeNotification.copy(content = content)
val notificationHolder = activeNotification.copy(
- content = content
+ content = content,
)
val operations = emptyList()
@@ -56,7 +56,7 @@ internal class NotificationDataStore {
val newActiveNotifications = notificationData.activeNotifications
.replace(activeNotification, newActiveNotification)
val newNotificationData = notificationData.copy(
- activeNotifications = newActiveNotifications
+ activeNotifications = newActiveNotifications,
)
notificationDataMap[account.uuid] = newNotificationData
@@ -67,7 +67,7 @@ internal class NotificationDataStore {
.replace(inactiveNotification, newInactiveNotification)
val newNotificationData = notificationData.copy(
- inactiveNotifications = newInactiveNotifications
+ inactiveNotifications = newInactiveNotifications,
)
notificationDataMap[account.uuid] = newNotificationData
@@ -81,12 +81,12 @@ internal class NotificationDataStore {
val operations = listOf(
NotificationStoreOperation.ChangeToInactive(lastNotificationHolder.content.messageReference),
- NotificationStoreOperation.Add(messageReference, notificationId, timestamp)
+ NotificationStoreOperation.Add(messageReference, notificationId, timestamp),
)
val newNotificationData = notificationData.copy(
activeNotifications = listOf(notificationHolder) + notificationData.activeNotifications.dropLast(1),
- inactiveNotifications = listOf(inactiveNotificationHolder) + notificationData.inactiveNotifications
+ inactiveNotifications = listOf(inactiveNotificationHolder) + notificationData.inactiveNotifications,
)
notificationDataMap[account.uuid] = newNotificationData
@@ -96,11 +96,11 @@ internal class NotificationDataStore {
val notificationHolder = NotificationHolder(notificationId, timestamp, content)
val operations = listOf(
- NotificationStoreOperation.Add(messageReference, notificationId, timestamp)
+ NotificationStoreOperation.Add(messageReference, notificationId, timestamp),
)
val newNotificationData = notificationData.copy(
- activeNotifications = listOf(notificationHolder) + notificationData.activeNotifications
+ activeNotifications = listOf(notificationHolder) + notificationData.activeNotifications,
)
notificationDataMap[account.uuid] = newNotificationData
@@ -111,7 +111,7 @@ internal class NotificationDataStore {
@Synchronized
fun removeNotifications(
account: Account,
- selector: (List) -> List
+ selector: (List) -> List,
): RemoveNotificationsResult? {
var notificationData = getNotificationData(account)
if (notificationData.isEmpty()) return null
@@ -140,7 +140,7 @@ internal class NotificationDataStore {
val removeMessageReferenceSet = removeInactiveMessageReferences.toSet()
notificationData = notificationData.copy(
inactiveNotifications = notificationData.inactiveNotifications
- .filter { it.content.messageReference !in removeMessageReferenceSet }
+ .filter { it.content.messageReference !in removeMessageReferenceSet },
)
}
@@ -160,14 +160,14 @@ internal class NotificationDataStore {
operations.add(
NotificationStoreOperation.ChangeToActive(
newNotificationHolder.content.messageReference,
- newNotificationHolder.notificationId
- )
+ newNotificationHolder.notificationId,
+ ),
)
notificationData = notificationData.copy(
activeNotifications = notificationData.activeNotifications - notificationHolder +
newNotificationHolder,
- inactiveNotifications = notificationData.inactiveNotifications.drop(1)
+ inactiveNotifications = notificationData.inactiveNotifications.drop(1),
)
} else {
cancelNotificationIds.add(notificationHolder.notificationId)
@@ -175,7 +175,7 @@ internal class NotificationDataStore {
operations.add(NotificationStoreOperation.Remove(messageReference))
notificationData = notificationData.copy(
- activeNotifications = notificationData.activeNotifications - notificationHolder
+ activeNotifications = notificationData.activeNotifications - notificationHolder,
)
}
}
@@ -189,7 +189,7 @@ internal class NotificationDataStore {
notificationData = notificationData,
notificationStoreOperations = operations,
notificationHolders = newNotificationHolders,
- cancelNotificationIds = cancelNotificationIds
+ cancelNotificationIds = cancelNotificationIds,
)
}
}
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt
index eef470e8d9f58cec97b107a34296974a9dde79c9..a6075a51c1a51020cf5b2fe0b2ba8cedcb55beda 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt
@@ -19,7 +19,7 @@ class NotificationHelper(
private val context: Context,
private val notificationManager: NotificationManagerCompat,
private val notificationChannelManager: NotificationChannelManager,
- private val resourceProvider: NotificationResourceProvider
+ private val resourceProvider: NotificationResourceProvider,
) {
fun getContext(): Context {
return context
@@ -101,14 +101,14 @@ internal fun NotificationCompat.Builder.setErrorAppearance(): NotificationCompat
setLights(
NotificationHelper.NOTIFICATION_LED_FAILURE_COLOR,
NotificationHelper.NOTIFICATION_LED_FAST_ON_TIME,
- NotificationHelper.NOTIFICATION_LED_FAST_OFF_TIME
+ NotificationHelper.NOTIFICATION_LED_FAST_OFF_TIME,
)
}
}
internal fun NotificationCompat.Builder.setAppearance(
silent: Boolean,
- appearance: NotificationAppearance
+ appearance: NotificationAppearance,
): NotificationCompat.Builder = apply {
if (silent) {
setSilent(true)
@@ -125,7 +125,7 @@ internal fun NotificationCompat.Builder.setAppearance(
setLights(
appearance.ledColor,
NotificationHelper.NOTIFICATION_LED_ON_TIME,
- NotificationHelper.NOTIFICATION_LED_OFF_TIME
+ NotificationHelper.NOTIFICATION_LED_OFF_TIME,
)
}
}
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt
index 73a3647a18cbb1c7ff27286fad062e066c44cc19..7a942241a73e909ec2cd42f9872b66cb6cf51670 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt
@@ -3,10 +3,10 @@ package com.fsck.k9.notification
internal data class NotificationHolder(
val notificationId: Int,
val timestamp: Long,
- val content: NotificationContent
+ val content: NotificationContent,
)
internal data class InactiveNotificationHolder(
val timestamp: Long,
- val content: NotificationContent
+ val content: NotificationContent,
)
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt
index 05d26a6a369ca085dcc7609053863cd8aa749964..f95b0f41ec81aff5a0f8074bc992d8180b706ccc 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt
@@ -9,7 +9,7 @@ internal class NotificationRepository(
private val notificationStoreProvider: NotificationStoreProvider,
private val localStoreProvider: LocalStoreProvider,
private val messageStoreManager: MessageStoreManager,
- private val notificationContentCreator: NotificationContentCreator
+ private val notificationContentCreator: NotificationContentCreator,
) {
private val notificationDataStore = NotificationDataStore()
@@ -36,7 +36,7 @@ internal class NotificationRepository(
val notificationData = notificationDataStore.initializeAccount(
account,
activeNotifications,
- inactiveNotifications
+ inactiveNotifications,
)
return if (notificationData.activeNotifications.isNotEmpty()) notificationData else null
@@ -50,7 +50,7 @@ internal class NotificationRepository(
persistNotificationDataStoreChanges(
account = account,
operations = result.notificationStoreOperations,
- updateNewMessageState = true
+ updateNewMessageState = true,
)
}
}
@@ -59,7 +59,7 @@ internal class NotificationRepository(
fun removeNotifications(
account: Account,
clearNewMessageState: Boolean = true,
- selector: (List) -> List
+ selector: (List) -> List,
): RemoveNotificationsResult? {
restoreNotifications(account)
@@ -67,7 +67,7 @@ internal class NotificationRepository(
persistNotificationDataStoreChanges(
account = account,
operations = result.notificationStoreOperations,
- updateNewMessageState = clearNewMessageState
+ updateNewMessageState = clearNewMessageState,
)
}
}
@@ -85,7 +85,7 @@ internal class NotificationRepository(
private fun persistNotificationDataStoreChanges(
account: Account,
operations: List,
- updateNewMessageState: Boolean
+ updateNewMessageState: Boolean,
) {
val notificationStore = notificationStoreProvider.getNotificationStore(account)
notificationStore.persistNotificationChanges(operations)
@@ -105,7 +105,7 @@ internal class NotificationRepository(
messageStore.setNewMessageState(
folderId = messageReference.folderId,
messageServerId = messageReference.uid,
- newMessage = true
+ newMessage = true,
)
}
is NotificationStoreOperation.Remove -> {
@@ -113,7 +113,7 @@ internal class NotificationRepository(
messageStore.setNewMessageState(
folderId = messageReference.folderId,
messageServerId = messageReference.uid,
- newMessage = false
+ newMessage = false,
)
}
else -> Unit
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt
index 00ea6e8da528cb3535119b88e624e8db0e5cfdf3..6c4d34d3bd8b2406c6316ce096f047e03b23eed6 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt
@@ -11,7 +11,7 @@ import com.fsck.k9.Preferences
class NotificationSettingsUpdater(
private val preferences: Preferences,
private val notificationChannelManager: NotificationChannelManager,
- private val notificationConfigurationConverter: NotificationConfigurationConverter
+ private val notificationConfigurationConverter: NotificationConfigurationConverter,
) {
fun updateNotificationSettings(accountUuids: Collection) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt
index c03620fba3df31cd01837b0ab59fb938bdb3db74..859187dafd6911fee764747f15389fe9adb68c9f 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt
@@ -6,7 +6,7 @@ sealed interface NotificationStoreOperation {
data class Add(
val messageReference: MessageReference,
val notificationId: Int,
- val timestamp: Long
+ val timestamp: Long,
) : NotificationStoreOperation
data class Remove(val messageReference: MessageReference) : NotificationStoreOperation
@@ -15,6 +15,6 @@ sealed interface NotificationStoreOperation {
data class ChangeToActive(
val messageReference: MessageReference,
- val notificationId: Int
+ val notificationId: Int,
) : NotificationStoreOperation
}
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt
index a6fb5ed6400efe4a48338d8187e0d7cdae956705..a124178a37cc4d70e5d9a8241cc9f4b5ce5b154b 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt
@@ -10,6 +10,6 @@ interface NotificationStrategy {
account: Account,
localFolder: LocalFolder,
message: LocalMessage,
- isOldMessage: Boolean
+ isOldMessage: Boolean,
): Boolean
}
diff --git a/app/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt b/app/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt
index fbce51ac4f21f685b380f9e23800a1f8d31cf668..707eaf37e12a6b0f3cd38fc90ed9cba5869740dc 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt
@@ -15,7 +15,7 @@ internal class PushNotificationManager(
private val context: Context,
private val resourceProvider: CoreResourceProvider,
private val notificationChannelManager: NotificationChannelManager,
- private val notificationManager: NotificationManagerCompat
+ private val notificationManager: NotificationManagerCompat,
) {
val notificationId = NotificationIds.PUSH_NOTIFICATION_ID
@@ -77,5 +77,5 @@ enum class PushNotificationState {
INITIALIZING,
LISTENING,
WAIT_BACKGROUND_SYNC,
- WAIT_NETWORK
+ WAIT_NETWORK,
}
diff --git a/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt b/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt
index f3c2d44bffafb34c002104ece3a081cb9bf9a050..fc5382c428081875dbf1e95694646cb53f6ce6b5 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt
@@ -4,5 +4,5 @@ internal data class RemoveNotificationsResult(
val notificationData: NotificationData,
val notificationStoreOperations: List,
val notificationHolders: List,
- val cancelNotificationIds: List
+ val cancelNotificationIds: List,
)
diff --git a/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt
index 2f82eabe1163c1d9b89439f9a8ccdfd03effbc9e..fe3baa181d2d7b9d6b6e41a14534d777f24b737d 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.helper.ExceptionHelper
internal class SendFailedNotificationController(
private val notificationHelper: NotificationHelper,
private val actionBuilder: NotificationActionCreator,
- private val resourceProvider: NotificationResourceProvider
+ private val resourceProvider: NotificationResourceProvider,
) {
fun showSendFailedNotification(account: Account, exception: Exception) {
val title = resourceProvider.sendFailedTitle()
diff --git a/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt
index d6d5e3626a2e925fe07640fff2c4bef07d6a07f1..ecfe883124370e8a0bf87dfee782acff59bbab76 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt
@@ -10,12 +10,12 @@ internal class SingleMessageNotificationCreator(
private val notificationHelper: NotificationHelper,
private val actionCreator: NotificationActionCreator,
private val resourceProvider: NotificationResourceProvider,
- private val lockScreenNotificationCreator: LockScreenNotificationCreator
+ private val lockScreenNotificationCreator: LockScreenNotificationCreator,
) {
fun createSingleNotification(
baseNotificationData: BaseNotificationData,
singleNotificationData: SingleNotificationData,
- isGroupSummary: Boolean = false
+ isGroupSummary: Boolean = false,
) {
val account = baseNotificationData.account
val notificationId = singleNotificationData.notificationId
@@ -45,7 +45,7 @@ internal class SingleMessageNotificationCreator(
Timber.v(
"Creating single summary notification (silent=%b): %s",
singleNotificationData.isSilent,
- notification
+ notification,
)
}
notificationHelper.notify(account, notificationId, notification)
@@ -164,7 +164,7 @@ internal class SingleMessageNotificationCreator(
private fun NotificationBuilder.setLockScreenNotification(
notificationData: BaseNotificationData,
- addLockScreenNotification: Boolean
+ addLockScreenNotification: Boolean,
) = apply {
if (addLockScreenNotification) {
lockScreenNotificationCreator.configureLockScreenNotification(this, notificationData)
diff --git a/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt
index d095ef00b63958aaf099083576d2c7638b74ec35..d3bc822521a93805ccb953ba28eea94e4bc923f4 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt
@@ -10,7 +10,7 @@ internal class SingleMessageNotificationDataCreator {
notificationId: Int,
content: NotificationContent,
timestamp: Long,
- addLockScreenNotification: Boolean
+ addLockScreenNotification: Boolean,
): SingleNotificationData {
return SingleNotificationData(
notificationId = notificationId,
@@ -19,14 +19,14 @@ internal class SingleMessageNotificationDataCreator {
content = content,
actions = createSingleNotificationActions(),
wearActions = createSingleNotificationWearActions(account),
- addLockScreenNotification = addLockScreenNotification
+ addLockScreenNotification = addLockScreenNotification,
)
}
fun createSummarySingleNotificationData(
data: NotificationData,
timestamp: Long,
- silent: Boolean
+ silent: Boolean,
): SummarySingleNotificationData {
return SummarySingleNotificationData(
SingleNotificationData(
diff --git a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt
index c780415f115ee2069c9a4fd86a19895c733cc70b..4c8770d80bd6acf060de820e5b617f92ae0775d1 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt
@@ -13,11 +13,11 @@ internal class SummaryNotificationCreator(
private val actionCreator: NotificationActionCreator,
private val lockScreenNotificationCreator: LockScreenNotificationCreator,
private val singleMessageNotificationCreator: SingleMessageNotificationCreator,
- private val resourceProvider: NotificationResourceProvider
+ private val resourceProvider: NotificationResourceProvider,
) {
fun createSummaryNotification(
baseNotificationData: BaseNotificationData,
- summaryNotificationData: SummaryNotificationData
+ summaryNotificationData: SummaryNotificationData,
) {
when (summaryNotificationData) {
is SummarySingleNotificationData -> {
@@ -31,18 +31,18 @@ internal class SummaryNotificationCreator(
private fun createSingleMessageNotification(
baseNotificationData: BaseNotificationData,
- singleNotificationData: SingleNotificationData
+ singleNotificationData: SingleNotificationData,
) {
singleMessageNotificationCreator.createSingleNotification(
baseNotificationData,
singleNotificationData,
- isGroupSummary = true
+ isGroupSummary = true,
)
}
private fun createInboxStyleSummaryNotification(
baseNotificationData: BaseNotificationData,
- notificationData: SummaryInboxNotificationData
+ notificationData: SummaryInboxNotificationData,
) {
val account = baseNotificationData.account
val accountName = baseNotificationData.accountName
@@ -85,7 +85,7 @@ internal class SummaryNotificationCreator(
private fun NotificationBuilder.setInboxStyle(
title: String,
summary: String,
- contentLines: List
+ contentLines: List,
) = apply {
val style = NotificationCompat.InboxStyle()
.setBigContentTitle(title)
@@ -104,7 +104,7 @@ internal class SummaryNotificationCreator(
private fun NotificationBuilder.setDeviceActions(
account: Account,
- notificationData: SummaryInboxNotificationData
+ notificationData: SummaryInboxNotificationData,
) = apply {
for (action in notificationData.actions) {
when (action) {
@@ -116,7 +116,7 @@ internal class SummaryNotificationCreator(
private fun NotificationBuilder.addMarkAllAsReadAction(
account: Account,
- notificationData: SummaryInboxNotificationData
+ notificationData: SummaryInboxNotificationData,
) {
val icon = resourceProvider.iconMarkAsRead
val title = resourceProvider.actionMarkAsRead()
@@ -128,7 +128,7 @@ internal class SummaryNotificationCreator(
private fun NotificationBuilder.addDeleteAllAction(
account: Account,
- notificationData: SummaryInboxNotificationData
+ notificationData: SummaryInboxNotificationData,
) {
val icon = resourceProvider.iconDelete
val title = resourceProvider.actionDelete()
@@ -140,7 +140,7 @@ internal class SummaryNotificationCreator(
private fun NotificationBuilder.setWearActions(
account: Account,
- notificationData: SummaryInboxNotificationData
+ notificationData: SummaryInboxNotificationData,
) = apply {
val wearableExtender = WearableExtender().apply {
for (action in notificationData.wearActions) {
@@ -157,7 +157,7 @@ internal class SummaryNotificationCreator(
private fun WearableExtender.addMarkAllAsReadAction(
account: Account,
- notificationData: SummaryInboxNotificationData
+ notificationData: SummaryInboxNotificationData,
) {
val icon = resourceProvider.wearIconMarkAsRead
val title = resourceProvider.actionMarkAllAsRead()
diff --git a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt
index 6decadf15f468ea72143216274497d1991ab397f..ae637ef1906b7dbd96e7073646aa85fd4c9517bd 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt
@@ -6,7 +6,7 @@ import com.fsck.k9.K9
private const val MAX_NUMBER_OF_MESSAGES_FOR_SUMMARY_NOTIFICATION = 5
internal class SummaryNotificationDataCreator(
- private val singleMessageNotificationDataCreator: SingleMessageNotificationDataCreator
+ private val singleMessageNotificationDataCreator: SingleMessageNotificationDataCreator,
) {
fun createSummaryNotificationData(data: NotificationData, silent: Boolean): SummaryNotificationData {
val timestamp = data.latestTimestamp
@@ -21,7 +21,7 @@ internal class SummaryNotificationDataCreator(
private fun createSummarySingleNotificationData(
data: NotificationData,
timestamp: Long,
- silent: Boolean
+ silent: Boolean,
): SummaryNotificationData {
return singleMessageNotificationDataCreator.createSummarySingleNotificationData(data, timestamp, silent)
}
@@ -29,7 +29,7 @@ internal class SummaryNotificationDataCreator(
private fun createSummaryInboxNotificationData(
data: NotificationData,
timestamp: Long,
- silent: Boolean
+ silent: Boolean,
): SummaryNotificationData {
return SummaryInboxNotificationData(
notificationId = NotificationIds.getNewMailSummaryNotificationId(data.account),
@@ -37,9 +37,9 @@ internal class SummaryNotificationDataCreator(
timestamp = timestamp,
content = data.summaryContent,
additionalMessagesCount = data.additionalMessagesCount,
- messageReferences = data.messageReferences,
+ messageReferences = data.activeMessageReferences,
actions = createSummaryNotificationActions(),
- wearActions = createSummaryWearNotificationActions(data.account)
+ wearActions = createSummaryWearNotificationActions(data.account),
)
}
diff --git a/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt
index 441d5698337633abfc980a5184bd24845b9c0624..94bb4e4b16f71864a50baf769f55a986b17192c4 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.mailstore.LocalFolder
internal class SyncNotificationController(
private val notificationHelper: NotificationHelper,
private val actionBuilder: NotificationActionCreator,
- private val resourceProvider: NotificationResourceProvider
+ private val resourceProvider: NotificationResourceProvider,
) {
fun showSendingNotification(account: Account) {
val accountName = account.displayName
diff --git a/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfiguration.kt b/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfiguration.kt
index d3a11ed18c75f5faf31c2947e01ae9b382c0e4b5..dd43a605738e71e7ed861b49002c9120c455805f 100644
--- a/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfiguration.kt
+++ b/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfiguration.kt
@@ -5,5 +5,5 @@ data class OAuthConfiguration(
val scopes: List,
val authorizationEndpoint: String,
val tokenEndpoint: String,
- val redirectUri: String
+ val redirectUri: String,
)
diff --git a/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfigurationProvider.kt b/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfigurationProvider.kt
index f2b8b31897ee60e647672d9ad1ed629846c9cbd4..b9cd706090dc8ec0e703ac9895673195d50680c7 100644
--- a/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfigurationProvider.kt
+++ b/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfigurationProvider.kt
@@ -2,7 +2,7 @@ package com.fsck.k9.oauth
class OAuthConfigurationProvider(
private val configurations: Map, OAuthConfiguration>,
- private val googleConfiguration: OAuthConfiguration
+ private val googleConfiguration: OAuthConfiguration,
) {
private val hostnameMapping: Map = buildMap {
for ((hostnames, configuration) in configurations) {
diff --git a/app/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt b/app/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt
index fbf30c048d2b0b3ce931e008eeabe8158e8ab951..e802d52b3ab46752e692e68ab4564af1bf969fb2 100644
--- a/app/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt
@@ -70,7 +70,10 @@ internal class AndroidPowerManager(private val systemPowerManager: SystemPowerMa
Timber.v(
"AndroidWakeLock for tag %s / id %d: releasing after %d ms, timeout = %d ms",
- tag, id, endTime - startTime, timeout
+ tag,
+ id,
+ endTime - startTime,
+ timeout,
)
} else {
Timber.v("AndroidWakeLock for tag %s / id %d, timeout = %d ms: releasing", tag, id, timeout)
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java b/app/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java
index 1971a5f63c0046d8b11fe5e9199c3d0a13263ab5..58675c098a0c241864d8381a6852608eb9c8c9be 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java
+++ b/app/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java
@@ -276,6 +276,9 @@ public class AccountSettingsDescriptions {
s.put("useCompression", Settings.versions(
new V(81, new BooleanSetting(true))
));
+ s.put("sendClientId", Settings.versions(
+ new V(88, new BooleanSetting(true))
+ ));
// note that there is no setting for openPgpProvider, because this will have to be set up together
// with the actual provider after import anyways.
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt b/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt
index 559a4ceb06453c1c6e1824a061c83c0861e83349..a87043eff75687570039e57544b877ddd7750491 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt
+++ b/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt
@@ -36,7 +36,7 @@ class FolderSettingsProvider(private val folderRepository: FolderRepository) {
syncClass,
displayClass,
notifyClass,
- pushClass
+ pushClass,
)
}
}
@@ -48,5 +48,5 @@ data class FolderSettings(
val syncClass: FolderClass,
val displayClass: FolderClass,
val notifyClass: FolderClass,
- val pushClass: FolderClass
+ val pushClass: FolderClass,
)
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt b/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt
index 337d8bc21299b9b34215e04eacb7f10565933a47..e0a1cb1be0e522eae7c6bed3ef85309fff90827c 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt
+++ b/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt
@@ -23,17 +23,17 @@ data class GeneralSettings(
enum class BackgroundSync {
ALWAYS,
NEVER,
- FOLLOW_SYSTEM_AUTO_SYNC
+ FOLLOW_SYSTEM_AUTO_SYNC,
}
enum class AppTheme {
LIGHT,
DARK,
- FOLLOW_SYSTEM
+ FOLLOW_SYSTEM,
}
enum class SubTheme {
LIGHT,
DARK,
- USE_GLOBAL
+ USE_GLOBAL,
}
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java b/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java
index c1e9c1ac19eb79a8c013e6144b324034f9097ea1..1f2fb45007cf0d8eb26d21c5d2d58b316b06cf81 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java
+++ b/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java
@@ -20,6 +20,7 @@ import com.fsck.k9.K9.BACKGROUND_OPS;
import com.fsck.k9.K9.NotificationQuickDelete;
import com.fsck.k9.K9.SplitViewMode;
import com.fsck.k9.SwipeAction;
+import com.fsck.k9.UiDensity;
import com.fsck.k9.core.R;
import com.fsck.k9.preferences.Settings.BooleanSetting;
import com.fsck.k9.preferences.Settings.ColorSetting;
@@ -278,6 +279,12 @@ public class GeneralSettingsDescriptions {
new V(85, new BooleanSetting(true))
));
+ s.put("messageListDensity", Settings.versions(
+ new V(86, new EnumSetting(UiDensity.class, UiDensity.Default))
+ ));
+ s.put("fontSizeMessageViewAccountName", Settings.versions(
+ new V(87, new FontSizeSetting(FontSizes.FONT_DEFAULT))
+ ));
SETTINGS = Collections.unmodifiableMap(s);
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt b/app/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt
index 0d92a2ad2c2491c9e45156bc512487e405f53f16..344d288059bbc383ea259f840998e7ec744577e0 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt
+++ b/app/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt
@@ -12,7 +12,7 @@ val preferencesModule = module {
preferences = get(),
folderSettingsProvider = get(),
folderRepository = get(),
- notificationSettingsUpdater = get()
+ notificationSettingsUpdater = get(),
)
}
factory { FolderSettingsProvider(folderRepository = get()) }
@@ -20,7 +20,7 @@ val preferencesModule = module {
single {
RealGeneralSettingsManager(
preferences = get(),
- coroutineScope = get(named("AppCoroutineScope"))
+ coroutineScope = get(named("AppCoroutineScope")),
)
} bind GeneralSettingsManager::class
}
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/Protocols.kt b/app/core/src/main/java/com/fsck/k9/preferences/Protocols.kt
index ae7d1a14cefa2aa6cc02d5a1a161f8085af52b91..51f20970f3bf78f1c710b2b7b88f29b46c17b2a3 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/Protocols.kt
+++ b/app/core/src/main/java/com/fsck/k9/preferences/Protocols.kt
@@ -3,6 +3,5 @@ package com.fsck.k9.preferences
object Protocols {
const val IMAP = "imap"
const val POP3 = "pop3"
- const val WEBDAV = "webdav"
const val SMTP = "smtp"
}
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt b/app/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt
index a9fea78001e4e2c0fd8d1e0f6085ad366512a60a..b9a2ae8c3cb865c7ae8b9cb9102960b6e4e91161 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt
@@ -25,7 +25,7 @@ import timber.log.Timber
internal class RealGeneralSettingsManager(
private val preferences: Preferences,
private val coroutineScope: CoroutineScope,
- private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO
+ private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO,
) : GeneralSettingsManager {
private val settingsFlow = MutableSharedFlow(replay = 1)
private var generalSettings: GeneralSettings? = null
@@ -71,7 +71,7 @@ internal class RealGeneralSettingsManager(
@Synchronized
private fun updateGeneralSettingsWithStateFromK9(): GeneralSettings {
return getSettings().copy(
- backgroundSync = K9.backgroundOps.toBackgroundSync()
+ backgroundSync = K9.backgroundOps.toBackgroundSync(),
).also { generalSettings ->
this.generalSettings = generalSettings
}
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/ServerTypeConverter.kt b/app/core/src/main/java/com/fsck/k9/preferences/ServerTypeConverter.kt
index 9d64def8b3dbe7be3f969c19572faa67accc43d6..9889649030ba31783f0e8ad7e242a8f2665c9baa 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/ServerTypeConverter.kt
+++ b/app/core/src/main/java/com/fsck/k9/preferences/ServerTypeConverter.kt
@@ -8,7 +8,6 @@ object ServerTypeConverter {
fun fromServerSettingsType(serverSettingsType: String): String = when (serverSettingsType) {
Protocols.IMAP -> "IMAP"
Protocols.POP3 -> "POP3"
- Protocols.WEBDAV -> "WebDAV"
Protocols.SMTP -> "SMTP"
else -> throw AssertionError("Unsupported type: $serverSettingsType")
}
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/Settings.java b/app/core/src/main/java/com/fsck/k9/preferences/Settings.java
index 7f1274952bc118327fedcc9f8a6e1f1ad3d4f279..1aa80b3a590537511aaf36c772e787649d18f009 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/Settings.java
+++ b/app/core/src/main/java/com/fsck/k9/preferences/Settings.java
@@ -36,7 +36,7 @@ public class Settings {
*
* @see SettingsExporter
*/
- public static final int VERSION = 85;
+ public static final int VERSION = 88;
static Map validate(int version, Map> settings,
Map importedSettings, boolean useDefaultValues) {
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt b/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt
index b7cd41f00f41cbf80468de41e19e1c4512a8c13a..2f32b1885455f86cbdaa4619ba4debccc964695a 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt
+++ b/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt
@@ -26,7 +26,7 @@ class SettingsExporter(
private val preferences: Preferences,
private val folderSettingsProvider: FolderSettingsProvider,
private val folderRepository: FolderRepository,
- private val notificationSettingsUpdater: NotificationSettingsUpdater
+ private val notificationSettingsUpdater: NotificationSettingsUpdater,
) {
@Throws(SettingsImportExportException::class)
fun exportToUri(includeGlobals: Boolean, accountUuids: Set, uri: Uri) {
@@ -105,7 +105,8 @@ class SettingsExporter(
} catch (e: InvalidSettingValueException) {
Timber.w(
"Global setting \"%s\" has invalid value \"%s\" in preference storage. This shouldn't happen!",
- key, valueString
+ key,
+ valueString,
)
}
} else {
@@ -256,7 +257,7 @@ class SettingsExporter(
serializer: XmlSerializer,
keyPart: String,
valueString: String,
- account: Account
+ account: Account,
) {
val versionedSetting = AccountSettingsDescriptions.SETTINGS[keyPart]
if (versionedSetting != null) {
@@ -271,7 +272,9 @@ class SettingsExporter(
Timber.w(
"Account setting \"%s\" (%s) has invalid value \"%s\" in preference storage. " +
"This shouldn't happen!",
- keyPart, account, valueString
+ keyPart,
+ account,
+ valueString,
)
}
}
@@ -281,13 +284,13 @@ class SettingsExporter(
private fun writeFolderNameSettings(
account: Account,
folderRepository: FolderRepository,
- serializer: XmlSerializer
+ serializer: XmlSerializer,
) {
fun writeFolderNameSetting(
key: String,
folderId: Long?,
importedFolderServerId: String?,
- writeEmptyValue: Boolean = false
+ writeEmptyValue: Boolean = false,
) {
val folderServerId = folderId?.let {
folderRepository.getFolderServerId(account, folderId)
@@ -304,7 +307,7 @@ class SettingsExporter(
"autoExpandFolderName",
account.autoExpandFolderId,
account.importedAutoExpandFolder,
- writeEmptyValue = true
+ writeEmptyValue = true,
)
writeFolderNameSetting("archiveFolderName", account.archiveFolderId, account.importedArchiveFolder)
writeFolderNameSetting("draftsFolderName", account.draftsFolderId, account.importedDraftsFolder)
@@ -317,7 +320,7 @@ class SettingsExporter(
serializer: XmlSerializer,
accountUuid: String,
identity: String,
- prefs: Map
+ prefs: Map,
) {
serializer.startTag(null, IDENTITY_ELEMENT)
@@ -330,9 +333,11 @@ class SettingsExporter(
name = prefs[prefix + IDENTITY_EMAIL_KEY + suffix] as String?
}
- serializer.startTag(null, NAME_ELEMENT)
- serializer.text(name)
- serializer.endTag(null, NAME_ELEMENT)
+ if (name != null) {
+ serializer.startTag(null, NAME_ELEMENT)
+ serializer.text(name)
+ serializer.endTag(null, NAME_ELEMENT)
+ }
// Write email address belonging to the identity
val email = prefs[prefix + IDENTITY_EMAIL_KEY + suffix] as String?
@@ -379,7 +384,8 @@ class SettingsExporter(
Timber.w(
"Identity setting \"%s\" has invalid value \"%s\" in preference storage. " +
"This shouldn't happen!",
- identityKey, valueString
+ identityKey,
+ valueString,
)
}
}
@@ -417,7 +423,8 @@ class SettingsExporter(
} catch (e: InvalidSettingValueException) {
Timber.w(
"Folder setting \"%s\" has invalid value \"%s\" in preference storage. This shouldn't happen!",
- key, value
+ key,
+ value,
)
}
}
@@ -436,7 +443,7 @@ class SettingsExporter(
serializer: XmlSerializer,
key: String,
setting: SettingsDescription,
- valueString: String
+ valueString: String,
) {
val value = setting.fromString(valueString)
val outputValue = setting.toPrettyString(value)
@@ -446,7 +453,7 @@ class SettingsExporter(
private fun writeKeyAndDefaultValueFromSetting(
serializer: XmlSerializer,
key: String,
- setting: SettingsDescription
+ setting: SettingsDescription,
) {
val value = setting.getDefaultValue()
val outputValue = setting.toPrettyString(value)
@@ -517,7 +524,7 @@ class SettingsExporter(
"draftsFolderName",
"sentFolderName",
"spamFolderName",
- "trashFolderName"
+ "trashFolderName",
)
}
}
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.java b/app/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.java
index e00d161ddee968a337a130fb155688102882ffad..88e4a5a298dca3037ca25889dcb6dfd370495ed4 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.java
+++ b/app/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.java
@@ -18,7 +18,6 @@ import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import com.fsck.k9.Account;
import com.fsck.k9.AccountPreferenceSerializer;
-import com.fsck.k9.Clock;
import com.fsck.k9.Core;
import com.fsck.k9.DI;
import com.fsck.k9.Identity;
@@ -30,6 +29,7 @@ import com.fsck.k9.mail.ConnectionSecurity;
import com.fsck.k9.mail.ServerSettings;
import com.fsck.k9.mailstore.SpecialLocalFoldersCreator;
import com.fsck.k9.preferences.Settings.InvalidSettingValueException;
+import kotlinx.datetime.Clock;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory;
@@ -379,37 +379,30 @@ public class SettingsImporter {
boolean authorizationNeeded = incoming.authenticationType == AuthType.XOAUTH2;
- String incomingServerType = ServerTypeConverter.toServerSettingsType(account.incoming.type);
- if (account.outgoing == null && !incomingServerType.equals(Protocols.WEBDAV)) {
- // All account types except WebDAV need to provide outgoing server settings
+ if (account.outgoing == null) {
throw new InvalidSettingValueException();
}
String outgoingServerName = null;
boolean outgoingPasswordNeeded = false;
- if (account.outgoing != null) {
- // Write outgoing server settings
- ServerSettings outgoing = createServerSettings(account.outgoing);
- String outgoingServer = serverSettingsSerializer.serialize(outgoing);
- putString(editor, accountKeyPrefix + AccountPreferenceSerializer.OUTGOING_SERVER_SETTINGS_KEY, outgoingServer);
-
- /*
- * Mark account as disabled if the settings file contained a username but no password. However, no password
- * is required for the outgoing server for WebDAV accounts, because incoming and outgoing servers are
- * identical for this account type. Nor is a password required if the AuthType is EXTERNAL.
- */
- String outgoingServerType = ServerTypeConverter.toServerSettingsType(outgoing.type);
- outgoingPasswordNeeded = AuthType.EXTERNAL != outgoing.authenticationType &&
- AuthType.XOAUTH2 != outgoing.authenticationType &&
- !outgoingServerType.equals(Protocols.WEBDAV) &&
- outgoing.username != null &&
- !outgoing.username.isEmpty() &&
- (outgoing.password == null || outgoing.password.isEmpty());
+ // Write outgoing server settings
+ ServerSettings outgoing = createServerSettings(account.outgoing);
+ String outgoingServer = serverSettingsSerializer.serialize(outgoing);
+ putString(editor, accountKeyPrefix + AccountPreferenceSerializer.OUTGOING_SERVER_SETTINGS_KEY, outgoingServer);
+
+ /*
+ * Mark account as disabled if the settings file contained a username but no password, except when the
+ * AuthType is EXTERNAL.
+ */
+ outgoingPasswordNeeded = AuthType.EXTERNAL != outgoing.authenticationType &&
+ AuthType.XOAUTH2 != outgoing.authenticationType &&
+ outgoing.username != null &&
+ !outgoing.username.isEmpty() &&
+ (outgoing.password == null || outgoing.password.isEmpty());
- authorizationNeeded |= outgoing.authenticationType == AuthType.XOAUTH2;
+ authorizationNeeded |= outgoing.authenticationType == AuthType.XOAUTH2;
- outgoingServerName = outgoing.host;
- }
+ outgoingServerName = outgoing.host;
boolean createAccountDisabled = incomingPasswordNeeded || outgoingPasswordNeeded || authorizationNeeded;
if (createAccountDisabled) {
@@ -469,7 +462,7 @@ public class SettingsImporter {
// To avoid reusing a previously existing notification channel ID, we need to make sure to use a unique value
// for `messagesNotificationChannelVersion`.
Clock clock = DI.get(Clock.class);
- String messageNotificationChannelVersion = Long.toString(clock.getTime() / 1000);
+ String messageNotificationChannelVersion = Long.toString(clock.now().getEpochSeconds());
putString(editor, accountKeyPrefix + "messagesNotificationChannelVersion", messageNotificationChannelVersion);
AccountDescription imported = new AccountDescription(accountName, uuid);
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/StorageEditor.kt b/app/core/src/main/java/com/fsck/k9/preferences/StorageEditor.kt
index 0fc600e1c3548b1ecbfc168ccb0d4eb1aed64ce2..8ded8208724f220c72084d324950f722febc3a45 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/StorageEditor.kt
+++ b/app/core/src/main/java/com/fsck/k9/preferences/StorageEditor.kt
@@ -1,10 +1,6 @@
package com.fsck.k9.preferences
-import android.content.SharedPreferences
-
interface StorageEditor {
- fun copy(input: SharedPreferences)
-
fun putBoolean(key: String, value: Boolean): StorageEditor
fun putInt(key: String, value: Int): StorageEditor
fun putLong(key: String, value: Long): StorageEditor
diff --git a/app/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt b/app/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt
index 51e80f8d95173fd66bf6191510d6d6bd8d20b979..599f5320a75998eb3743cd48a40af6c0c29acc0b 100644
--- a/app/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt
+++ b/app/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt
@@ -25,7 +25,9 @@ fun LocalSearch.limitToDisplayableFolders(account: Account) {
// TODO: Create a proper interface for creating arbitrary condition trees
val searchCondition = SearchCondition(
- SearchField.DISPLAY_CLASS, Attribute.EQUALS, FolderClass.SECOND_CLASS.name
+ SearchField.DISPLAY_CLASS,
+ Attribute.EQUALS,
+ FolderClass.SECOND_CLASS.name,
)
val root = conditions
if (root.mRight != null) {
diff --git a/app/core/src/main/java/com/fsck/k9/search/LocalSearch.java b/app/core/src/main/java/com/fsck/k9/search/LocalSearch.java
index 52be56ade78fc83dff1a0a84dbfc0900f7f77c7d..253104127fe6893f64c002d23473a179e862deb0 100644
--- a/app/core/src/main/java/com/fsck/k9/search/LocalSearch.java
+++ b/app/core/src/main/java/com/fsck/k9/search/LocalSearch.java
@@ -355,6 +355,8 @@ public class LocalSearch implements SearchSpecification {
mManualSearch = (in.readByte() == 1);
mAccountUuids.addAll(in.createStringArrayList());
mConditions = in.readParcelable(LocalSearch.class.getClassLoader());
- mLeafSet = (mConditions == null) ? null : mConditions.getLeafSet();
+ if (mConditions != null) {
+ mLeafSet = mConditions.getLeafSet();
+ }
}
}
diff --git a/app/core/src/main/java/com/fsck/k9/search/SearchAccount.kt b/app/core/src/main/java/com/fsck/k9/search/SearchAccount.kt
index 68a7abea6f43de5b7171f8b8f7d1887cbd6ef1c4..b7ece5240b72200f8331ff87ae04506eda7de171 100644
--- a/app/core/src/main/java/com/fsck/k9/search/SearchAccount.kt
+++ b/app/core/src/main/java/com/fsck/k9/search/SearchAccount.kt
@@ -14,7 +14,7 @@ class SearchAccount(
val id: String,
search: LocalSearch,
override val name: String,
- override val email: String
+ override val email: String,
) : BaseAccount {
/**
* Returns the ID of this `SearchAccount` instance.
@@ -46,7 +46,7 @@ class SearchAccount(
id = UNIFIED_INBOX,
search = tmpSearch,
name = resourceProvider.searchUnifiedInboxTitle(),
- email = resourceProvider.searchUnifiedInboxDetail()
+ email = resourceProvider.searchUnifiedInboxDetail(),
)
}
}
diff --git a/app/core/src/main/java/com/fsck/k9/setup/ServerNameSuggester.kt b/app/core/src/main/java/com/fsck/k9/setup/ServerNameSuggester.kt
index 376b73cb8febd9c44f2410f2d7eb60d711133022..1731aa4d9be3d11b06becf9742fb445d34ea8af1 100644
--- a/app/core/src/main/java/com/fsck/k9/setup/ServerNameSuggester.kt
+++ b/app/core/src/main/java/com/fsck/k9/setup/ServerNameSuggester.kt
@@ -6,7 +6,6 @@ class ServerNameSuggester {
fun suggestServerName(serverType: String, domainPart: String): String = when (serverType) {
Protocols.IMAP -> "imap.$domainPart"
Protocols.SMTP -> "smtp.$domainPart"
- Protocols.WEBDAV -> "exchange.$domainPart"
Protocols.POP3 -> "pop3.$domainPart"
else -> throw AssertionError("Missed case: $serverType")
}
diff --git a/app/core/src/test/java/com/fsck/k9/QuietTimeCheckerTest.kt b/app/core/src/test/java/com/fsck/k9/QuietTimeCheckerTest.kt
index 19c67aced53a62d8751f454dc1f8fdf56f284978..854f3dc2f8a5019a8e994b5f4f0b1ae8093987b0 100644
--- a/app/core/src/test/java/com/fsck/k9/QuietTimeCheckerTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/QuietTimeCheckerTest.kt
@@ -1,6 +1,8 @@
package com.fsck.k9
+import app.k9mail.core.testing.TestClock
import java.util.Calendar
+import kotlinx.datetime.Instant
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Test
@@ -111,6 +113,6 @@ class QuietTimeCheckerTest {
calendar.set(Calendar.HOUR_OF_DAY, hourOfDay)
calendar.set(Calendar.MINUTE, minute)
- clock.time = calendar.timeInMillis
+ clock.changeTimeTo(Instant.fromEpochMilliseconds(calendar.timeInMillis))
}
}
diff --git a/app/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt b/app/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt
index 6df0efcad384f257d391af64c05ff56fceb442e7..21666945b40567bfde24ab7270a0c41f2f2df772 100644
--- a/app/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt
@@ -1,11 +1,14 @@
package com.fsck.k9
+import assertk.assertThat
+import assertk.assertions.hasMessage
+import assertk.assertions.isEqualTo
+import assertk.assertions.isFailure
+import assertk.assertions.isInstanceOf
import com.fsck.k9.mail.AuthType
import com.fsck.k9.mail.ConnectionSecurity
import com.fsck.k9.mail.ServerSettings
import com.fsck.k9.mail.store.imap.ImapStoreSettings
-import com.google.common.truth.Truth.assertThat
-import org.junit.Assert.fail
import org.junit.Test
class ServerSettingsSerializerTest {
@@ -22,7 +25,7 @@ class ServerSettingsSerializerTest {
username = "user",
password = null,
clientCertificateAlias = "alias",
- extra = ImapStoreSettings.createExtra(autoDetectNamespace = true, pathPrefix = null)
+ extra = ImapStoreSettings.createExtra(autoDetectNamespace = true, pathPrefix = null),
)
val json = serverSettingsSerializer.serialize(serverSettings)
@@ -41,7 +44,7 @@ class ServerSettingsSerializerTest {
authenticationType = AuthType.PLAIN,
username = "user",
password = "password",
- clientCertificateAlias = null
+ clientCertificateAlias = null,
)
val json = serverSettingsSerializer.serialize(serverSettings)
@@ -64,11 +67,10 @@ class ServerSettingsSerializerTest {
}
""".trimIndent()
- try {
+ assertThat {
serverSettingsSerializer.deserialize(json)
- fail("Expected exception")
- } catch (e: IllegalArgumentException) {
- assertThat(e).hasMessageThat().isEqualTo("'type' must not be missing")
- }
+ }.isFailure()
+ .isInstanceOf(IllegalArgumentException::class)
+ .hasMessage("'type' must not be missing")
}
}
diff --git a/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt b/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt
index 696547b2b51e52cf030cafe70f9c84443ad275fd..c9b12cb37a30d95616204e3052ddcf8c3da5770d 100644
--- a/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt
@@ -1,7 +1,12 @@
package com.fsck.k9.autocrypt
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isFalse
+import assertk.assertions.isNotNull
+import assertk.assertions.isNull
+import assertk.assertions.isTrue
import com.fsck.k9.RobolectricTest
-import com.google.common.truth.Truth.assertThat
import org.junit.Test
class AutocryptDraftStateHeaderParserTest : RobolectricTest() {
@@ -18,7 +23,8 @@ class AutocryptDraftStateHeaderParserTest : RobolectricTest() {
@Test
fun testSignOnly() {
- val parsedHeader = autocryptHeaderParser.parseAutocryptDraftStateHeader("encrypt=no; _by-choice=yes; _sign-only=yes")
+ val parsedHeader =
+ autocryptHeaderParser.parseAutocryptDraftStateHeader("encrypt=no; _by-choice=yes; _sign-only=yes")
with(parsedHeader!!) {
assertThat(isEncrypt).isFalse()
@@ -38,7 +44,8 @@ class AutocryptDraftStateHeaderParserTest : RobolectricTest() {
@Test
fun missingEncrypt() {
- val parsedHeader = autocryptHeaderParser.parseAutocryptDraftStateHeader("encrpt-with-typo=no; _non_critical=value")
+ val parsedHeader =
+ autocryptHeaderParser.parseAutocryptDraftStateHeader("encrpt-with-typo=no; _non_critical=value")
assertThat(parsedHeader).isNull()
}
diff --git a/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt b/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt
index f047a9df28647f09cb265515c8744bb2f903559c..40ccbf523bff4ca36332d2a83946912202196488 100644
--- a/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt
@@ -15,7 +15,7 @@ class AutocryptGossipHeaderParserTest {
mQGNBFoBt74BDAC8AMsjPY17kxodbfmHah38ZQipY0yfuo97WUBs2jeiFYlQdunPANi5VMgbAX+H
Mq1XoBRs6qW+WpX8Uj11mu22c57BTUXJRbRr4TnTuuOQmT0egwFDe3x8vHSFmcf9OzG8iKR9ftUE
+F2ewrzzmm3XY8hy7QeUgBfClZVA6A3rsX4gGawjDo6ZRBbYwckINgGX/vQk6rGs
- """.trimIndent().toByteArray()
+ """.trimIndent().toByteArray(),
)
val GOSSIP_HEADER_BOB =
@@ -75,7 +75,7 @@ class AutocryptGossipHeaderParserTest {
@Test
fun parseHeader_missingKeydata() {
val gossipHeader = autocryptGossipHeaderParser.parseAutocryptGossipHeader(
- "addr=CDEF"
+ "addr=CDEF",
)
assertNull(gossipHeader)
@@ -84,7 +84,7 @@ class AutocryptGossipHeaderParserTest {
@Test
fun parseHeader_unknownCritical() {
val gossipHeader = autocryptGossipHeaderParser.parseAutocryptGossipHeader(
- "addr=bawb; somecritical=value; keydata=aGk"
+ "addr=bawb; somecritical=value; keydata=aGk",
)
assertNull(gossipHeader)
@@ -93,7 +93,7 @@ class AutocryptGossipHeaderParserTest {
@Test
fun parseHeader_unknownNonCritical() {
val gossipHeader = autocryptGossipHeaderParser.parseAutocryptGossipHeader(
- "addr=bawb; _somenoncritical=value; keydata=aGk"
+ "addr=bawb; _somenoncritical=value; keydata=aGk",
)
assertNotNull(gossipHeader)
@@ -102,7 +102,7 @@ class AutocryptGossipHeaderParserTest {
@Test
fun parseHeader_brokenBase64() {
val gossipHeader = autocryptGossipHeaderParser.parseAutocryptGossipHeader(
- "addr=bawb; _somenoncritical=value; keydata=X"
+ "addr=bawb; _somenoncritical=value; keydata=X",
)
assertNull(gossipHeader)
diff --git a/app/core/src/test/java/com/fsck/k9/controller/DefaultMessageCountsProviderTest.kt b/app/core/src/test/java/com/fsck/k9/controller/DefaultMessageCountsProviderTest.kt
new file mode 100644
index 0000000000000000000000000000000000000000..62f0e55a3c3d759466a1107adbbccd459a06ba6d
--- /dev/null
+++ b/app/core/src/test/java/com/fsck/k9/controller/DefaultMessageCountsProviderTest.kt
@@ -0,0 +1,48 @@
+package com.fsck.k9.controller
+
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import com.fsck.k9.Account
+import com.fsck.k9.Account.FolderMode
+import com.fsck.k9.Preferences
+import com.fsck.k9.mailstore.ListenableMessageStore
+import com.fsck.k9.mailstore.MessageStoreManager
+import com.fsck.k9.search.ConditionsTreeNode
+import org.junit.Test
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+
+private const val ACCOUNT_UUID = "irrelevant"
+private const val UNREAD_COUNT = 2
+private const val STARRED_COUNT = 3
+
+class DefaultMessageCountsProviderTest {
+ private val preferences = mock()
+ private val account = Account(ACCOUNT_UUID)
+ private val messageStore = mock {
+ on { getUnreadMessageCount(anyOrNull()) } doReturn UNREAD_COUNT
+ on { getStarredMessageCount(anyOrNull()) } doReturn STARRED_COUNT
+ }
+ private val messageStoreManager = mock {
+ on { getMessageStore(account) } doReturn messageStore
+ }
+
+ private val messageCountsProvider = DefaultMessageCountsProvider(preferences, messageStoreManager)
+
+ @Test
+ fun `getMessageCounts() without any special folders and displayMode = ALL`() {
+ account.inboxFolderId = null
+ account.trashFolderId = null
+ account.draftsFolderId = null
+ account.spamFolderId = null
+ account.outboxFolderId = null
+ account.sentFolderId = null
+ account.folderDisplayMode = FolderMode.ALL
+
+ val messageCounts = messageCountsProvider.getMessageCounts(account)
+
+ assertThat(messageCounts.unread).isEqualTo(UNREAD_COUNT)
+ assertThat(messageCounts.starred).isEqualTo(STARRED_COUNT)
+ }
+}
diff --git a/app/core/src/test/java/com/fsck/k9/controller/MessageReferenceTest.kt b/app/core/src/test/java/com/fsck/k9/controller/MessageReferenceTest.kt
index 495f053c19eccce707cc5e82bb5e1ef919bc8561..12dc9d033dbf1b3e75980333c37eb868687c9493 100644
--- a/app/core/src/test/java/com/fsck/k9/controller/MessageReferenceTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/controller/MessageReferenceTest.kt
@@ -1,6 +1,9 @@
package com.fsck.k9.controller
-import com.google.common.truth.Truth.assertThat
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNull
+import assertk.assertions.isTrue
import kotlin.test.assertNotNull
import org.junit.Test
diff --git a/app/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt b/app/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt
index 20c4d2d77b8d9ee7f92571fc91c3cfcc198ab0be..b55959e849c6768c56d2beeae7fa0d4412da3a1f 100644
--- a/app/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt
@@ -10,7 +10,7 @@ class OpenPgpApiHelperTest {
fun buildUserId_withName_shouldCreateOpenPgpAccountName() {
val identity = Identity(
email = "user@domain.com",
- name = "Name"
+ name = "Name",
)
val result = OpenPgpApiHelper.buildUserId(identity)
@@ -21,7 +21,7 @@ class OpenPgpApiHelperTest {
@Test
fun buildUserId_withoutName_shouldCreateOpenPgpAccountName() {
val identity = Identity(
- email = "user@domain.com"
+ email = "user@domain.com",
)
val result = OpenPgpApiHelper.buildUserId(identity)
diff --git a/app/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt b/app/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt
index cb2867043ca218ef9973a17fd75de2b763c194e1..f6a3e0feb7023a15e8ba59f7dfed93375929301d 100644
--- a/app/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt
@@ -1,5 +1,7 @@
package com.fsck.k9.helper
+import assertk.assertThat
+import assertk.assertions.isEqualTo
import com.fsck.k9.Account
import com.fsck.k9.Identity
import com.fsck.k9.RobolectricTest
@@ -8,7 +10,6 @@ import com.fsck.k9.mail.Message
import com.fsck.k9.mail.Message.RecipientType
import com.fsck.k9.mail.internet.AddressHeaderBuilder
import com.fsck.k9.mail.internet.MimeMessage
-import com.google.common.truth.Truth.assertThat
import java.util.UUID
import org.junit.Test
@@ -22,7 +23,7 @@ class IdentityHelperTest : RobolectricTest() {
RecipientType.CC to IDENTITY_2_ADDRESS,
RecipientType.X_ORIGINAL_TO to IDENTITY_3_ADDRESS,
RecipientType.DELIVERED_TO to IDENTITY_4_ADDRESS,
- RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS
+ RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS,
)
val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message)
@@ -37,7 +38,7 @@ class IdentityHelperTest : RobolectricTest() {
RecipientType.CC to IDENTITY_2_ADDRESS,
RecipientType.X_ORIGINAL_TO to IDENTITY_3_ADDRESS,
RecipientType.DELIVERED_TO to IDENTITY_4_ADDRESS,
- RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS
+ RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS,
)
val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message)
@@ -52,7 +53,7 @@ class IdentityHelperTest : RobolectricTest() {
RecipientType.CC to "unrelated2@example.org",
RecipientType.X_ORIGINAL_TO to IDENTITY_3_ADDRESS,
RecipientType.DELIVERED_TO to IDENTITY_4_ADDRESS,
- RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS
+ RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS,
)
val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message)
@@ -67,7 +68,7 @@ class IdentityHelperTest : RobolectricTest() {
RecipientType.CC to "unrelated2@example.org",
RecipientType.X_ORIGINAL_TO to "unrelated3@example.org",
RecipientType.DELIVERED_TO to IDENTITY_4_ADDRESS,
- RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS
+ RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS,
)
val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message)
@@ -82,7 +83,7 @@ class IdentityHelperTest : RobolectricTest() {
RecipientType.CC to "unrelated2@example.org",
RecipientType.X_ORIGINAL_TO to "unrelated3@example.org",
RecipientType.DELIVERED_TO to "unrelated4@example.org",
- RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS
+ RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS,
)
val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message)
@@ -97,7 +98,7 @@ class IdentityHelperTest : RobolectricTest() {
RecipientType.CC to "unrelated2@example.org",
RecipientType.X_ORIGINAL_TO to "unrelated3@example.org",
RecipientType.DELIVERED_TO to "unrelated4@example.org",
- RecipientType.X_ENVELOPE_TO to "unrelated5@example.org"
+ RecipientType.X_ENVELOPE_TO to "unrelated5@example.org",
)
val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message)
@@ -122,14 +123,14 @@ class IdentityHelperTest : RobolectricTest() {
newIdentity("Identity 2", IDENTITY_2_ADDRESS),
newIdentity("Identity 3", IDENTITY_3_ADDRESS),
newIdentity("Identity 4", IDENTITY_4_ADDRESS),
- newIdentity("Identity 5", IDENTITY_5_ADDRESS)
- )
+ newIdentity("Identity 5", IDENTITY_5_ADDRESS),
+ ),
)
}
private fun newIdentity(name: String, email: String) = Identity(
name = name,
- email = email
+ email = email,
)
private fun messageWithRecipients(vararg recipients: Pair): Message {
diff --git a/app/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt b/app/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt
index 4c327aefe1a08526a7b914140ebdc6d7ff265203..6b8419d2511d54e5b8759b267719bd9d50c61d1f 100644
--- a/app/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt
@@ -1,9 +1,10 @@
package com.fsck.k9.helper
import androidx.core.net.toUri
+import assertk.assertThat
+import assertk.assertions.isEqualTo
import com.fsck.k9.RobolectricTest
import com.fsck.k9.mail.internet.MimeMessage
-import com.google.common.truth.Truth.assertThat
import kotlin.test.assertNull
import org.junit.Test
@@ -11,7 +12,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() {
@Test
fun `get list unsubscribe url - should accept mailto`() {
val message = buildMimeMessageWithListUnsubscribeValue(
- ""
+ "",
)
val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message)
assertThat(result).isEqualTo(MailtoUnsubscribeUri("mailto:unsubscribe@example.com".toUri()))
@@ -20,7 +21,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() {
@Test
fun `get list unsubscribe url - should prefer mailto 1`() {
val message = buildMimeMessageWithListUnsubscribeValue(
- ", "
+ ", ",
)
val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message)
assertThat(result).isEqualTo(MailtoUnsubscribeUri("mailto:unsubscribe@example.com".toUri()))
@@ -29,7 +30,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() {
@Test
fun `get list unsubscribe url - should prefer mailto 2`() {
val message = buildMimeMessageWithListUnsubscribeValue(
- ", "
+ ", ",
)
val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message)
assertThat(result).isEqualTo(MailtoUnsubscribeUri("mailto:unsubscribe@example.com".toUri()))
@@ -38,7 +39,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() {
@Test
fun `get list unsubscribe url - should allow https if no mailto`() {
val message = buildMimeMessageWithListUnsubscribeValue(
- ""
+ "",
)
val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message)
assertThat(result).isEqualTo(HttpsUnsubscribeUri("https://example.com/unsubscribe".toUri()))
@@ -47,7 +48,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() {
@Test
fun `get list unsubscribe url - should correctly parse uncommon urls`() {
val message = buildMimeMessageWithListUnsubscribeValue(
- ""
+ "",
)
val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message)
assertThat(result).isEqualTo(HttpsUnsubscribeUri("https://domain.example/one,two".toUri()))
@@ -56,7 +57,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() {
@Test
fun `get list unsubscribe url - should ignore unsafe entries 1`() {
val message = buildMimeMessageWithListUnsubscribeValue(
- ""
+ "",
)
val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message)
assertNull(result)
@@ -65,7 +66,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() {
@Test
fun `get list unsubscribe url - should ignore unsafe entries 2`() {
val message = buildMimeMessageWithListUnsubscribeValue(
- ", "
+ ", ",
)
val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message)
assertThat(result).isEqualTo(HttpsUnsubscribeUri("https://example.com/unsubscribe".toUri()))
@@ -74,7 +75,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() {
@Test
fun `get list unsubscribe url - should ignore empty`() {
val message = buildMimeMessageWithListUnsubscribeValue(
- ""
+ "",
)
val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message)
assertNull(result)
diff --git a/app/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.java b/app/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.java
deleted file mode 100644
index 9f003be37836efa5d2735eceddc512b54472a083..0000000000000000000000000000000000000000
--- a/app/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.fsck.k9.helper;
-
-
-import android.content.Context;
-import android.graphics.Color;
-import android.text.SpannableString;
-
-import com.fsck.k9.RobolectricTest;
-import com.fsck.k9.mail.Address;
-import org.junit.Before;
-import org.junit.Test;
-import org.robolectric.RuntimeEnvironment;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
-
-public class MessageHelperTest extends RobolectricTest {
- private Contacts contacts;
- private Contacts contactsWithFakeContact;
- private Contacts contactsWithFakeSpoofContact;
-
- @Before
- public void setUp() throws Exception {
- Context context = RuntimeEnvironment.getApplication();
- contacts = new Contacts(context);
- contactsWithFakeContact = new Contacts(context) {
- @Override public String getNameForAddress(String address) {
- if ("test@testor.com".equals(address)) {
- return "Tim Testor";
- } else {
- return null;
- }
- }
- };
- contactsWithFakeSpoofContact = new Contacts(context) {
- @Override public String getNameForAddress(String address) {
- if ("test@testor.com".equals(address)) {
- return "Tim@Testor";
- } else {
- return null;
- }
- }
- };
- }
-
- @Test
- public void testToFriendlyShowsPersonalPartIfItExists() throws Exception {
- Address address = new Address("test@testor.com", "Tim Testor");
- assertEquals("Tim Testor", MessageHelper.toFriendly(address, contacts));
- }
-
- @Test
- public void testToFriendlyShowsEmailPartIfNoPersonalPartExists() throws Exception {
- Address address = new Address("test@testor.com");
- assertEquals("test@testor.com", MessageHelper.toFriendly(address, contacts));
- }
-
- @Test
- public void testToFriendlyArray() throws Exception {
- Address address1 = new Address("test@testor.com", "Tim Testor");
- Address address2 = new Address("foo@bar.com", "Foo Bar");
- Address[] addresses = new Address[] { address1, address2 };
- assertEquals("Tim Testor,Foo Bar", MessageHelper.toFriendly(addresses, contacts).toString());
- }
-
- @Test
- public void testToFriendlyWithContactLookup() throws Exception {
- Address address = new Address("test@testor.com");
- assertEquals("Tim Testor", MessageHelper.toFriendly(address, contactsWithFakeContact).toString());
- }
-
- @Test
- public void testToFriendlyWithChangeContactColor() throws Exception {
- Address address = new Address("test@testor.com");
- CharSequence friendly = MessageHelper.toFriendly(address, contactsWithFakeContact,
- true, true, Color.RED);
- assertTrue(friendly instanceof SpannableString);
- assertEquals("Tim Testor", friendly.toString());
- }
-
- @Test
- public void testToFriendlyWithoutCorrespondentNames() throws Exception {
- Address address = new Address("test@testor.com", "Tim Testor");
- CharSequence friendly = MessageHelper.toFriendly(address, contactsWithFakeContact,
- false, false, 0);
- assertEquals("test@testor.com", friendly.toString());
- }
-
- @Test
- public void toFriendly_spoofPreventionOverridesPersonal() {
- Address address = new Address("test@testor.com", "potus@whitehouse.gov");
- CharSequence friendly = MessageHelper.toFriendly(address, contacts);
- assertEquals("test@testor.com", friendly.toString());
- }
-
- @Test
- public void toFriendly_atPrecededByOpeningParenthesisShouldNotTriggerSpoofPrevention() {
- Address address = new Address("gitlab@gitlab.example", "username (@username)");
- CharSequence friendly = MessageHelper.toFriendly(address, contacts);
- assertEquals("username (@username)", friendly.toString());
- }
-
- @Test
- public void toFriendly_nameStartingWithAtShouldNotTriggerSpoofPrevention() {
- Address address = new Address("address@domain.example", "@username");
- CharSequence friendly = MessageHelper.toFriendly(address, contacts);
- assertEquals("@username", friendly.toString());
- }
-
- @Test
- public void toFriendly_spoofPreventionDoesntOverrideContact() {
- Address address = new Address("test@testor.com", "Tim Testor");
- CharSequence friendly = MessageHelper.toFriendly(address, contactsWithFakeSpoofContact,
- true, false, 0);
- assertEquals("Tim@Testor", friendly.toString());
- }
-}
diff --git a/app/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt b/app/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt
new file mode 100644
index 0000000000000000000000000000000000000000..2f31e774fbde4f61b8fb3ac4fe7fb414ad36d29c
--- /dev/null
+++ b/app/core/src/test/java/com/fsck/k9/helper/MessageHelperTest.kt
@@ -0,0 +1,147 @@
+package com.fsck.k9.helper
+
+import android.graphics.Color
+import android.text.SpannableString
+import app.k9mail.core.android.common.contact.Contact
+import app.k9mail.core.android.common.contact.ContactRepository
+import app.k9mail.core.common.mail.EmailAddress
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isInstanceOf
+import com.fsck.k9.RobolectricTest
+import com.fsck.k9.helper.MessageHelper.Companion.toFriendly
+import com.fsck.k9.mail.Address
+import org.junit.Test
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stub
+
+class MessageHelperTest : RobolectricTest() {
+
+ private val contactRepository: ContactRepository = mock()
+
+ @Test
+ fun testToFriendlyShowsPersonalPartIfItExists() {
+ val address = Address("test@testor.com", "Tim Testor")
+ assertThat(toFriendly(address, contactRepository)).isEqualTo("Tim Testor")
+ }
+
+ @Test
+ fun testToFriendlyShowsEmailPartIfNoPersonalPartExists() {
+ val address = Address("test@testor.com")
+ assertThat(toFriendly(address, contactRepository)).isEqualTo("test@testor.com")
+ }
+
+ @Test
+ fun testToFriendlyArray() {
+ val address1 = Address("test@testor.com", "Tim Testor")
+ val address2 = Address("foo@bar.com", "Foo Bar")
+ val addresses = arrayOf(address1, address2)
+ assertThat(toFriendly(addresses, contactRepository).toString()).isEqualTo("Tim Testor,Foo Bar")
+ }
+
+ @Test
+ fun testToFriendlyWithContactLookup() {
+ val address = Address(EMAIL_ADDRESS.address)
+ setupContactRepositoryWithFakeContact(EMAIL_ADDRESS)
+
+ assertThat(toFriendly(address, contactRepository)).isEqualTo("Tim Testor")
+ }
+
+ @Test
+ fun testToFriendlyWithChangeContactColor() {
+ val address = Address(EMAIL_ADDRESS.address)
+ setupContactRepositoryWithFakeContact(EMAIL_ADDRESS)
+
+ val friendly = toFriendly(
+ address = address,
+ contactRepository = contactRepository,
+ showCorrespondentNames = true,
+ changeContactNameColor = true,
+ contactNameColor = Color.RED,
+ )
+ assertThat(friendly).isInstanceOf(SpannableString::class.java)
+ assertThat(friendly.toString()).isEqualTo("Tim Testor")
+ }
+
+ @Test
+ fun testToFriendlyWithoutCorrespondentNames() {
+ val address = Address(EMAIL_ADDRESS.address, "Tim Testor")
+ setupContactRepositoryWithFakeContact(EMAIL_ADDRESS)
+
+ val friendly = toFriendly(
+ address = address,
+ contactRepository = contactRepository,
+ showCorrespondentNames = false,
+ changeContactNameColor = false,
+ contactNameColor = 0,
+ )
+ assertThat(friendly).isEqualTo("test@testor.com")
+ }
+
+ @Test
+ fun toFriendly_spoofPreventionOverridesPersonal() {
+ val address = Address("test@testor.com", "potus@whitehouse.gov")
+ val friendly = toFriendly(address, contactRepository)
+ assertThat(friendly).isEqualTo("test@testor.com")
+ }
+
+ @Test
+ fun toFriendly_atPrecededByOpeningParenthesisShouldNotTriggerSpoofPrevention() {
+ val address = Address("gitlab@gitlab.example", "username (@username)")
+ val friendly = toFriendly(address, contactRepository)
+ assertThat(friendly).isEqualTo("username (@username)")
+ }
+
+ @Test
+ fun toFriendly_nameStartingWithAtShouldNotTriggerSpoofPrevention() {
+ val address = Address("address@domain.example", "@username")
+ val friendly = toFriendly(address, contactRepository)
+ assertThat(friendly).isEqualTo("@username")
+ }
+
+ @Test
+ fun toFriendly_spoofPreventionDoesntOverrideContact() {
+ val address = Address(EMAIL_ADDRESS.address, "Tim Testor")
+ setupContactRepositoryWithSpoofContact(EMAIL_ADDRESS)
+
+ val friendly = toFriendly(
+ address = address,
+ contactRepository = contactRepository,
+ showCorrespondentNames = true,
+ changeContactNameColor = false,
+ contactNameColor = 0,
+ )
+ assertThat(friendly).isEqualTo("Tim@Testor")
+ }
+
+ private fun setupContactRepositoryWithFakeContact(emailAddress: EmailAddress) {
+ contactRepository.stub {
+ on { getContactFor(emailAddress) } doReturn
+ Contact(
+ id = 1L,
+ name = "Tim Testor",
+ emailAddress = emailAddress,
+ uri = mock(),
+ photoUri = null,
+ )
+ }
+ }
+
+ private fun setupContactRepositoryWithSpoofContact(emailAddress: EmailAddress) {
+ contactRepository.stub {
+ on { getContactFor(emailAddress) } doReturn
+ Contact(
+ id = 1L,
+ name = "Tim@Testor",
+ emailAddress = emailAddress,
+ uri = mock(),
+ photoUri = null,
+ )
+ }
+ }
+
+ private companion object {
+ val EMAIL_ADDRESS = EmailAddress("test@testor.com")
+ }
+}
diff --git a/app/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt b/app/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt
index a4229bbb0d8fbd174172cc0efc5f9498c1ee16df..9783531f010e4930e219497f854414e0959658e3 100644
--- a/app/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt
@@ -2,7 +2,8 @@ package com.fsck.k9.logging
import android.content.ContentResolver
import android.net.Uri
-import com.google.common.truth.Truth.assertThat
+import assertk.assertThat
+import assertk.assertions.isEqualTo
import java.io.ByteArrayInputStream
import java.io.ByteArrayOutputStream
import java.io.FileNotFoundException
@@ -25,7 +26,7 @@ class LogcatLogFileWriterTest {
val logFileWriter = LogcatLogFileWriter(
contentResolver = createContentResolver(),
processExecutor = createProcessExecutor(logData),
- coroutineDispatcher = Dispatchers.Unconfined
+ coroutineDispatcher = Dispatchers.Unconfined,
)
logFileWriter.writeLogTo(contentUri)
@@ -38,7 +39,7 @@ class LogcatLogFileWriterTest {
val logFileWriter = LogcatLogFileWriter(
contentResolver = createThrowingContentResolver(FileNotFoundException()),
processExecutor = createProcessExecutor("irrelevant"),
- coroutineDispatcher = Dispatchers.Unconfined
+ coroutineDispatcher = Dispatchers.Unconfined,
)
logFileWriter.writeLogTo(contentUri)
@@ -49,7 +50,7 @@ class LogcatLogFileWriterTest {
val logFileWriter = LogcatLogFileWriter(
contentResolver = createContentResolver(),
processExecutor = ThrowingProcessExecutor(IOException()),
- coroutineDispatcher = Dispatchers.Unconfined
+ coroutineDispatcher = Dispatchers.Unconfined,
)
logFileWriter.writeLogTo(contentUri)
diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt b/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt
index ba1488fb017cc035ed98f138ae2c2ae9badf70f4..081a53ac300ab0206ea00447d85850873cc6daa5 100644
--- a/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt
@@ -104,7 +104,7 @@ class K9BackendFolderTest : K9RobolectricTest() {
messageStore,
createFolderSettingsProvider(),
saveMessageDataCreator,
- emptyList()
+ emptyList(),
)
backendStorage.updateFolders {
createFolders(listOf(FolderInfo(FOLDER_SERVER_ID, FOLDER_NAME, FOLDER_TYPE)))
@@ -142,7 +142,7 @@ class K9BackendFolderTest : K9RobolectricTest() {
"messages",
contentValuesOf("flags" to null),
"uid = ?",
- arrayOf(MESSAGE_SERVER_ID)
+ arrayOf(MESSAGE_SERVER_ID),
)
assertEquals(1, numberOfUpdatedRows)
}
diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt b/app/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt
index b23c4ff7e6d5779753d92dba8ff2ca3c0678ec76..9498df53a99276cd5445b76bbaa8917fb624a2d8 100644
--- a/app/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt
@@ -1,7 +1,13 @@
package com.fsck.k9.mailstore
+import assertk.assertThat
+import assertk.assertions.isFalse
+import assertk.assertions.isNotNull
+import assertk.assertions.isNotSameAs
+import assertk.assertions.isNull
+import assertk.assertions.isSameAs
+import assertk.assertions.isTrue
import com.fsck.k9.mail.Flag
-import com.google.common.truth.Truth.assertThat
import java.util.UUID
import org.junit.After
import org.junit.Before
@@ -33,7 +39,7 @@ class MessageListCacheTest {
modules(
module {
single { mock() }
- }
+ },
)
}
}
@@ -49,7 +55,7 @@ class MessageListCacheTest {
val cache2 = MessageListCache.getCache("u002")
- assertThat(cache2).isNotSameInstanceAs(cache)
+ assertThat(cache2).isNotSameAs(cache)
}
@Test
@@ -58,7 +64,7 @@ class MessageListCacheTest {
val cache2 = MessageListCache.getCache("u001")
- assertThat(cache2).isSameInstanceAs(cache)
+ assertThat(cache2).isSameAs(cache)
}
@Test
@@ -67,7 +73,7 @@ class MessageListCacheTest {
val result = cache.getFlagForMessage(1L, Flag.SEEN)
- assertThat(result).isTrue()
+ assertThat(result).isNotNull().isTrue()
}
@Test
@@ -93,7 +99,7 @@ class MessageListCacheTest {
val result = cache.getFlagForThread(1L, Flag.SEEN)
- assertThat(result).isFalse()
+ assertThat(result).isNotNull().isFalse()
}
@Test
diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt b/app/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt
index 300356f22f480216c0d83145aee4316683561143..a60a517a790a30b409d92f623f78d9072b073b7a 100644
--- a/app/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt
@@ -1,9 +1,11 @@
package com.fsck.k9.mailstore
+import assertk.assertThat
+import assertk.assertions.containsExactly
+import assertk.assertions.isEqualTo
import com.fsck.k9.mail.Address
import com.fsck.k9.mail.Flag
import com.fsck.k9.message.extractors.PreviewResult
-import com.google.common.truth.Truth.assertThat
import java.util.UUID
import org.junit.After
import org.junit.Before
@@ -46,7 +48,7 @@ class MessageListRepositoryTest {
modules(
module {
single { messageListRepository }
- }
+ },
)
}
}
@@ -103,8 +105,8 @@ class MessageListRepositoryTest {
isRead = false,
isStarred = true,
isAnswered = false,
- isForwarded = true
- )
+ isForwarded = true,
+ ),
)
MessageListCache.getCache(accountUuid).apply {
setFlagForMessages(listOf(MESSAGE_ID), Flag.SEEN, true)
@@ -119,7 +121,7 @@ class MessageListRepositoryTest {
isRead = message.isRead,
isStarred = message.isStarred,
isAnswered = message.isAnswered,
- isForwarded = message.isForwarded
+ isForwarded = message.isForwarded,
)
}
@@ -131,8 +133,8 @@ class MessageListRepositoryTest {
isRead = true,
isStarred = false,
isAnswered = false,
- isForwarded = true
- )
+ isForwarded = true,
+ ),
)
}
@@ -140,7 +142,7 @@ class MessageListRepositoryTest {
fun `getMessages() should skip messages marked as hidden in the cache`() {
addMessages(
MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
- MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT)
+ MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
)
hideMessage(MESSAGE_ID, FOLDER_ID)
@@ -155,7 +157,7 @@ class MessageListRepositoryTest {
fun `getMessages() should not skip message when marked as hidden in a different folder`() {
addMessages(
MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
- MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT)
+ MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
)
hideMessage(MESSAGE_ID, FOLDER_ID_2)
@@ -176,8 +178,8 @@ class MessageListRepositoryTest {
isRead = false,
isStarred = true,
isAnswered = false,
- isForwarded = true
- )
+ isForwarded = true,
+ ),
)
MessageListCache.getCache(accountUuid).apply {
setFlagForMessages(listOf(MESSAGE_ID), Flag.SEEN, true)
@@ -188,7 +190,7 @@ class MessageListRepositoryTest {
accountUuid,
SELECTION,
SELECTION_ARGS,
- SORT_ORDER
+ SORT_ORDER,
) { message ->
MessageData(
messageId = message.id,
@@ -197,7 +199,7 @@ class MessageListRepositoryTest {
isRead = message.isRead,
isStarred = message.isStarred,
isAnswered = message.isAnswered,
- isForwarded = message.isForwarded
+ isForwarded = message.isForwarded,
)
}
@@ -209,8 +211,8 @@ class MessageListRepositoryTest {
isRead = true,
isStarred = false,
isAnswered = false,
- isForwarded = true
- )
+ isForwarded = true,
+ ),
)
}
@@ -218,7 +220,7 @@ class MessageListRepositoryTest {
fun `getThreadedMessages() should skip messages marked as hidden in the cache`() {
addThreadedMessages(
MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
- MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT_2)
+ MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT_2),
)
hideMessage(MESSAGE_ID, FOLDER_ID)
@@ -226,7 +228,7 @@ class MessageListRepositoryTest {
accountUuid,
SELECTION,
SELECTION_ARGS,
- SORT_ORDER
+ SORT_ORDER,
) { message ->
message.id
}
@@ -238,7 +240,7 @@ class MessageListRepositoryTest {
fun `getThreadedMessages() should not skip message when marked as hidden in a different folder`() {
addThreadedMessages(
MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
- MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT_2)
+ MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT_2),
)
hideMessage(MESSAGE_ID, FOLDER_ID_2)
@@ -246,7 +248,7 @@ class MessageListRepositoryTest {
accountUuid,
SELECTION,
SELECTION_ARGS,
- SORT_ORDER
+ SORT_ORDER,
) { message ->
message.id
}
@@ -265,7 +267,7 @@ class MessageListRepositoryTest {
isRead = false,
isStarred = true,
isAnswered = false,
- isForwarded = true
+ isForwarded = true,
),
MessageData(
messageId = MESSAGE_ID_2,
@@ -274,8 +276,8 @@ class MessageListRepositoryTest {
isRead = false,
isStarred = true,
isAnswered = true,
- isForwarded = false
- )
+ isForwarded = false,
+ ),
)
MessageListCache.getCache(accountUuid).apply {
setFlagForMessages(listOf(MESSAGE_ID), Flag.SEEN, true)
@@ -285,7 +287,7 @@ class MessageListRepositoryTest {
val result = messageListRepository.getThread(
accountUuid,
THREAD_ROOT,
- SORT_ORDER
+ SORT_ORDER,
) { message ->
MessageData(
messageId = message.id,
@@ -294,7 +296,7 @@ class MessageListRepositoryTest {
isRead = message.isRead,
isStarred = message.isStarred,
isAnswered = message.isAnswered,
- isForwarded = message.isForwarded
+ isForwarded = message.isForwarded,
)
}
@@ -306,7 +308,7 @@ class MessageListRepositoryTest {
isRead = true,
isStarred = false,
isAnswered = false,
- isForwarded = true
+ isForwarded = true,
),
MessageData(
messageId = MESSAGE_ID_2,
@@ -315,8 +317,8 @@ class MessageListRepositoryTest {
isRead = false,
isStarred = false,
isAnswered = true,
- isForwarded = false
- )
+ isForwarded = false,
+ ),
)
}
@@ -326,7 +328,7 @@ class MessageListRepositoryTest {
THREAD_ROOT,
MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
- MessageData(messageId = MESSAGE_ID_3, folderId = FOLDER_ID, threadRoot = THREAD_ROOT)
+ MessageData(messageId = MESSAGE_ID_3, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
)
hideMessage(MESSAGE_ID, FOLDER_ID)
@@ -341,7 +343,7 @@ class MessageListRepositoryTest {
THREAD_ROOT,
MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
- MessageData(messageId = MESSAGE_ID_3, folderId = FOLDER_ID, threadRoot = THREAD_ROOT)
+ MessageData(messageId = MESSAGE_ID_3, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
)
hideMessage(MESSAGE_ID, FOLDER_ID_2)
@@ -383,25 +385,27 @@ class MessageListRepositoryTest {
private fun runMessageMapper(messages: Array, mapper: MessageMapper): List {
return messages.mapNotNull { message ->
- mapper.map(object : MessageDetailsAccessor {
- override val id = message.messageId
- override val messageServerId = "irrelevant"
- override val folderId = message.folderId
- override val fromAddresses = emptyList()
- override val toAddresses = emptyList()
- override val ccAddresses = emptyList()
- override val messageDate = 0L
- override val internalDate = 0L
- override val subject = "irrelevant"
- override val preview = PreviewResult.error()
- override val isRead = message.isRead
- override val isStarred = message.isStarred
- override val isAnswered = message.isAnswered
- override val isForwarded = message.isForwarded
- override val hasAttachments = false
- override val threadRoot = message.threadRoot
- override val threadCount = 0
- })
+ mapper.map(
+ object : MessageDetailsAccessor {
+ override val id = message.messageId
+ override val messageServerId = "irrelevant"
+ override val folderId = message.folderId
+ override val fromAddresses = emptyList()
+ override val toAddresses = emptyList()
+ override val ccAddresses = emptyList()
+ override val messageDate = 0L
+ override val internalDate = 0L
+ override val subject = "irrelevant"
+ override val preview = PreviewResult.error()
+ override val isRead = message.isRead
+ override val isStarred = message.isStarred
+ override val isAnswered = message.isAnswered
+ override val isForwarded = message.isForwarded
+ override val hasAttachments = false
+ override val threadRoot = message.threadRoot
+ override val threadCount = 0
+ },
+ )
}
}
diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/MessageStoreManagerTest.kt b/app/core/src/test/java/com/fsck/k9/mailstore/MessageStoreManagerTest.kt
index dd8804512970e5048f00ac7a516315e9a1dd4c18..98c59cb9a29cfcf1fe6d6b4a042715f7f0bbee5b 100644
--- a/app/core/src/test/java/com/fsck/k9/mailstore/MessageStoreManagerTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/mailstore/MessageStoreManagerTest.kt
@@ -1,9 +1,10 @@
package com.fsck.k9.mailstore
+import assertk.assertThat
+import assertk.assertions.isSameAs
import com.fsck.k9.Account
import com.fsck.k9.AccountRemovedListener
import com.fsck.k9.preferences.AccountManager
-import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.mockito.kotlin.KStubbing
import org.mockito.kotlin.argumentCaptor
@@ -25,8 +26,8 @@ class MessageStoreManagerTest {
val accountManager = mock()
val messageStoreManager = MessageStoreManager(accountManager, messageStoreFactory)
- assertThat(messageStoreManager.getMessageStore(account)).isSameInstanceAs(messageStore1)
- assertThat(messageStoreManager.getMessageStore(account)).isSameInstanceAs(messageStore1)
+ assertThat(messageStoreManager.getMessageStore(account)).isSameAs(messageStore1)
+ assertThat(messageStoreManager.getMessageStore(account)).isSameAs(messageStore1)
}
@Test
@@ -37,11 +38,11 @@ class MessageStoreManagerTest {
}
val messageStoreManager = MessageStoreManager(accountManager, messageStoreFactory)
- assertThat(messageStoreManager.getMessageStore(account)).isSameInstanceAs(messageStore1)
+ assertThat(messageStoreManager.getMessageStore(account)).isSameAs(messageStore1)
listenerCaptor.firstValue.onAccountRemoved(account)
- assertThat(messageStoreManager.getMessageStore(account)).isSameInstanceAs(messageStore2)
+ assertThat(messageStoreManager.getMessageStore(account)).isSameAs(messageStore2)
}
private fun KStubbing.doNothingOn(block: T.() -> Any) {
diff --git a/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt b/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt
index 2be6075663d483c2f0daaf0a17703bfd3f99f70f..1b4ce118ad40007b658f9b1602a08faf598ac149 100644
--- a/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt
@@ -1,11 +1,12 @@
package com.fsck.k9.message
+import assertk.assertThat
+import assertk.assertions.isGreaterThan
import com.fsck.k9.Account.QuoteStyle
import com.fsck.k9.Identity
import com.fsck.k9.RobolectricTest
import com.fsck.k9.mail.internet.MimeHeaderChecker
import com.fsck.k9.mail.internet.TextBody
-import com.google.common.truth.Truth.assertThat
import org.junit.Test
private const val IDENTITY_HEADER = "X-K9mail-Identity"
@@ -49,7 +50,7 @@ class IdentityHeaderBuilderTest : RobolectricTest() {
email: String? = null,
signature: String? = null,
signatureUse: Boolean = false,
- replyTo: String? = null
+ replyTo: String? = null,
): Identity {
return Identity(description, name, email, signature, signatureUse, replyTo)
}
diff --git a/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderParserTest.kt b/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderParserTest.kt
index 1d58f7c2125ec1d20b398c2f4cc614847b37f0b5..f9dd3b8c5eb1e0d975fdb631eefd59002ffdf0d3 100644
--- a/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderParserTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderParserTest.kt
@@ -1,8 +1,9 @@
package com.fsck.k9.message
+import assertk.assertThat
+import assertk.assertions.contains
import com.fsck.k9.RobolectricTest
import com.fsck.k9.helper.toCrLf
-import com.google.common.truth.Truth.assertThat
import org.junit.Test
class IdentityHeaderParserTest : RobolectricTest() {
@@ -28,6 +29,6 @@ class IdentityHeaderParserTest : RobolectricTest() {
val result = IdentityHeaderParser.parse(input)
- assertThat(result).containsEntry(IdentityField.SIGNATURE, "a".repeat(1000))
+ assertThat(result).contains(IdentityField.SIGNATURE, "a".repeat(1000))
}
}
diff --git a/app/core/src/test/java/com/fsck/k9/message/ReplyActionStrategyTest.kt b/app/core/src/test/java/com/fsck/k9/message/ReplyActionStrategyTest.kt
index e366859072eb8b6757c67681190fbe804e4185bd..868ab0718c4990e0e69a193c1e879077d1abe151 100644
--- a/app/core/src/test/java/com/fsck/k9/message/ReplyActionStrategyTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/ReplyActionStrategyTest.kt
@@ -1,10 +1,14 @@
package com.fsck.k9.message
+import assertk.assertThat
+import assertk.assertions.containsExactly
+import assertk.assertions.isEmpty
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNull
import com.fsck.k9.Account
import com.fsck.k9.Identity
import com.fsck.k9.helper.ReplyToParser
import com.fsck.k9.mail.buildMessage
-import com.google.common.truth.Truth.assertThat
import org.junit.Test
private const val IDENTITY_EMAIL_ADDRESS = "myself@domain.example"
diff --git a/app/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt b/app/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt
index 2178cb42838605d0399cbd0b72b0fba5e6d20537..62904cbd7399e1c90fbbd069ae85d1d384b0aa26 100644
--- a/app/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt
@@ -1,7 +1,8 @@
package com.fsck.k9.message
+import assertk.assertThat
+import assertk.assertions.isEqualTo
import com.fsck.k9.message.quote.InsertableHtmlContent
-import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
@@ -33,7 +34,7 @@ class TextBodyBuilderTest(val testData: TestData) {
signatureBeforeQuotedText = false,
expectedPlainTextMessage = MESSAGE_TEXT,
expectedHtmlTextMessage = TextBodyBuilder.HTML_AND_BODY_START + MESSAGE_TEXT_HTML +
- TextBodyBuilder.HTML_AND_BODY_END
+ TextBodyBuilder.HTML_AND_BODY_END,
),
TestData(
appendSignature = true,
@@ -43,7 +44,7 @@ class TextBodyBuilderTest(val testData: TestData) {
signatureBeforeQuotedText = false,
expectedPlainTextMessage = MESSAGE_TEXT + "\r\n" + SIGNATURE_TEXT,
expectedHtmlTextMessage = TextBodyBuilder.HTML_AND_BODY_START + MESSAGE_TEXT_HTML +
- SIGNATURE_TEXT_HTML + TextBodyBuilder.HTML_AND_BODY_END
+ SIGNATURE_TEXT_HTML + TextBodyBuilder.HTML_AND_BODY_END,
),
TestData(
appendSignature = false,
@@ -53,7 +54,7 @@ class TextBodyBuilderTest(val testData: TestData) {
signatureBeforeQuotedText = false,
expectedPlainTextMessage = MESSAGE_TEXT + "\r\n\r\n" + QUOTED_TEXT,
expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + QUOTED_HTML_BODY +
- QUOTED_HTML_TAGS_END
+ QUOTED_HTML_TAGS_END,
),
TestData(
appendSignature = false,
@@ -63,7 +64,7 @@ class TextBodyBuilderTest(val testData: TestData) {
signatureBeforeQuotedText = false,
expectedPlainTextMessage = MESSAGE_TEXT + "\r\n\r\n" + QUOTED_TEXT,
expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + "
" +
- QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END
+ QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END,
),
TestData(
appendSignature = false,
@@ -73,7 +74,7 @@ class TextBodyBuilderTest(val testData: TestData) {
signatureBeforeQuotedText = false,
expectedPlainTextMessage = QUOTED_TEXT + "\r\n" + MESSAGE_TEXT,
expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + MESSAGE_TEXT_HTML +
- QUOTED_HTML_TAGS_END
+ QUOTED_HTML_TAGS_END,
),
TestData(
appendSignature = false,
@@ -83,7 +84,7 @@ class TextBodyBuilderTest(val testData: TestData) {
signatureBeforeQuotedText = false,
expectedPlainTextMessage = QUOTED_TEXT + "\r\n" + MESSAGE_TEXT,
expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + "
" +
- MESSAGE_TEXT_HTML + QUOTED_HTML_TAGS_END
+ MESSAGE_TEXT_HTML + QUOTED_HTML_TAGS_END,
),
TestData(
appendSignature = true,
@@ -93,7 +94,7 @@ class TextBodyBuilderTest(val testData: TestData) {
signatureBeforeQuotedText = false,
expectedPlainTextMessage = MESSAGE_TEXT + "\r\n\r\n" + QUOTED_TEXT + "\r\n" + SIGNATURE_TEXT,
expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + QUOTED_HTML_BODY +
- SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END
+ SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END,
),
TestData(
appendSignature = true,
@@ -103,7 +104,7 @@ class TextBodyBuilderTest(val testData: TestData) {
signatureBeforeQuotedText = false,
expectedPlainTextMessage = MESSAGE_TEXT + "\r\n\r\n" + QUOTED_TEXT + "\r\n" + SIGNATURE_TEXT,
expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + "
" +
- QUOTED_HTML_BODY + SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END
+ QUOTED_HTML_BODY + SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END,
),
TestData(
appendSignature = true,
@@ -113,7 +114,7 @@ class TextBodyBuilderTest(val testData: TestData) {
signatureBeforeQuotedText = false,
expectedPlainTextMessage = QUOTED_TEXT + "\r\n" + MESSAGE_TEXT + "\r\n" + SIGNATURE_TEXT,
expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + MESSAGE_TEXT_HTML +
- SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END
+ SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END,
),
TestData(
appendSignature = true,
@@ -123,7 +124,7 @@ class TextBodyBuilderTest(val testData: TestData) {
signatureBeforeQuotedText = false,
expectedPlainTextMessage = QUOTED_TEXT + "\r\n" + MESSAGE_TEXT + "\r\n" + SIGNATURE_TEXT,
expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + "
" +
- MESSAGE_TEXT_HTML + SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END
+ MESSAGE_TEXT_HTML + SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END,
),
TestData(
appendSignature = true,
@@ -133,7 +134,7 @@ class TextBodyBuilderTest(val testData: TestData) {
signatureBeforeQuotedText = true,
expectedPlainTextMessage = MESSAGE_TEXT + "\r\n" + SIGNATURE_TEXT + "\r\n\r\n" + QUOTED_TEXT,
expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + SIGNATURE_TEXT_HTML +
- QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END
+ QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END,
),
TestData(
appendSignature = true,
@@ -143,8 +144,8 @@ class TextBodyBuilderTest(val testData: TestData) {
signatureBeforeQuotedText = true,
expectedPlainTextMessage = MESSAGE_TEXT + "\r\n" + SIGNATURE_TEXT + "\r\n\r\n" + QUOTED_TEXT,
expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + SIGNATURE_TEXT_HTML +
- "
" + QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END
- )
+ "
" + QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END,
+ ),
)
}
}
@@ -161,7 +162,7 @@ class TextBodyBuilderTest(val testData: TestData) {
toTest.setQuotedText(QUOTED_TEXT)
val quotedHtmlContent = InsertableHtmlContent()
quotedHtmlContent.setQuotedContent(
- StringBuilder(QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END)
+ StringBuilder(QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END),
)
quotedHtmlContent.setHeaderInsertionPoint(QUOTED_HTML_TAGS_START.length)
quotedHtmlContent.footerInsertionPoint =
@@ -209,7 +210,7 @@ class TextBodyBuilderTest(val testData: TestData) {
val replyAfterQuote: Boolean,
val signatureBeforeQuotedText: Boolean,
val expectedPlainTextMessage: String,
- val expectedHtmlTextMessage: String
+ val expectedHtmlTextMessage: String,
) {
override fun toString(): String {
return "appendSignature=$appendSignature," +
diff --git a/app/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt b/app/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt
index f50b99139ce8ab93a0adacda3800335cff511789..497f312b4301525191cd2f9dc440dade8c684a5e 100644
--- a/app/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt
@@ -1,8 +1,10 @@
package com.fsck.k9.message.extractors
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNull
import com.fsck.k9.mail.Part
import com.fsck.k9.mail.internet.MimeBodyPart
-import com.google.common.truth.Truth.assertThat
import org.junit.Test
class BasicPartInfoExtractorTest {
@@ -12,7 +14,7 @@ class BasicPartInfoExtractorTest {
fun `extractPartInfo with 'filename' parameter in Content-Disposition header`() {
val part = createPart(
contentType = "application/octet-stream",
- contentDisposition = "attachment; filename=\"attachment_name.txt\"; size=23"
+ contentDisposition = "attachment; filename=\"attachment_name.txt\"; size=23",
)
val partInfo = basicPartInfoExtractor.extractPartInfo(part)
@@ -25,7 +27,7 @@ class BasicPartInfoExtractorTest {
fun `extractPartInfo with 'name' parameter in Content-Type header`() {
val part = createPart(
contentType = "image/jpeg; name=\"attachment.jpeg\"",
- contentDisposition = "attachment; size=42"
+ contentDisposition = "attachment; size=42",
)
val partInfo = basicPartInfoExtractor.extractPartInfo(part)
@@ -58,7 +60,7 @@ class BasicPartInfoExtractorTest {
fun `extractPartInfo with missing Content-Disposition header`() {
val part = createPart(
contentType = "application/octet-stream; name=\"attachment.dat\"",
- contentDisposition = null
+ contentDisposition = null,
)
val partInfo = basicPartInfoExtractor.extractPartInfo(part)
@@ -71,7 +73,7 @@ class BasicPartInfoExtractorTest {
fun `extractPartInfo with missing Content-Disposition header and name`() {
val part = createPart(
contentType = "application/octet-stream",
- contentDisposition = null
+ contentDisposition = null,
)
val partInfo = basicPartInfoExtractor.extractPartInfo(part)
@@ -84,7 +86,7 @@ class BasicPartInfoExtractorTest {
fun `extractPartInfo without any relevant headers`() {
val part = createPart(
contentType = null,
- contentDisposition = null
+ contentDisposition = null,
)
val partInfo = basicPartInfoExtractor.extractPartInfo(part)
@@ -97,7 +99,7 @@ class BasicPartInfoExtractorTest {
fun `extractPartInfo with invalid Content-Disposition header`() {
val part = createPart(
contentType = "application/octet-stream",
- contentDisposition = "something; "
+ contentDisposition = "something; ",
)
val partInfo = basicPartInfoExtractor.extractPartInfo(part)
diff --git a/app/core/src/test/java/com/fsck/k9/message/extractors/PreviewTextExtractorTest.kt b/app/core/src/test/java/com/fsck/k9/message/extractors/PreviewTextExtractorTest.kt
index f2ce84cfa99b7035e543a4639bd8bb4b2db11e44..e45345a5dfe09c1c2d75a18ab1970109eb85f0b4 100644
--- a/app/core/src/test/java/com/fsck/k9/message/extractors/PreviewTextExtractorTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/extractors/PreviewTextExtractorTest.kt
@@ -1,8 +1,9 @@
package com.fsck.k9.message.extractors
+import assertk.assertThat
+import assertk.assertions.isEqualTo
import com.fsck.k9.mail.internet.MimeBodyPart
import com.fsck.k9.message.MessageCreationHelper
-import com.google.common.truth.Truth.assertThat
import org.junit.Test
class PreviewTextExtractorTest {
diff --git a/app/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt b/app/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt
index 4f7f32c091a99423add42e679a72b8812b7a4b7b..353e6a2c6712135d9a4500d760370d98baf7786a 100644
--- a/app/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt
@@ -1,10 +1,12 @@
package com.fsck.k9.message.extractors
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNull
import com.fsck.k9.message.MessageCreationHelper.createEmptyPart
import com.fsck.k9.message.MessageCreationHelper.createMultipart
import com.fsck.k9.message.MessageCreationHelper.createPart
import com.fsck.k9.message.MessageCreationHelper.createTextPart
-import com.google.common.truth.Truth.assertThat
import org.junit.Test
class TextPartFinderTest {
@@ -43,7 +45,7 @@ class TextPartFinderTest {
val part = createMultipart(
"multipart/alternative",
expected,
- createTextPart("text/html")
+ createTextPart("text/html"),
)
val result = textPartFinder.findFirstTextPart(part)
@@ -57,7 +59,7 @@ class TextPartFinderTest {
val part = createMultipart(
"multipart/alternative",
createTextPart("text/html"),
- expected
+ expected,
)
val result = textPartFinder.findFirstTextPart(part)
@@ -72,7 +74,7 @@ class TextPartFinderTest {
"multipart/alternative",
createPart("image/gif"),
expected,
- createTextPart("text/html")
+ createTextPart("text/html"),
)
val result = textPartFinder.findFirstTextPart(part)
@@ -85,7 +87,7 @@ class TextPartFinderTest {
val part = createMultipart(
"multipart/alternative",
createPart("image/gif"),
- createPart("application/pdf")
+ createPart("application/pdf"),
)
val result = textPartFinder.findFirstTextPart(part)
@@ -101,9 +103,9 @@ class TextPartFinderTest {
createMultipart(
"multipart/related",
expected,
- createPart("image/jpeg")
+ createPart("image/jpeg"),
),
- createTextPart("text/html")
+ createTextPart("text/html"),
)
val result = textPartFinder.findFirstTextPart(part)
@@ -119,9 +121,9 @@ class TextPartFinderTest {
createMultipart(
"multipart/related",
createTextPart("text/html"),
- createPart("image/jpeg")
+ createPart("image/jpeg"),
),
- expected
+ expected,
)
val result = textPartFinder.findFirstTextPart(part)
@@ -135,7 +137,7 @@ class TextPartFinderTest {
val part = createMultipart(
"multipart/mixed",
createPart("image/jpeg"),
- expected
+ expected,
)
val result = textPartFinder.findFirstTextPart(part)
@@ -149,7 +151,7 @@ class TextPartFinderTest {
val part = createMultipart(
"multipart/mixed",
expected,
- createTextPart("text/plain")
+ createTextPart("text/plain"),
)
val result = textPartFinder.findFirstTextPart(part)
@@ -162,7 +164,7 @@ class TextPartFinderTest {
val part = createMultipart(
"multipart/mixed",
createPart("image/jpeg"),
- createPart("image/gif")
+ createPart("image/gif"),
)
val result = textPartFinder.findFirstTextPart(part)
@@ -179,9 +181,9 @@ class TextPartFinderTest {
createMultipart(
"multipart/alternative",
expected,
- createTextPart("text/html")
+ createTextPart("text/html"),
),
- createTextPart("text/plain")
+ createTextPart("text/plain"),
)
val result = textPartFinder.findFirstTextPart(part)
@@ -197,8 +199,8 @@ class TextPartFinderTest {
createMultipart(
"multipart/alternative",
createTextPart("text/html"),
- expected
- )
+ expected,
+ ),
)
val result = textPartFinder.findFirstTextPart(part)
@@ -212,7 +214,7 @@ class TextPartFinderTest {
val part = createMultipart(
"multipart/alternative",
expected,
- createTextPart("text/html")
+ createTextPart("text/html"),
)
val result = textPartFinder.findFirstTextPart(part)
@@ -226,7 +228,7 @@ class TextPartFinderTest {
val part = createMultipart(
"multipart/mixed",
expected,
- createTextPart("text/plain")
+ createTextPart("text/plain"),
)
val result = textPartFinder.findFirstTextPart(part)
@@ -242,9 +244,9 @@ class TextPartFinderTest {
createMultipart(
"multipart/alternative",
createPart("image/jpeg"),
- createPart("image/png")
+ createPart("image/png"),
),
- expected
+ expected,
)
val result = textPartFinder.findFirstTextPart(part)
diff --git a/app/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt b/app/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt
index eeca7b447761aadc9d59c3fe267736e3e4d41c5d..6dcb06aa35b946c376a7bc129b55fe691e0ac2f5 100644
--- a/app/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt
@@ -51,7 +51,8 @@ class DisplayHtmlTest {
val numberOfFoundElements = document.select(cssQuery).size
assertEquals(
"Expected to find '$cssQuery' $numberOfExpectedOccurrences time(s) in:\n$html",
- numberOfExpectedOccurrences, numberOfFoundElements
+ numberOfExpectedOccurrences,
+ numberOfFoundElements,
)
}
}
diff --git a/app/core/src/test/java/com/fsck/k9/message/html/EmailSectionExtractorTest.kt b/app/core/src/test/java/com/fsck/k9/message/html/EmailSectionExtractorTest.kt
index a4cbc30b276a3d3636cb1929a587b8ae92fa7176..2a182e7ebfe5edc9fa160a6e613d2bbbaf99a790 100644
--- a/app/core/src/test/java/com/fsck/k9/message/html/EmailSectionExtractorTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/html/EmailSectionExtractorTest.kt
@@ -1,6 +1,7 @@
package com.fsck.k9.message.html
-import com.google.common.truth.Truth.assertThat
+import assertk.assertThat
+import assertk.assertions.isEqualTo
import org.junit.Test
class EmailSectionExtractorTest {
diff --git a/app/core/src/test/java/com/fsck/k9/message/html/EmailSectionTest.kt b/app/core/src/test/java/com/fsck/k9/message/html/EmailSectionTest.kt
index f2e48203306975f7029898aa037b7b102b6a9be6..edd187201b506b8ac1f4c389ab4f2aa8eb8066ec 100644
--- a/app/core/src/test/java/com/fsck/k9/message/html/EmailSectionTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/html/EmailSectionTest.kt
@@ -1,6 +1,8 @@
package com.fsck.k9.message.html
-import com.google.common.truth.Truth.assertThat
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isSameAs
import org.junit.Test
class EmailSectionTest {
@@ -45,7 +47,7 @@ class EmailSectionTest {
fun subSequence() {
val section = "[ One][ Two][ Three]".asEmailSection()
- assertThat(section.subSequence(0, 11)).isSameInstanceAs(section)
+ assertThat(section.subSequence(0, 11)).isSameAs(section)
assertThat(section.subSequence(0, 3).asString()).isEqualTo("One")
assertThat(section.subSequence(0, 2).asString()).isEqualTo("On")
assertThat(section.subSequence(1, 3).asString()).isEqualTo("ne")
diff --git a/app/core/src/test/java/com/fsck/k9/message/html/GenericUriParserTest.kt b/app/core/src/test/java/com/fsck/k9/message/html/GenericUriParserTest.kt
index 4dc0b1af15da5edcf5d9ec80f33dd5ab81eb0371..7ec7312d90b1236b7a7e4968d97c1afc2603b241 100644
--- a/app/core/src/test/java/com/fsck/k9/message/html/GenericUriParserTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/html/GenericUriParserTest.kt
@@ -1,6 +1,10 @@
package com.fsck.k9.message.html
-import com.google.common.truth.Truth.assertThat
+import assertk.assertThat
+import assertk.assertions.hasMessage
+import assertk.assertions.isEqualTo
+import assertk.assertions.isFailure
+import assertk.assertions.isInstanceOf
import kotlin.test.assertNotNull
import org.junit.Test
@@ -61,6 +65,24 @@ class GenericUriParserTest {
assertUriValid("matrix:roomid/rid:example.org/event/lol823y4bcp3qo4?via=example2.org")
}
+ @Test
+ fun `negative 'startPos' value`() {
+ assertThat {
+ parser.parseUri("test", -1)
+ }.isFailure()
+ .isInstanceOf(IllegalArgumentException::class)
+ .hasMessage("Invalid 'startPos' value")
+ }
+
+ @Test
+ fun `out of bounds 'startPos' value`() {
+ assertThat {
+ parser.parseUri("test", 4)
+ }.isFailure()
+ .isInstanceOf(IllegalArgumentException::class)
+ .hasMessage("Invalid 'startPos' value")
+ }
+
private fun assertUriValid(input: String) {
val result = parser.parseUri(input, 0)
diff --git a/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt b/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt
index b8caa01adb53a1e3b6049965ca00a3bd743a4623..617085d19714edbb43ea3a52890ba9aeb7db8af7 100644
--- a/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt
@@ -1,8 +1,9 @@
package com.fsck.k9.message.html
+import assertk.assertThat
+import assertk.assertions.isEqualTo
import com.fsck.k9.mail.crlf
import com.fsck.k9.mail.removeLineBreaks
-import com.google.common.truth.Truth.assertThat
import org.junit.Test
class HtmlConverterTest {
@@ -60,7 +61,7 @@ class HtmlConverterTest {
|
|
|
- """.trimMargin().removeLineBreaks()
+ """.trimMargin().removeLineBreaks(),
)
}
@@ -98,7 +99,7 @@ class HtmlConverterTest {
|
|
|
- """.trimMargin().removeLineBreaks()
+ """.trimMargin().removeLineBreaks(),
)
}
@@ -154,7 +155,7 @@ class HtmlConverterTest {
|
|
|
- """.trimMargin().removeLineBreaks()
+ """.trimMargin().removeLineBreaks(),
)
}
@@ -179,7 +180,7 @@ class HtmlConverterTest {
| baz
|
|
- """.trimMargin().removeLineBreaks()
+ """.trimMargin().removeLineBreaks(),
)
}
@@ -212,7 +213,7 @@ class HtmlConverterTest {
|
|
|
- """.trimMargin().removeLineBreaks()
+ """.trimMargin().removeLineBreaks(),
)
}
@@ -252,7 +253,7 @@ class HtmlConverterTest {
end
- """.trimIndent().removeLineBreaks()
+ """.trimIndent().removeLineBreaks(),
)
}
@@ -276,7 +277,7 @@ class HtmlConverterTest {
foo bar
- """.trimIndent().removeLineBreaks()
+ """.trimIndent().removeLineBreaks(),
)
}
@@ -301,7 +302,7 @@ class HtmlConverterTest {
foo bar
- """.trimIndent().removeLineBreaks()
+ """.trimIndent().removeLineBreaks(),
)
}
@@ -319,7 +320,7 @@ class HtmlConverterTest {
- """.trimIndent().removeLineBreaks()
+ """.trimIndent().removeLineBreaks(),
)
}
@@ -380,7 +381,7 @@ class HtmlConverterTest {
foo bar
- """.trimIndent().removeLineBreaks()
+ """.trimIndent().removeLineBreaks(),
)
}
@@ -398,7 +399,7 @@ class HtmlConverterTest {
- """.trimIndent().removeLineBreaks()
+ """.trimIndent().removeLineBreaks(),
)
}
@@ -422,7 +423,7 @@ class HtmlConverterTest {
world
- """.trimIndent().removeLineBreaks()
+ """.trimIndent().removeLineBreaks(),
)
}
@@ -448,7 +449,7 @@ class HtmlConverterTest {
- """.trimIndent().removeLineBreaks()
+ """.trimIndent().removeLineBreaks(),
)
}
@@ -524,7 +525,7 @@ class HtmlConverterTest {
Two
Three
- """.trimIndent()
+ """.trimIndent(),
)
}
@@ -550,7 +551,7 @@ class HtmlConverterTest {
Three
Four
- """.trimIndent()
+ """.trimIndent(),
)
}
diff --git a/app/core/src/test/java/com/fsck/k9/message/html/HttpUriParserTest.java b/app/core/src/test/java/com/fsck/k9/message/html/HttpUriParserTest.java
deleted file mode 100644
index 2405c48a0819740afb0db991249ec46f099d7707..0000000000000000000000000000000000000000
--- a/app/core/src/test/java/com/fsck/k9/message/html/HttpUriParserTest.java
+++ /dev/null
@@ -1,312 +0,0 @@
-package com.fsck.k9.message.html;
-
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-
-public class HttpUriParserTest {
- private final HttpUriParser parser = new HttpUriParser();
-
-
- @Test
- public void emptyUriIgnored() {
- assertInvalidUri("http://");
- }
-
- @Test
- public void emptyAuthorityIgnored() {
- assertInvalidUri("http:///");
- }
-
- @Test
- public void simpleDomain() {
- assertValidUri("http://www.google.com");
- }
-
- @Test
- public void simpleDomainWithHttps() {
- assertValidUri("https://www.google.com");
- }
-
- @Test
- public void simpleRtspUri() {
- assertValidUri("rtsp://example.com/media.mp4");
- }
-
- @Test
- public void invalidDomainIgnored() {
- assertInvalidUri("http://-www.google.com");
- }
-
- @Test
- public void domainWithTrailingSlash() {
- assertValidUri("http://www.google.com/");
- }
-
- @Test
- public void domainWithUserInfo() {
- assertValidUri("http://test@google.com/");
- }
-
- @Test
- public void domainWithFullUserInfo() {
- assertValidUri("http://test:secret@google.com/");
- }
-
- @Test
- public void domainWithoutWww() {
- assertValidUri("http://google.com/");
- }
-
- @Test
- public void query() {
- assertValidUri("http://google.com/give/me/?q=mode&c=information");
- }
-
- @Test
- public void fragment() {
- assertValidUri("http://google.com/give/me#only-the-best");
- }
-
- @Test
- public void queryAndFragment() {
- assertValidUri("http://google.com/give/me/?q=mode&c=information#only-the-best");
- }
-
- @Test
- public void ipv4Address() {
- assertValidUri("http://127.0.0.1");
- }
-
- @Test
- public void ipv4AddressWithTrailingSlash() {
- assertValidUri("http://127.0.0.1/");
- }
-
- @Test
- public void ipv4AddressWithEmptyPort() {
- assertValidUri("http://127.0.0.1:");
- }
-
- @Test
- public void ipv4AddressWithPort() {
- assertValidUri("http://127.0.0.1:524/");
- }
-
- @Test
- public void ipv6Address() {
- assertValidUri("http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]");
- }
-
- @Test
- public void ipv6AddressWithPort() {
- assertValidUri("http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80");
- }
-
- @Test
- public void ipv6AddressWithTrailingSlash() {
- assertValidUri("http://[1080:0:0:0:8:800:200C:417A]/");
- }
-
- @Test
- public void ipv6AddressWithEndCompression() {
- assertValidUri("http://[3ffe:2a00:100:7031::1]");
- }
-
- @Test
- public void ipv6AddressWithBeginCompression() {
- assertValidUri("http://[1080::8:800:200C:417A]/");
- }
-
- @Test
- public void ipv6AddressWithCompressionPort() {
- assertValidUri("http://[::FFFF:129.144.52.38]:80/");
- }
-
- @Test
- public void ipv6AddressWithPrependedCompression() {
- assertValidUri("http://[::192.9.5.5]/");
- }
-
- @Test
- public void ipv6AddressWithTrailingIp4AndPort() {
- assertValidUri("http://[::192.9.5.5]:80/");
- }
-
- @Test
- public void ipv6WithoutClosingSquareBracketIgnored() {
- assertInvalidUri("http://[1080:0:0:0:8:80:200C:417A/");
- }
-
- @Test
- public void ipv6InvalidClosingSquareBracketIgnored() {
- assertInvalidUri("http://[1080:0:0:0:8:800:270C:417A/]");
- }
-
- @Test
- public void domainWithTrailingSpace() {
- String text = "http://google.com/ ";
-
- UriMatch uriMatch = parser.parseUri(text, 0);
-
- assertUriMatch("http://google.com/", uriMatch);
- }
-
- @Test
- public void domainWithTrailingNewline() {
- String text = "http://google.com/\n";
-
- UriMatch uriMatch = parser.parseUri(text, 0);
-
- assertUriMatch("http://google.com/", uriMatch);
- }
-
- @Test
- public void domainWithTrailingAngleBracket() {
- String text = "";
-
- UriMatch uriMatch = parser.parseUri(text, 1);
-
- assertUriMatch("http://google.com/", uriMatch, 1);
- }
-
- @Test
- public void uriInMiddleAfterInput() {
- String prefix = "prefix ";
- String uri = "http://google.com/";
- String text = prefix + uri;
-
- UriMatch uriMatch = parser.parseUri(text, prefix.length());
-
- assertUriMatch("http://google.com/", uriMatch, prefix.length());
- }
-
- @Test
- public void uriInMiddleOfInput() {
- String prefix = "prefix ";
- String uri = "http://google.com/";
- String postfix = " postfix";
- String text = prefix + uri + postfix;
-
- UriMatch uriMatch = parser.parseUri(text, prefix.length());
-
- assertUriMatch("http://google.com/", uriMatch, prefix.length());
- }
-
- @Test
- public void uriWrappedInParentheses() {
- String input = "(https://domain.example/)";
-
- UriMatch uriMatch = parser.parseUri(input, 1);
-
- assertUriMatch("https://domain.example/", uriMatch, 1);
- }
-
- @Test
- public void uriContainingParentheses() {
- String input = "https://domain.example/(parentheses)";
-
- UriMatch uriMatch = parser.parseUri(input, 0);
-
- assertUriMatch("https://domain.example/(parentheses)", uriMatch, 0);
- }
-
- @Test
- public void uriContainingParenthesesWrappedInParentheses() {
- String input = "(https://domain.example/(parentheses))";
-
- UriMatch uriMatch = parser.parseUri(input, 1);
-
- assertUriMatch("https://domain.example/(parentheses)", uriMatch, 1);
- }
-
- @Test
- public void uriEndingInDotAtEndOfText() {
- String input = "URL: https://domain.example/path.";
-
- UriMatch uriMatch = parser.parseUri(input, 5);
-
- assertUriMatch("https://domain.example/path", uriMatch, 5);
- }
-
-
- @Test
- public void uriEndingInDotWithAdditionalText() {
- String input = "URL: https://domain.example/path. Some other text";
-
- UriMatch uriMatch = parser.parseUri(input, 5);
-
- assertUriMatch("https://domain.example/path", uriMatch, 5);
- }
-
- @Test
- public void uriWrappedInAngleBracketsEndingInDot() {
- String input = "URL: ";
-
- UriMatch uriMatch = parser.parseUri(input, 6);
-
- assertUriMatch("https://domain.example/path.", uriMatch, 6);
- }
-
- @Test
- public void uriWrappedInParenthesesEndingInDot() {
- String input = "URL: (https://domain.example/path.)";
-
- UriMatch uriMatch = parser.parseUri(input, 6);
-
- assertUriMatch("https://domain.example/path.", uriMatch, 6);
- }
-
- @Test
- public void uriWrappedInParenthesesFollowedByADot() {
- String input = "URL: (https://domain.example/path).";
-
- UriMatch uriMatch = parser.parseUri(input, 6);
-
- assertUriMatch("https://domain.example/path", uriMatch, 6);
- }
-
- @Test
- public void uriWrappedInParenthesesFollowedByADotAndSomeOtherText() {
- String input = "URL: (https://domain.example/path). Some other text";
-
- UriMatch uriMatch = parser.parseUri(input, 6);
-
- assertUriMatch("https://domain.example/path", uriMatch, 6);
- }
-
- @Test
- public void uriWrappedInParenthesesFollowedByAQuestionMarkAndSomeOtherText() {
- String input = "URL: (https://domain.example/path)? Some other text";
-
- UriMatch uriMatch = parser.parseUri(input, 6);
-
- assertUriMatch("https://domain.example/path", uriMatch, 6);
- }
-
-
- private void assertValidUri(String uri) {
- UriMatch uriMatch = parser.parseUri(uri, 0);
- assertUriMatch(uri, uriMatch);
- }
-
- private void assertUriMatch(String uri, UriMatch uriMatch) {
- assertUriMatch(uri, uriMatch, 0);
- }
-
- private void assertUriMatch(String uri, UriMatch uriMatch, int offset) {
- assertNotNull(uriMatch);
- Assert.assertEquals(offset, uriMatch.getStartIndex());
- Assert.assertEquals(uri.length() + offset, uriMatch.getEndIndex());
- Assert.assertEquals(uri, uriMatch.getUri().toString());
- }
-
- private void assertInvalidUri(String uri) {
- UriMatch uriMatch = parser.parseUri(uri, 0);
- assertNull(uriMatch);
- }
-}
diff --git a/app/core/src/test/java/com/fsck/k9/message/html/HttpUriParserTest.kt b/app/core/src/test/java/com/fsck/k9/message/html/HttpUriParserTest.kt
new file mode 100644
index 0000000000000000000000000000000000000000..235b6c24f594c730d79b3bcbc79d161b5e5320f9
--- /dev/null
+++ b/app/core/src/test/java/com/fsck/k9/message/html/HttpUriParserTest.kt
@@ -0,0 +1,326 @@
+package com.fsck.k9.message.html
+
+import assertk.assertThat
+import assertk.assertions.hasMessage
+import assertk.assertions.isEqualTo
+import assertk.assertions.isFailure
+import assertk.assertions.isInstanceOf
+import assertk.assertions.isNotNull
+import assertk.assertions.isNull
+import org.junit.Test
+
+class HttpUriParserTest {
+ private val parser = HttpUriParser()
+
+ @Test
+ fun `missing domain`() {
+ assertInvalidUri("http://")
+ }
+
+ @Test
+ fun `missing domain followed by slash`() {
+ assertInvalidUri("http:///")
+ }
+
+ @Test
+ fun `simple domain`() {
+ assertValidUri("http://www.google.com")
+ }
+
+ @Test
+ fun `simple domain with https`() {
+ assertValidUri("https://www.google.com")
+ }
+
+ @Test
+ fun `simple RTSP URI`() {
+ assertValidUri("rtsp://example.com/media.mp4")
+ }
+
+ @Test
+ fun `subdomain starting with invalid character`() {
+ assertInvalidUri("http://-www.google.com")
+ }
+
+ @Test
+ fun `domain with trailing slash`() {
+ assertValidUri("http://www.google.com/")
+ }
+
+ @Test
+ fun `domain with user info`() {
+ assertValidUri("http://test@google.com/")
+ }
+
+ @Test
+ fun `domain with full user info`() {
+ assertValidUri("http://test:secret@google.com/")
+ }
+
+ @Test
+ fun `domain without www`() {
+ assertValidUri("http://google.com/")
+ }
+
+ @Test
+ fun query() {
+ assertValidUri("http://google.com/give/me/?q=mode&c=information")
+ }
+
+ @Test
+ fun fragment() {
+ assertValidUri("http://google.com/give/me#only-the-best")
+ }
+
+ @Test
+ fun `query and fragment`() {
+ assertValidUri("http://google.com/give/me/?q=mode&c=information#only-the-best")
+ }
+
+ @Test
+ fun `IPv4 address`() {
+ assertValidUri("http://127.0.0.1")
+ }
+
+ @Test
+ fun `IPv4 address with trailing slash`() {
+ assertValidUri("http://127.0.0.1/")
+ }
+
+ @Test
+ fun `IPv4 address with empty port`() {
+ assertValidUri("http://127.0.0.1:")
+ }
+
+ @Test
+ fun `IPv4 address with port`() {
+ assertValidUri("http://127.0.0.1:524/")
+ }
+
+ @Test
+ fun `IPv6 address`() {
+ assertValidUri("http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]")
+ }
+
+ @Test
+ fun `IPv6 address with port`() {
+ assertValidUri("http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80")
+ }
+
+ @Test
+ fun `IPv6 address with trailing slash`() {
+ assertValidUri("http://[1080:0:0:0:8:800:200C:417A]/")
+ }
+
+ @Test
+ fun `IPv6 address with end compression`() {
+ assertValidUri("http://[3ffe:2a00:100:7031::1]")
+ }
+
+ @Test
+ fun `IPv6 address with begin compression`() {
+ assertValidUri("http://[1080::8:800:200C:417A]/")
+ }
+
+ @Test
+ fun `IPv6 address with compression port`() {
+ assertValidUri("http://[::FFFF:129.144.52.38]:80/")
+ }
+
+ @Test
+ fun `IPv6 address with prepended compression`() {
+ assertValidUri("http://[::192.9.5.5]/")
+ }
+
+ @Test
+ fun `IPv6 address with trailing IP4 and port`() {
+ assertValidUri("http://[::192.9.5.5]:80/")
+ }
+
+ @Test
+ fun `IPv6 without closing square bracket`() {
+ assertInvalidUri("http://[1080:0:0:0:8:80:200C:417A/")
+ }
+
+ @Test
+ fun `IPv6 invalid closing square bracket`() {
+ assertInvalidUri("http://[1080:0:0:0:8:800:270C:417A/]")
+ }
+
+ @Test
+ fun `domain with trailing space`() {
+ val text = "http://google.com/ "
+
+ val uriMatch = parser.parseUri(text, 0)
+
+ assertUriMatch("http://google.com/", uriMatch)
+ }
+
+ @Test
+ fun `domain with trailing newline`() {
+ val text = "http://google.com/\n"
+
+ val uriMatch = parser.parseUri(text, 0)
+
+ assertUriMatch("http://google.com/", uriMatch)
+ }
+
+ @Test
+ fun `domain with trailing angle bracket`() {
+ val text = ""
+
+ val uriMatch = parser.parseUri(text, 1)
+
+ assertUriMatch("http://google.com/", uriMatch, 1)
+ }
+
+ @Test
+ fun `URI at the end of input`() {
+ val prefix = "prefix "
+ val uri = "http://google.com/"
+ val text = prefix + uri
+
+ val uriMatch = parser.parseUri(text, prefix.length)
+
+ assertUriMatch("http://google.com/", uriMatch, prefix.length)
+ }
+
+ @Test
+ fun `URI in middle of input`() {
+ val prefix = "prefix "
+ val uri = "http://google.com/"
+ val postfix = " postfix"
+ val text = prefix + uri + postfix
+
+ val uriMatch = parser.parseUri(text, prefix.length)
+
+ assertUriMatch("http://google.com/", uriMatch, prefix.length)
+ }
+
+ @Test
+ fun `URI wrapped in parentheses`() {
+ val input = "(https://domain.example/)"
+
+ val uriMatch = parser.parseUri(input, 1)
+
+ assertUriMatch("https://domain.example/", uriMatch, 1)
+ }
+
+ @Test
+ fun `URI containing parentheses`() {
+ val input = "https://domain.example/(parentheses)"
+
+ val uriMatch = parser.parseUri(input, 0)
+
+ assertUriMatch("https://domain.example/(parentheses)", uriMatch, 0)
+ }
+
+ @Test
+ fun `URI containing parentheses wrapped in parentheses`() {
+ val input = "(https://domain.example/(parentheses))"
+
+ val uriMatch = parser.parseUri(input, 1)
+
+ assertUriMatch("https://domain.example/(parentheses)", uriMatch, 1)
+ }
+
+ @Test
+ fun `URI ending in dot at end of text`() {
+ val input = "URL: https://domain.example/path."
+
+ val uriMatch = parser.parseUri(input, 5)
+
+ assertUriMatch("https://domain.example/path", uriMatch, 5)
+ }
+
+ @Test
+ fun `URI ending in dot with additional text`() {
+ val input = "URL: https://domain.example/path. Some other text"
+ val uriMatch = parser.parseUri(input, 5)
+ assertUriMatch("https://domain.example/path", uriMatch, 5)
+ }
+
+ @Test
+ fun `URI wrapped in angle brackets ending in dot`() {
+ val input = "URL: "
+
+ val uriMatch = parser.parseUri(input, 6)
+
+ assertUriMatch("https://domain.example/path.", uriMatch, 6)
+ }
+
+ @Test
+ fun `URI wrapped in parentheses ending in dot`() {
+ val input = "URL: (https://domain.example/path.)"
+
+ val uriMatch = parser.parseUri(input, 6)
+
+ assertUriMatch("https://domain.example/path.", uriMatch, 6)
+ }
+
+ @Test
+ fun `URI wrapped in parentheses followed by a dot`() {
+ val input = "URL: (https://domain.example/path)."
+
+ val uriMatch = parser.parseUri(input, 6)
+
+ assertUriMatch("https://domain.example/path", uriMatch, 6)
+ }
+
+ @Test
+ fun `URI wrapped in parentheses followed by a dot and some other text`() {
+ val input = "URL: (https://domain.example/path). Some other text"
+
+ val uriMatch = parser.parseUri(input, 6)
+
+ assertUriMatch("https://domain.example/path", uriMatch, 6)
+ }
+
+ @Test
+ fun `URI wrapped in parentheses followed by a question mark and some other text`() {
+ val input = "URL: (https://domain.example/path)? Some other text"
+
+ val uriMatch = parser.parseUri(input, 6)
+
+ assertUriMatch("https://domain.example/path", uriMatch, 6)
+ }
+
+ @Test
+ fun `negative 'startPos' value`() {
+ assertThat {
+ parser.parseUri("test", -1)
+ }.isFailure()
+ .isInstanceOf(IllegalArgumentException::class)
+ .hasMessage("Invalid 'startPos' value")
+ }
+
+ @Test
+ fun `out of bounds 'startPos' value`() {
+ assertThat {
+ parser.parseUri("test", 4)
+ }.isFailure()
+ .isInstanceOf(IllegalArgumentException::class)
+ .hasMessage("Invalid 'startPos' value")
+ }
+
+ private fun assertValidUri(uri: String) {
+ val uriMatch = parser.parseUri(uri, 0)
+
+ assertUriMatch(uri, uriMatch)
+ }
+
+ private fun assertUriMatch(uri: String, uriMatch: UriMatch?, offset: Int = 0) {
+ assertThat(uriMatch).isNotNull().isEqualTo(
+ UriMatch(
+ startIndex = offset,
+ endIndex = offset + uri.length,
+ uri = uri,
+ ),
+ )
+ }
+
+ private fun assertInvalidUri(uri: String) {
+ val uriMatch = parser.parseUri(uri, 0)
+ assertThat(uriMatch).isNull()
+ }
+}
diff --git a/app/core/src/test/java/com/fsck/k9/message/html/UriMatcherTest.java b/app/core/src/test/java/com/fsck/k9/message/html/UriMatcherTest.java
deleted file mode 100644
index fb03aee78630c056c726a10636d9410a107effab..0000000000000000000000000000000000000000
--- a/app/core/src/test/java/com/fsck/k9/message/html/UriMatcherTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.fsck.k9.message.html;
-
-
-import java.util.List;
-
-import org.junit.Test;
-
-import static com.google.common.truth.Truth.assertThat;
-
-
-public class UriMatcherTest {
- @Test
- public void emptyText() {
- assertNoMatch("");
- }
-
- @Test
- public void textWithoutUri() {
- assertNoMatch("some text here");
- }
-
- @Test
- public void simpleUri() {
- assertUrisFound("http://example.org", "http://example.org");
- }
-
- @Test
- public void uriPrecededBySpace() {
- assertUrisFound(" http://example.org", "http://example.org");
- }
-
- @Test
- public void uriPrecededByTab() {
- assertUrisFound("\thttp://example.org", "http://example.org");
- }
-
- @Test
- public void uriPrecededByOpeningParenthesis() {
- assertUrisFound("(http://example.org", "http://example.org");
- }
-
- @Test
- public void uriPrecededBySomeText() {
- assertUrisFound("Check out my fantastic URI: http://example.org", "http://example.org");
- }
-
- @Test
- public void uriWithTrailingText() {
- assertUrisFound("http://example.org/ is the best", "http://example.org/");
- }
-
- @Test
- public void uriEmbeddedInText() {
- assertUrisFound("prefix http://example.org/ suffix", "http://example.org/");
- }
-
- @Test
- public void uriWithUppercaseScheme() {
- assertUrisFound("HTTP://example.org/", "HTTP://example.org/");
- }
-
- @Test
- public void uriNotPrecededByValidSeparator() {
- assertNoMatch("myhttp://example.org");
- }
-
- @Test
- public void uriNotPrecededByValidSeparatorFollowedByValidUri() {
- assertUrisFound("myhttp: http://example.org", "http://example.org");
- }
-
- @Test
- public void schemaMatchWithInvalidUriInMiddleOfTextFollowedByValidUri() {
- assertUrisFound("prefix http:42 http://example.org", "http://example.org");
- }
-
- @Test
- public void multipleValidUrisInRow() {
- assertUrisFound("prefix http://uri1.example.org some text http://uri2.example.org/path postfix",
- "http://uri1.example.org", "http://uri2.example.org/path");
- }
-
-
- private void assertNoMatch(String text) {
- List uriMatches = UriMatcher.INSTANCE.findUris(text);
- assertThat(uriMatches).isEmpty();
- }
-
- private void assertUrisFound(String text, String... uris) {
- List uriMatches = UriMatcher.INSTANCE.findUris(text);
- assertThat(uriMatches).hasSize(uris.length);
-
- for (int i = 0, end = uris.length; i < end; i++) {
- String uri = uris[i];
- int startIndex = text.indexOf(uri);
- assertThat(startIndex).isNotEqualTo(-1);
-
- UriMatch uriMatch = uriMatches.get(i);
- assertThat(uriMatch.getStartIndex()).isEqualTo(startIndex);
- assertThat(uriMatch.getEndIndex()).isEqualTo(startIndex + uri.length());
- assertThat(uriMatch.getUri()).isEqualTo(uri);
- }
- }
-}
diff --git a/app/core/src/test/java/com/fsck/k9/message/html/UriMatcherTest.kt b/app/core/src/test/java/com/fsck/k9/message/html/UriMatcherTest.kt
new file mode 100644
index 0000000000000000000000000000000000000000..fd0b02ecd34121771a79615370474c3f32b7ad9d
--- /dev/null
+++ b/app/core/src/test/java/com/fsck/k9/message/html/UriMatcherTest.kt
@@ -0,0 +1,106 @@
+package com.fsck.k9.message.html
+
+import assertk.assertThat
+import assertk.assertions.hasSize
+import assertk.assertions.isEmpty
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotEqualTo
+import org.junit.Test
+
+class UriMatcherTest {
+ @Test
+ fun emptyText() {
+ assertNoMatch("")
+ }
+
+ @Test
+ fun textWithoutUri() {
+ assertNoMatch("some text here")
+ }
+
+ @Test
+ fun simpleUri() {
+ assertUrisFound("http://example.org", "http://example.org")
+ }
+
+ @Test
+ fun uriPrecededBySpace() {
+ assertUrisFound(" http://example.org", "http://example.org")
+ }
+
+ @Test
+ fun uriPrecededByTab() {
+ assertUrisFound("\thttp://example.org", "http://example.org")
+ }
+
+ @Test
+ fun uriPrecededByOpeningParenthesis() {
+ assertUrisFound("(http://example.org", "http://example.org")
+ }
+
+ @Test
+ fun uriPrecededBySomeText() {
+ assertUrisFound("Check out my fantastic URI: http://example.org", "http://example.org")
+ }
+
+ @Test
+ fun uriWithTrailingText() {
+ assertUrisFound("http://example.org/ is the best", "http://example.org/")
+ }
+
+ @Test
+ fun uriEmbeddedInText() {
+ assertUrisFound("prefix http://example.org/ suffix", "http://example.org/")
+ }
+
+ @Test
+ fun uriWithUppercaseScheme() {
+ assertUrisFound("HTTP://example.org/", "HTTP://example.org/")
+ }
+
+ @Test
+ fun uriNotPrecededByValidSeparator() {
+ assertNoMatch("myhttp://example.org")
+ }
+
+ @Test
+ fun uriNotPrecededByValidSeparatorFollowedByValidUri() {
+ assertUrisFound("myhttp: http://example.org", "http://example.org")
+ }
+
+ @Test
+ fun schemaMatchWithInvalidUriInMiddleOfTextFollowedByValidUri() {
+ assertUrisFound("prefix http:42 http://example.org", "http://example.org")
+ }
+
+ @Test
+ fun multipleValidUrisInRow() {
+ assertUrisFound(
+ "prefix http://uri1.example.org some text http://uri2.example.org/path postfix",
+ "http://uri1.example.org",
+ "http://uri2.example.org/path",
+ )
+ }
+
+ private fun assertNoMatch(text: String) {
+ val uriMatches = UriMatcher.findUris(text)
+ assertThat(uriMatches).isEmpty()
+ }
+
+ private fun assertUrisFound(text: String, vararg uris: String) {
+ val uriMatches = UriMatcher.findUris(text)
+ assertThat(uriMatches).hasSize(uris.size)
+ var i = 0
+ val end = uris.size
+ while (i < end) {
+ val uri = uris[i]
+ val startIndex = text.indexOf(uri)
+ assertThat(startIndex).isNotEqualTo(-1)
+ val uriMatch = uriMatches[i]
+ assertThat(uriMatch.startIndex).isEqualTo(startIndex)
+ assertThat(uriMatch.endIndex).isEqualTo(startIndex + uri.length)
+ assertThat(uriMatch.uri).isEqualTo(uri)
+ i++
+ }
+ }
+}
diff --git a/app/core/src/test/java/com/fsck/k9/message/quote/QuoteDateFormatterTest.kt b/app/core/src/test/java/com/fsck/k9/message/quote/QuoteDateFormatterTest.kt
index 7c4327e72a5165679b2ed90c5fd3bcb7ddfdbee9..635f785285f351abc479e007afbb84ac670fed71 100644
--- a/app/core/src/test/java/com/fsck/k9/message/quote/QuoteDateFormatterTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/quote/QuoteDateFormatterTest.kt
@@ -1,7 +1,8 @@
package com.fsck.k9.message.quote
+import assertk.assertThat
+import assertk.assertions.isEqualTo
import com.fsck.k9.K9
-import com.google.common.truth.Truth.assertThat
import java.time.ZonedDateTime
import java.util.Date
import java.util.Locale
diff --git a/app/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt b/app/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt
index 97a39b26ea9dbf34f7285c21f84c7c18b2692d79..aa5f4287c17de75c20e0943672c32deb8d55294d 100644
--- a/app/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt
@@ -1,5 +1,7 @@
package com.fsck.k9.message.quote
+import assertk.assertThat
+import assertk.assertions.isEqualTo
import com.fsck.k9.Account.QuoteStyle
import com.fsck.k9.RobolectricTest
import com.fsck.k9.TestCoreResourceProvider
@@ -7,7 +9,6 @@ import com.fsck.k9.mail.Address
import com.fsck.k9.mail.Message
import com.fsck.k9.mail.Message.RecipientType
import com.fsck.k9.mail.crlf
-import com.google.common.truth.Truth.assertThat
import java.util.Date
import org.junit.Test
import org.mockito.kotlin.doReturn
@@ -42,7 +43,7 @@ class TextQuoteCreatorTest : RobolectricTest() {
> Line 1
> Line 2
> Line 3
- """.trimIndent().crlf()
+ """.trimIndent().crlf(),
)
}
@@ -59,7 +60,7 @@ class TextQuoteCreatorTest : RobolectricTest() {
On January 18, 1970 7:53:41 PM UTC, Alice wrote:
$1\t Line 1
$1\t Line 2
- """.trimIndent().crlf()
+ """.trimIndent().crlf(),
)
}
@@ -80,7 +81,7 @@ class TextQuoteCreatorTest : RobolectricTest() {
On January 18, 1970 7:53:41 PM UTC, Alice wrote:
> [-------] [-------] [-------] [-------] [-------] [-------] [-------] [-------] [-------] [-------]
> [-------------------------------------------------------------------------------------------------]
- """.trimIndent().crlf()
+ """.trimIndent().crlf(),
)
}
@@ -103,7 +104,7 @@ class TextQuoteCreatorTest : RobolectricTest() {
Line 1
Line 2
Line 3
- """.trimIndent().crlf()
+ """.trimIndent().crlf(),
)
}
diff --git a/app/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt b/app/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt
index f9ca1af7d4d848363a831152e038d51d62b5cfc7..932f192ae859b64fac9a5d81b92cd8a7b6a3b3c6 100644
--- a/app/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt
@@ -1,9 +1,10 @@
package com.fsck.k9.message.signature
+import assertk.assertThat
+import assertk.assertions.isEqualTo
import com.fsck.k9.message.html.HtmlHelper.extractText
import com.fsck.k9.message.signature.HtmlSignatureRemover.Companion.stripSignature
import com.fsck.k9.testing.removeNewlines
-import com.google.common.truth.Truth.assertThat
import org.junit.Test
class HtmlSignatureRemoverTest {
@@ -58,7 +59,7 @@ class HtmlSignatureRemoverTest {
val withoutSignature = stripSignature(html)
assertThat(withoutSignature).isEqualTo(
- """This is the body text
"""
+ """This is the body text
""",
)
}
@@ -114,7 +115,7 @@ class HtmlSignatureRemoverTest {
This is the body text