diff --git a/.editorconfig b/.editorconfig index 59d1f7aa84..8ca2b5a395 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,8 @@ root = true -[*.kt] +[*.{kt,kts}] indent_size = 2 +ij_kotlin_allow_trailing_comma_on_call_site = false +ij_kotlin_allow_trailing_comma = false +ktlint_code_style = intellij_idea twitter_compose_allowed_composition_locals=LocalExtendedColors \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 8143c42e95..8afe9b3d22 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,8 +42,7 @@ wire { } ktlint { - // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507 - version = "0.47.1" + version = "0.49.1" } def canonicalVersionCode = 1283 diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt index ac4dc97d14..a28483185f 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt @@ -47,6 +47,7 @@ import org.whispersystems.signalservice.api.push.ServiceId import java.util.Optional import java.util.UUID +@Suppress("ClassName") @RunWith(AndroidJUnit4::class) class RecipientTableTest_getAndPossiblyMerge { diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowState.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowState.kt index b101e40b06..a33c4b8308 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowState.kt @@ -23,6 +23,6 @@ data class GiftFlowState( RECIPIENT_VERIFICATION, TOKEN_REQUEST, PAYMENT_PIPELINE, - FAILURE; + FAILURE } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt index 4bc6bedba7..3bc229086c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt @@ -1188,7 +1188,8 @@ class ConversationFragment : } private fun updateLinkPreviewState() { - if (/* TODO [cfv2] -- viewModel.isPushAvailable && */ !attachmentManager.isAttachmentPresent && context != null) { + // TODO [cfv2] include viewModel.isPushAvailable && in check + if (!attachmentManager.isAttachmentPresent && context != null) { linkPreviewViewModel.onEnabled() linkPreviewViewModel.onTextChanged(composeText.textTrimmed.toString(), composeText.selectionStart, composeText.selectionEnd) } else { @@ -2185,7 +2186,7 @@ class ConversationFragment : } val conversationItem: ConversationItem = itemView - val isAttachmentKeyboardOpen = false /* TODO [cfv2] -- isAttachmentKeyboardOpen */ + val isAttachmentKeyboardOpen = false // TODO [cfv2] -- isAttachmentKeyboardOpen handleReaction( item.conversationMessage, ReactionsToolbarListener(item.conversationMessage), diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationFilterLatch.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationFilterLatch.kt index e67f79f201..c14d1e47dc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationFilterLatch.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationFilterLatch.kt @@ -6,5 +6,5 @@ package org.thoughtcrime.securesms.conversationlist */ enum class ConversationFilterLatch { SET, - RESET; + RESET } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/FilterPullState.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/FilterPullState.kt index 68541e925b..9388ec54e5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/FilterPullState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/FilterPullState.kt @@ -40,5 +40,5 @@ enum class FilterPullState { /** * The filter is being removed and the animation is running */ - CLOSING; + CLOSING } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt index 23892a585b..9dbcaba1bf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt @@ -1428,7 +1428,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT } enum class MemberSet(val includeSelf: Boolean, val includePending: Boolean) { - FULL_MEMBERS_INCLUDING_SELF(true, false), FULL_MEMBERS_EXCLUDING_SELF(false, false), FULL_MEMBERS_AND_PENDING_INCLUDING_SELF(true, true), FULL_MEMBERS_AND_PENDING_EXCLUDING_SELF(false, true); + FULL_MEMBERS_INCLUDING_SELF(true, false), FULL_MEMBERS_EXCLUDING_SELF(false, false), FULL_MEMBERS_AND_PENDING_INCLUDING_SELF(true, true), FULL_MEMBERS_AND_PENDING_EXCLUDING_SELF(false, true) } /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt index 6d0bc551d7..86c7e0064a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt @@ -4929,7 +4929,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat protected enum class ReceiptType(val columnName: String, val groupStatus: Int) { READ(READ_RECEIPT_COUNT, GroupReceiptTable.STATUS_READ), DELIVERY(DELIVERY_RECEIPT_COUNT, GroupReceiptTable.STATUS_DELIVERED), - VIEWED(VIEWED_RECEIPT_COUNT, GroupReceiptTable.STATUS_VIEWED); + VIEWED(VIEWED_RECEIPT_COUNT, GroupReceiptTable.STATUS_VIEWED) } data class SyncMessageId( diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherErrorHandler.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherErrorHandler.kt index 962aee97ae..d51cd42290 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherErrorHandler.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherErrorHandler.kt @@ -16,6 +16,7 @@ import java.util.concurrent.atomic.AtomicReference /** * The default error handler wipes the file. This one instead prints some diagnostics and then crashes so the original corrupt file isn't lost. */ +@Suppress("ClassName") class SqlCipherErrorHandler(private val databaseName: String) : DatabaseErrorHandler { override fun onCorruption(db: SQLiteDatabase, message: String) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V150_UrgentMslFlagMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V150_UrgentMslFlagMigration.kt index 6fbe2845b1..94e61be153 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V150_UrgentMslFlagMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V150_UrgentMslFlagMigration.kt @@ -7,6 +7,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase * Adding an urgent flag to message envelopes to help with notifications. Need to track flag in * MSL table so can be resent with the correct urgency. */ +@Suppress("ClassName") object V150_UrgentMslFlagMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL("ALTER TABLE msl_payload ADD COLUMN urgent INTEGER NOT NULL DEFAULT 1") diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V151_MyStoryMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V151_MyStoryMigration.kt index 5b6e0a3b3d..c0392866b8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V151_MyStoryMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V151_MyStoryMigration.kt @@ -13,6 +13,7 @@ import org.thoughtcrime.securesms.util.Base64 /** * Performs a check and ensures that MyStory exists at the correct distribution list id and correct distribution id. */ +@Suppress("ClassName") object V151_MyStoryMigration : SignalDatabaseMigration { private val TAG = Log.tag(V151_MyStoryMigration::class.java) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V152_StoryGroupTypesMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V152_StoryGroupTypesMigration.kt index c9816572bc..2e976166d4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V152_StoryGroupTypesMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V152_StoryGroupTypesMigration.kt @@ -6,6 +6,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase /** * Marks story recipients with a new group type constant. */ +@Suppress("ClassName") object V152_StoryGroupTypesMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL( diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V153_MyStoryMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V153_MyStoryMigration.kt index cae9974c7a..93b5be18ea 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V153_MyStoryMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V153_MyStoryMigration.kt @@ -13,6 +13,7 @@ import org.thoughtcrime.securesms.util.Base64 /** * Performs a check and ensures that MyStory exists at the correct distribution list id and correct distribution id. */ +@Suppress("ClassName") object V153_MyStoryMigration : SignalDatabaseMigration { private val TAG = Log.tag(V153_MyStoryMigration::class.java) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V154_PniSignaturesMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V154_PniSignaturesMigration.kt index 418aeafc9c..23998c6b21 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V154_PniSignaturesMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V154_PniSignaturesMigration.kt @@ -6,6 +6,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase /** * Introduces the tables and fields required to keep track of whether we need to send a PNI signature message and if the ones we've sent out have been received. */ +@Suppress("ClassName") object V154_PniSignaturesMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V155_SmsExporterMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V155_SmsExporterMigration.kt index ccf9680052..e6e0831914 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V155_SmsExporterMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V155_SmsExporterMigration.kt @@ -6,6 +6,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase /** * Adds necessary book-keeping columns to SMS and MMS tables for SMS export. */ +@Suppress("ClassName") object V155_SmsExporterMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL("ALTER TABLE mms ADD COLUMN export_state BLOB DEFAULT NULL") diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V156_RecipientUnregisteredTimestampMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V156_RecipientUnregisteredTimestampMigration.kt index 16f60c79b7..a84a466d8d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V156_RecipientUnregisteredTimestampMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V156_RecipientUnregisteredTimestampMigration.kt @@ -9,6 +9,7 @@ import java.util.concurrent.TimeUnit * Adds an 'unregistered timestamp' on a recipient to keep track of when they became unregistered. * Also updates all currently-unregistered users to have an unregistered time of "now". */ +@Suppress("ClassName") object V156_RecipientUnregisteredTimestampMigration : SignalDatabaseMigration { const val UNREGISTERED = 2 diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V157_RecipeintHiddenMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V157_RecipeintHiddenMigration.kt index 7dfec71f62..a1e4ffc1b5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V157_RecipeintHiddenMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V157_RecipeintHiddenMigration.kt @@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.database.helpers.migration import android.app.Application import net.zetetic.database.sqlcipher.SQLiteDatabase +@Suppress("ClassName") object V157_RecipeintHiddenMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL("ALTER TABLE recipient ADD COLUMN hidden INTEGER DEFAULT 0") diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V158_GroupsLastForceUpdateTimestampMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V158_GroupsLastForceUpdateTimestampMigration.kt index 8cac5cf3ea..c89f41b6a5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V158_GroupsLastForceUpdateTimestampMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V158_GroupsLastForceUpdateTimestampMigration.kt @@ -6,6 +6,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase /** * Track last time we did a forced sanity check for this group with the server. */ +@Suppress("ClassName") object V158_GroupsLastForceUpdateTimestampMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL("ALTER TABLE groups ADD COLUMN last_force_update_timestamp INTEGER DEFAULT 0") diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V159_ThreadUnreadSelfMentionCount.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V159_ThreadUnreadSelfMentionCount.kt index 4fe845544c..f7dc51d0c4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V159_ThreadUnreadSelfMentionCount.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V159_ThreadUnreadSelfMentionCount.kt @@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.database.helpers.migration import android.app.Application import net.zetetic.database.sqlcipher.SQLiteDatabase +@Suppress("ClassName") object V159_ThreadUnreadSelfMentionCount : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL("ALTER TABLE thread ADD COLUMN unread_self_mention_count INTEGER DEFAULT 0") diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V160_SmsMmsExportedIndexMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V160_SmsMmsExportedIndexMigration.kt index e93bc42c42..7fd0a530ab 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V160_SmsMmsExportedIndexMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V160_SmsMmsExportedIndexMigration.kt @@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.database.helpers.migration import android.app.Application import net.zetetic.database.sqlcipher.SQLiteDatabase +@Suppress("ClassName") object V160_SmsMmsExportedIndexMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL("CREATE INDEX IF NOT EXISTS sms_exported_index ON sms (exported)") diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V161_StorySendMessageIdIndex.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V161_StorySendMessageIdIndex.kt index 2e66f32237..27d414e0b4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V161_StorySendMessageIdIndex.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V161_StorySendMessageIdIndex.kt @@ -6,6 +6,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase /** * Adds an index to the story sends table to help with a new common query. */ +@Suppress("ClassName") object V161_StorySendMessageIdIndex : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL("CREATE INDEX IF NOT EXISTS story_sends_message_id_distribution_id_index ON story_sends (message_id, distribution_id)") diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V162_ThreadUnreadSelfMentionCountFixup.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V162_ThreadUnreadSelfMentionCountFixup.kt index 273ca3a83a..301cea626c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V162_ThreadUnreadSelfMentionCountFixup.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V162_ThreadUnreadSelfMentionCountFixup.kt @@ -10,6 +10,7 @@ import org.thoughtcrime.securesms.database.helpers.SignalDatabaseMigrations * A bad cherry-pick for a database change requires us to attempt to alter the table again * to fix it. */ +@Suppress("ClassName") object V162_ThreadUnreadSelfMentionCountFixup : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V163_RemoteMegaphoneSnoozeSupportMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V163_RemoteMegaphoneSnoozeSupportMigration.kt index 7a7cdc714f..2da677575f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V163_RemoteMegaphoneSnoozeSupportMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V163_RemoteMegaphoneSnoozeSupportMigration.kt @@ -7,6 +7,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase /** * Add columns needed to track remote megaphone specific snooze rates. */ +@Suppress("ClassName") object V163_RemoteMegaphoneSnoozeSupportMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { if (columnMissing(db, "primary_action_data")) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V164_ThreadDatabaseReadIndexMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V164_ThreadDatabaseReadIndexMigration.kt index 0af825aba4..4ef7378082 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V164_ThreadDatabaseReadIndexMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V164_ThreadDatabaseReadIndexMigration.kt @@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.database.helpers.migration import android.app.Application import net.zetetic.database.sqlcipher.SQLiteDatabase +@Suppress("ClassName") object V164_ThreadDatabaseReadIndexMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL("CREATE INDEX IF NOT EXISTS thread_read ON thread (read);") diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V166_ThreadAndMessageForeignKeys.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V166_ThreadAndMessageForeignKeys.kt index dc38e56ecf..6ac6c6839a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V166_ThreadAndMessageForeignKeys.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V166_ThreadAndMessageForeignKeys.kt @@ -14,6 +14,7 @@ import org.signal.core.util.update * This one's a doozy. We want to add additional foreign key constraints between the thread, recipient, and message tables. This will let us know for sure * that there aren't threads with invalid recipients, or messages with invalid threads, or multiple threads for the same recipient. */ +@Suppress("ClassName") object V166_ThreadAndMessageForeignKeys : SignalDatabaseMigration { private val TAG = Log.tag(V166_ThreadAndMessageForeignKeys::class.java) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V167_RecreateReactionTriggers.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V167_RecreateReactionTriggers.kt index a87bfc3834..5253879b83 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V167_RecreateReactionTriggers.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V167_RecreateReactionTriggers.kt @@ -6,6 +6,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase /** * Forgot to recreate the triggers for the reactions table in [V166_ThreadAndMessageForeignKeys]. So we gotta fix stuff up and do it here. */ +@Suppress("ClassName") object V167_RecreateReactionTriggers : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL( diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V168_SingleMessageTableMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V168_SingleMessageTableMigration.kt index 4b78e65f96..317ff73d5c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V168_SingleMessageTableMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V168_SingleMessageTableMigration.kt @@ -7,6 +7,7 @@ import org.signal.core.util.Stopwatch import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.keyvalue.SignalStore +@Suppress("ClassName") object V168_SingleMessageTableMigration : SignalDatabaseMigration { private val TAG = Log.tag(V168_SingleMessageTableMigration::class.java) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V169_EmojiSearchIndexRank.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V169_EmojiSearchIndexRank.kt index 40fafa0eda..fc980d54b6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V169_EmojiSearchIndexRank.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V169_EmojiSearchIndexRank.kt @@ -7,6 +7,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase * We want to add a new `rank` column to the emoji_search table, and we no longer use it as an FTS * table, so we can get rid of that too. */ +@Suppress("ClassName") object V169_EmojiSearchIndexRank : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL( diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V171_ThreadForeignKeyFix.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V171_ThreadForeignKeyFix.kt index 9ca79cfe2b..27af1faf50 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V171_ThreadForeignKeyFix.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V171_ThreadForeignKeyFix.kt @@ -13,6 +13,7 @@ import org.signal.core.util.update * When we ran [V166_ThreadAndMessageForeignKeys], we forgot to update the actual table definition in [ThreadTable]. * We could make this conditional, but I'd rather run it on everyone just so it's more predictable. */ +@Suppress("ClassName") object V171_ThreadForeignKeyFix : SignalDatabaseMigration { private val TAG = Log.tag(V171_ThreadForeignKeyFix::class.java) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V173_ScheduledMessagesMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V173_ScheduledMessagesMigration.kt index 690eab7db3..ba95e1c814 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V173_ScheduledMessagesMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V173_ScheduledMessagesMigration.kt @@ -7,6 +7,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase * In order to support scheduled sending, we need to add another column to keep track of when to send the message. We also use this * column to hide future scheduled messages from views. */ +@Suppress("ClassName") object V173_ScheduledMessagesMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL("ALTER TABLE mms ADD COLUMN scheduled_date INTEGER DEFAULT -1") diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V176_AddScheduledDateToQuoteIndex.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V176_AddScheduledDateToQuoteIndex.kt index 26f10bc810..41c218616a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V176_AddScheduledDateToQuoteIndex.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V176_AddScheduledDateToQuoteIndex.kt @@ -6,6 +6,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase /** * Expand quote index to included scheduled date so they can be excluded. */ +@Suppress("ClassName") object V176_AddScheduledDateToQuoteIndex : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL("DROP INDEX IF EXISTS mms_quote_id_quote_author_index") diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V178_ReportingTokenColumnMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V178_ReportingTokenColumnMigration.kt index 4f8cb91852..25995337fc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V178_ReportingTokenColumnMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V178_ReportingTokenColumnMigration.kt @@ -6,6 +6,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase /** * This adds a column to the Recipients table to store a spam reporting token. */ +@Suppress("ClassName") object V178_ReportingTokenColumnMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL("ALTER TABLE recipient ADD COLUMN reporting_token BLOB DEFAULT NULL") diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V179_CleanupDanglingMessageSendLogMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V179_CleanupDanglingMessageSendLogMigration.kt index 6ff95407cf..8ab7ad455e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V179_CleanupDanglingMessageSendLogMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V179_CleanupDanglingMessageSendLogMigration.kt @@ -6,6 +6,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase /** * This cleans up some MSL entries that we left behind during a bad past migration. */ +@Suppress("ClassName") object V179_CleanupDanglingMessageSendLogMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL("DELETE FROM msl_message WHERE payload_id NOT IN (SELECT _id FROM msl_payload)") diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V180_RecipientNicknameMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V180_RecipientNicknameMigration.kt index 1c8a3fc9b6..4aa1dfd584 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V180_RecipientNicknameMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V180_RecipientNicknameMigration.kt @@ -6,6 +6,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase /** * Adds support for storing the systemNickname from storage service. */ +@Suppress("ClassName") object V180_RecipientNicknameMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL("ALTER TABLE recipient ADD COLUMN system_nickname TEXT DEFAULT NULL") diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V181_ThreadTableForeignKeyCleanup.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V181_ThreadTableForeignKeyCleanup.kt index 88a3731a7c..197603add9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V181_ThreadTableForeignKeyCleanup.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V181_ThreadTableForeignKeyCleanup.kt @@ -9,6 +9,7 @@ import org.signal.core.util.logging.Log * We saw evidence (via failed backup restores) that some people have recipients in their thread table that do not exist in the recipient table. * This is likely the result of a bad past migration, since a foreign key is in place. Cleaning it up now. */ +@Suppress("ClassName") object V181_ThreadTableForeignKeyCleanup : SignalDatabaseMigration { val TAG = Log.tag(V181_ThreadTableForeignKeyCleanup::class.java) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V182_CallTableMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V182_CallTableMigration.kt index c8dba43e9c..7033d66cec 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V182_CallTableMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V182_CallTableMigration.kt @@ -16,6 +16,7 @@ import org.thoughtcrime.securesms.database.RecipientTable * Removes the 'NOT NULL' condition on message_id and peer, as with ad-hoc calling in place, these * can now be null. */ +@Suppress("ClassName") object V182_CallTableMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL( diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V183_CallLinkTableMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V183_CallLinkTableMigration.kt index 09d9db7013..2fc303bc64 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V183_CallLinkTableMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V183_CallLinkTableMigration.kt @@ -6,6 +6,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase /** * Adds the CallLinkTable and modifies the CallTable to include an FK into it. */ +@Suppress("ClassName") object V183_CallLinkTableMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL("CREATE TABLE call_link (_id INTEGER PRIMARY KEY)") diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V184_CallLinkReplaceIndexMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V184_CallLinkReplaceIndexMigration.kt index 74caef6a6b..d1cafce082 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V184_CallLinkReplaceIndexMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V184_CallLinkReplaceIndexMigration.kt @@ -6,6 +6,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase /** * [V183_CallLinkTableMigration] accidentally setup a unique constraint incorrectly and missed an index. This fixes it. */ +@Suppress("ClassName") object V184_CallLinkReplaceIndexMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL( diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V185_MessageRecipientsAndEditMessageMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V185_MessageRecipientsAndEditMessageMigration.kt index 393793a7f0..b55bf2b411 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V185_MessageRecipientsAndEditMessageMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V185_MessageRecipientsAndEditMessageMigration.kt @@ -30,6 +30,7 @@ import org.whispersystems.signalservice.api.push.ACI * Changes needed for edit message. New foreign keys require recreating the table. * */ +@Suppress("ClassName") object V185_MessageRecipientsAndEditMessageMigration : SignalDatabaseMigration { private val TAG = Log.tag(V185_MessageRecipientsAndEditMessageMigration::class.java) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V186_ForeignKeyIndicesMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V186_ForeignKeyIndicesMigration.kt index fad3c0fcd9..bcdc570c62 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V186_ForeignKeyIndicesMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V186_ForeignKeyIndicesMigration.kt @@ -19,6 +19,7 @@ import org.signal.core.util.requireNonNullString * * While I was at it, I looked at other columns that would need indices as well. */ +@Suppress("ClassName") object V186_ForeignKeyIndicesMigration : SignalDatabaseMigration { private val TAG = Log.tag(V186_ForeignKeyIndicesMigration::class.java) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V187_MoreForeignKeyIndexesMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V187_MoreForeignKeyIndexesMigration.kt index 1c2dc2e66f..fbaadc2f57 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V187_MoreForeignKeyIndexesMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V187_MoreForeignKeyIndexesMigration.kt @@ -8,6 +8,7 @@ import org.signal.core.util.logging.Log /** * I found some other tables that didn't have the proper indexes setup to correspond with their foreign keys. */ +@Suppress("ClassName") object V187_MoreForeignKeyIndexesMigration : SignalDatabaseMigration { private val TAG = Log.tag(V187_MoreForeignKeyIndexesMigration::class.java) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V188_FixMessageRecipientsAndEditMessageMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V188_FixMessageRecipientsAndEditMessageMigration.kt index 5aa007b053..ba6f3a101b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V188_FixMessageRecipientsAndEditMessageMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V188_FixMessageRecipientsAndEditMessageMigration.kt @@ -34,6 +34,7 @@ import org.whispersystems.signalservice.api.push.ACI * the concept of a self. To do that, we're going to create a placeholder for self with a special ID (-2), and then * we're going to replace that ID with the true self after it's been created. */ +@Suppress("ClassName") object V188_FixMessageRecipientsAndEditMessageMigration : SignalDatabaseMigration { private val TAG = Log.tag(V188_FixMessageRecipientsAndEditMessageMigration::class.java) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V189_CreateCallLinkTableColumnsAndRebuildFKReference.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V189_CreateCallLinkTableColumnsAndRebuildFKReference.kt index adb234090c..122fc2325e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V189_CreateCallLinkTableColumnsAndRebuildFKReference.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V189_CreateCallLinkTableColumnsAndRebuildFKReference.kt @@ -12,6 +12,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase * Fleshes out the call link table and rebuilds the call event table. * At this point, there should be no records in the call link database. */ +@Suppress("ClassName") object V189_CreateCallLinkTableColumnsAndRebuildFKReference : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL( diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V190_UniqueMessageMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V190_UniqueMessageMigration.kt index 1c8dde7970..d472edfebd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V190_UniqueMessageMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V190_UniqueMessageMigration.kt @@ -7,6 +7,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase * This migration used to do what [V191_UniqueMessageMigrationV2] does. However, due to bugs, the migration was abandoned. * We now re-do the migration in V191. */ +@Suppress("ClassName") object V190_UniqueMessageMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) = Unit } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V191_UniqueMessageMigrationV2.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V191_UniqueMessageMigrationV2.kt index 6ce1951e39..e1f107ca1b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V191_UniqueMessageMigrationV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V191_UniqueMessageMigrationV2.kt @@ -15,6 +15,7 @@ import org.signal.core.util.requireLong * * This migration safely removes those dupes, and then adds the desired unique constraint. */ +@Suppress("ClassName") object V191_UniqueMessageMigrationV2 : SignalDatabaseMigration { private val TAG = Log.tag(V191_UniqueMessageMigrationV2::class.java) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V192_CallLinkTableNullableRootKeys.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V192_CallLinkTableNullableRootKeys.kt index 360c6f954a..31c10b3518 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V192_CallLinkTableNullableRootKeys.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V192_CallLinkTableNullableRootKeys.kt @@ -13,6 +13,7 @@ import org.signal.core.util.logging.Log /** * Allow ROOT_KEY in CallLinkTable to be null. */ +@Suppress("ClassName") object V192_CallLinkTableNullableRootKeys : SignalDatabaseMigration { private val TAG = Log.tag(V192_CallLinkTableNullableRootKeys::class.java) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V193_BackCallLinksWithRecipient.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V193_BackCallLinksWithRecipient.kt index bec7522f88..5d6ff79ba0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V193_BackCallLinksWithRecipient.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V193_BackCallLinksWithRecipient.kt @@ -11,6 +11,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase /** * Due to a bug, this has been replaced by [V196_BackCallLinksWithRecipientV2] */ +@Suppress("ClassName") object V193_BackCallLinksWithRecipient : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) = Unit diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V194_KyberPreKeyMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V194_KyberPreKeyMigration.kt index e9d5067b3b..7894774fb6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V194_KyberPreKeyMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V194_KyberPreKeyMigration.kt @@ -11,6 +11,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase /** * Introduces [org.thoughtcrime.securesms.database.KyberPreKeyTable]. */ +@Suppress("ClassName") object V194_KyberPreKeyMigration : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL( diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V195_GroupMemberForeignKeyMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V195_GroupMemberForeignKeyMigration.kt index cf36f287f5..036836e097 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V195_GroupMemberForeignKeyMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V195_GroupMemberForeignKeyMigration.kt @@ -17,6 +17,7 @@ import org.signal.core.util.requireLong * Back CallLinks with a Recipient to ease integration and ensure we can support * different features which would require that relation in the future. */ +@Suppress("ClassName") object V195_GroupMemberForeignKeyMigration : SignalDatabaseMigration { private val TAG = Log.tag(V195_GroupMemberForeignKeyMigration::class.java) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V196_BackCallLinksWithRecipientV2.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V196_BackCallLinksWithRecipientV2.kt index e497275196..52aa1d2888 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V196_BackCallLinksWithRecipientV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V196_BackCallLinksWithRecipientV2.kt @@ -13,6 +13,7 @@ import org.signal.core.util.logging.Log /** * Cleans up the call events table and restricts peer to non-null. */ +@Suppress("ClassName") object V196_BackCallLinksWithRecipientV2 : SignalDatabaseMigration { private val TAG = Log.tag(V196_BackCallLinksWithRecipientV2::class.java) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V197_DropAvatarColorFromCallLinks.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V197_DropAvatarColorFromCallLinks.kt index c0b8306041..72d7bf39aa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V197_DropAvatarColorFromCallLinks.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V197_DropAvatarColorFromCallLinks.kt @@ -11,6 +11,7 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase /** * Because getting the color is a simple modulo operation, there is no need to store it in the database. */ +@Suppress("ClassName") object V197_DropAvatarColorFromCallLinks : SignalDatabaseMigration { override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { db.execSQL("ALTER TABLE call_link DROP COLUMN avatar_color") diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextAlignment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextAlignment.kt index 1094f7964e..7e7975461b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextAlignment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextAlignment.kt @@ -7,5 +7,5 @@ import org.thoughtcrime.securesms.R enum class TextAlignment(val gravity: Int, @DrawableRes val icon: Int) { START(Gravity.START or Gravity.CENTER_VERTICAL, R.drawable.ic_text_start), CENTER(Gravity.CENTER, R.drawable.ic_text_center), - END(Gravity.END or Gravity.CENTER_VERTICAL, R.drawable.ic_text_end); + END(Gravity.END or Gravity.CENTER_VERTICAL, R.drawable.ic_text_end) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextColorStyle.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextColorStyle.kt index 2370522721..5e2f399c02 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextColorStyle.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextColorStyle.kt @@ -17,5 +17,5 @@ enum class TextColorStyle(@DrawableRes val icon: Int) { /** * textColor background with white foreground. */ - INVERT(R.drawable.ic_text_effect); + INVERT(R.drawable.ic_text_effect) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyAccountRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyAccountRepository.kt index 478e9beefe..b01e860eca 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyAccountRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyAccountRepository.kt @@ -205,7 +205,7 @@ class VerifyAccountRepository(private val context: Application) { enum class Mode(val isSmsRetrieverSupported: Boolean) { SMS_WITH_LISTENER(true), SMS_WITHOUT_LISTENER(false), - PHONE_CALL(false); + PHONE_CALL(false) } private class PushTokenChallengeSubscriber { diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/LinkUtilTest_isLegal.java b/app/src/test/java/org/thoughtcrime/securesms/util/LinkUtilTest_isLegal.java index 866353f01c..8a6d4c4f41 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/util/LinkUtilTest_isLegal.java +++ b/app/src/test/java/org/thoughtcrime/securesms/util/LinkUtilTest_isLegal.java @@ -9,6 +9,7 @@ import java.util.Collection; import static junit.framework.TestCase.assertEquals; +@SuppressWarnings("NewClassNamingConvention") @RunWith(Parameterized.class) public class LinkUtilTest_isLegal { diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/LinkUtilTest_isValidPreviewUrl.kt b/app/src/test/java/org/thoughtcrime/securesms/util/LinkUtilTest_isValidPreviewUrl.kt index 90cc548fc2..e2a183c032 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/util/LinkUtilTest_isValidPreviewUrl.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/util/LinkUtilTest_isValidPreviewUrl.kt @@ -5,6 +5,7 @@ import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.Parameterized +@Suppress("ClassName") @RunWith(Parameterized::class) class LinkUtilTest_isValidPreviewUrl(private val input: String, private val output: Boolean) { diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/NameUtil_getAbbreviation.kt b/app/src/test/java/org/thoughtcrime/securesms/util/NameUtil_getAbbreviation.kt index 3de13abc34..0efbfe4b3e 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/util/NameUtil_getAbbreviation.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/util/NameUtil_getAbbreviation.kt @@ -7,6 +7,7 @@ import org.junit.runner.RunWith import org.robolectric.ParameterizedRobolectricTestRunner import org.robolectric.annotation.Config +@Suppress("ClassName") @RunWith(value = ParameterizedRobolectricTestRunner::class) @Config(manifest = Config.NONE, application = Application::class) class NameUtil_getAbbreviation( diff --git a/build-logic/plugins/build.gradle.kts b/build-logic/plugins/build.gradle.kts index 90aa21d041..e1d941e2ed 100644 --- a/build-logic/plugins/build.gradle.kts +++ b/build-logic/plugins/build.gradle.kts @@ -1,34 +1,34 @@ plugins { - `kotlin-dsl` - id("groovy-gradle-plugin") - id("org.jlleitschuh.gradle.ktlint") version "11.1.0" + `kotlin-dsl` + id("groovy-gradle-plugin") + id("org.jlleitschuh.gradle.ktlint") version "11.4.2" } java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlinDslPluginOptions { - jvmTarget.set("11") + jvmTarget.set("11") } dependencies { - implementation(libs.kotlin.gradle.plugin) - implementation(libs.android.library) - implementation(libs.android.application) - implementation(project(":tools")) - implementation(libs.ktlint) + implementation(libs.kotlin.gradle.plugin) + implementation(libs.android.library) + implementation(libs.android.application) + implementation(project(":tools")) + implementation(libs.ktlint) - // These allow us to reference the dependency catalog inside of our compiled plugins - implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location)) - implementation(files(testLibs.javaClass.superclass.protectionDomain.codeSource.location)) + // These allow us to reference the dependency catalog inside of our compiled plugins + implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location)) + implementation(files(testLibs.javaClass.superclass.protectionDomain.codeSource.location)) } ktlint { - filter { - exclude { element -> - element.file.path.contains("/build/generated-sources") - } + filter { + exclude { element -> + element.file.path.contains("/build/generated-sources") } + } } diff --git a/build-logic/plugins/src/main/java/ktlint.gradle.kts b/build-logic/plugins/src/main/java/ktlint.gradle.kts index 228c78f6dd..13ffed8d5e 100644 --- a/build-logic/plugins/src/main/java/ktlint.gradle.kts +++ b/build-logic/plugins/src/main/java/ktlint.gradle.kts @@ -1,8 +1,7 @@ plugins { - id("org.jlleitschuh.gradle.ktlint") + id("org.jlleitschuh.gradle.ktlint") } ktlint { - // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507 - version.set("0.47.1") + version.set("0.49.1") } diff --git a/build-logic/plugins/src/main/java/signal-library.gradle.kts b/build-logic/plugins/src/main/java/signal-library.gradle.kts index f88bc83ca8..befda1e12e 100644 --- a/build-logic/plugins/src/main/java/signal-library.gradle.kts +++ b/build-logic/plugins/src/main/java/signal-library.gradle.kts @@ -15,59 +15,59 @@ val signalMinSdkVersion: Int by extra val signalJavaVersion: JavaVersion by extra plugins { - id("com.android.library") - id("kotlin-android") - id("android-constants") - id("ktlint") + id("com.android.library") + id("kotlin-android") + id("android-constants") + id("ktlint") } android { - buildToolsVersion = signalBuildToolsVersion - compileSdkVersion = signalCompileSdkVersion + buildToolsVersion = signalBuildToolsVersion + compileSdkVersion = signalCompileSdkVersion - defaultConfig { - minSdk = signalMinSdkVersion - targetSdk = signalTargetSdkVersion - multiDexEnabled = true - } + defaultConfig { + minSdk = signalMinSdkVersion + targetSdk = signalTargetSdkVersion + multiDexEnabled = true + } - compileOptions { - isCoreLibraryDesugaringEnabled = true - sourceCompatibility = signalJavaVersion - targetCompatibility = signalJavaVersion - } + compileOptions { + isCoreLibraryDesugaringEnabled = true + sourceCompatibility = signalJavaVersion + targetCompatibility = signalJavaVersion + } - kotlinOptions { - jvmTarget = "11" - } + kotlinOptions { + jvmTarget = "11" + } - lint { - disable += "InvalidVectorPath" - } + lint { + disable += "InvalidVectorPath" + } } dependencies { - lintChecks(project(":lintchecks")) + lintChecks(project(":lintchecks")) - coreLibraryDesugaring(libs.android.tools.desugar) + coreLibraryDesugaring(libs.android.tools.desugar) - implementation(libs.androidx.core.ktx) - implementation(libs.androidx.fragment.ktx) - implementation(libs.androidx.annotation) - implementation(libs.androidx.appcompat) - implementation(libs.rxjava3.rxandroid) - implementation(libs.rxjava3.rxjava) - implementation(libs.rxjava3.rxkotlin) - implementation(libs.androidx.multidex) - implementation(libs.kotlin.stdlib.jdk8) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.fragment.ktx) + implementation(libs.androidx.annotation) + implementation(libs.androidx.appcompat) + implementation(libs.rxjava3.rxandroid) + implementation(libs.rxjava3.rxjava) + implementation(libs.rxjava3.rxkotlin) + implementation(libs.androidx.multidex) + implementation(libs.kotlin.stdlib.jdk8) - ktlintRuleset(libs.ktlint.twitter.compose) + ktlintRuleset(libs.ktlint.twitter.compose) - testImplementation(testLibs.junit.junit) - testImplementation(testLibs.mockito.core) - testImplementation(testLibs.mockito.android) - testImplementation(testLibs.mockito.kotlin) - testImplementation(testLibs.robolectric.robolectric) - testImplementation(testLibs.androidx.test.core) - testImplementation(testLibs.androidx.test.core.ktx) + testImplementation(testLibs.junit.junit) + testImplementation(testLibs.mockito.core) + testImplementation(testLibs.mockito.android) + testImplementation(testLibs.mockito.kotlin) + testImplementation(testLibs.robolectric.robolectric) + testImplementation(testLibs.androidx.test.core) + testImplementation(testLibs.androidx.test.core.ktx) } diff --git a/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts b/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts index 556432f23c..a596a05868 100644 --- a/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts +++ b/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts @@ -17,62 +17,62 @@ val signalMinSdkVersion: Int by extra val signalJavaVersion: JavaVersion by extra plugins { - id("com.android.application") - id("kotlin-android") - id("ktlint") - id("android-constants") + id("com.android.application") + id("kotlin-android") + id("ktlint") + id("android-constants") } android { - buildToolsVersion = signalBuildToolsVersion - compileSdkVersion = signalCompileSdkVersion + buildToolsVersion = signalBuildToolsVersion + compileSdkVersion = signalCompileSdkVersion - defaultConfig { - versionCode = 1 - versionName = "1.0" + defaultConfig { + versionCode = 1 + versionName = "1.0" - minSdk = signalMinSdkVersion - targetSdk = signalTargetSdkVersion - multiDexEnabled = true - } + minSdk = signalMinSdkVersion + targetSdk = signalTargetSdkVersion + multiDexEnabled = true + } - compileOptions { - isCoreLibraryDesugaringEnabled = true - sourceCompatibility = signalJavaVersion - targetCompatibility = signalJavaVersion - } + compileOptions { + isCoreLibraryDesugaringEnabled = true + sourceCompatibility = signalJavaVersion + targetCompatibility = signalJavaVersion + } - kotlinOptions { - jvmTarget = "11" - } + kotlinOptions { + jvmTarget = "11" + } } dependencies { - coreLibraryDesugaring(libs.android.tools.desugar) + coreLibraryDesugaring(libs.android.tools.desugar) - implementation(project(":core-util")) + implementation(project(":core-util")) - coreLibraryDesugaring(libs.android.tools.desugar) + coreLibraryDesugaring(libs.android.tools.desugar) - implementation(libs.androidx.core.ktx) - implementation(libs.androidx.fragment.ktx) - implementation(libs.androidx.annotation) - implementation(libs.androidx.appcompat) - implementation(libs.rxjava3.rxandroid) - implementation(libs.rxjava3.rxjava) - implementation(libs.rxjava3.rxkotlin) - implementation(libs.androidx.multidex) - implementation(libs.material.material) - implementation(libs.androidx.constraintlayout) - implementation(libs.kotlin.stdlib.jdk8) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.fragment.ktx) + implementation(libs.androidx.annotation) + implementation(libs.androidx.appcompat) + implementation(libs.rxjava3.rxandroid) + implementation(libs.rxjava3.rxjava) + implementation(libs.rxjava3.rxkotlin) + implementation(libs.androidx.multidex) + implementation(libs.material.material) + implementation(libs.androidx.constraintlayout) + implementation(libs.kotlin.stdlib.jdk8) - ktlintRuleset(libs.ktlint.twitter.compose) + ktlintRuleset(libs.ktlint.twitter.compose) - testImplementation(testLibs.junit.junit) - testImplementation(testLibs.mockito.core) - testImplementation(testLibs.mockito.android) - testImplementation(testLibs.mockito.kotlin) - testImplementation(testLibs.robolectric.robolectric) - testImplementation(testLibs.androidx.test.core) - testImplementation(testLibs.androidx.test.core.ktx) + testImplementation(testLibs.junit.junit) + testImplementation(testLibs.mockito.core) + testImplementation(testLibs.mockito.android) + testImplementation(testLibs.mockito.kotlin) + testImplementation(testLibs.robolectric.robolectric) + testImplementation(testLibs.androidx.test.core) + testImplementation(testLibs.androidx.test.core.ktx) } diff --git a/build-logic/tools/build.gradle.kts b/build-logic/tools/build.gradle.kts index c7e995c9e5..e93c0af392 100644 --- a/build-logic/tools/build.gradle.kts +++ b/build-logic/tools/build.gradle.kts @@ -1,23 +1,22 @@ plugins { - id("org.jetbrains.kotlin.jvm") - id("java-library") - id("org.jlleitschuh.gradle.ktlint") version "11.1.0" + id("org.jetbrains.kotlin.jvm") + id("java-library") + id("org.jlleitschuh.gradle.ktlint") version "11.4.2" } java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } // NOTE: For now, in order to run ktlint on this project, you have to manually run ./gradlew :build-logic:tools:ktlintFormat // Gotta figure out how to get it auto-included in the normal ./gradlew ktlintFormat ktlint { - // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507 - version.set("0.47.1") + version.set("0.49.1") } dependencies { - implementation(libs.dnsjava) - testImplementation(testLibs.junit.junit) - testImplementation(testLibs.mockk) + implementation(libs.dnsjava) + testImplementation(testLibs.junit.junit) + testImplementation(testLibs.mockk) } diff --git a/core-util/src/test/java/org/signal/core/util/StringExtensions_asListContains.kt b/core-util/src/test/java/org/signal/core/util/StringExtensions_asListContains.kt index 1f476d740e..d3c6ce794f 100644 --- a/core-util/src/test/java/org/signal/core/util/StringExtensions_asListContains.kt +++ b/core-util/src/test/java/org/signal/core/util/StringExtensions_asListContains.kt @@ -5,6 +5,7 @@ import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.Parameterized +@Suppress("ClassName") @RunWith(Parameterized::class) class StringExtensions_asListContains( private val model: String, diff --git a/dependencies.gradle b/dependencies.gradle index e8162fc751..2544de1863 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -42,7 +42,7 @@ dependencyResolutionManagement { library('kotlin-stdlib-jdk8', 'org.jetbrains.kotlin', 'kotlin-stdlib-jdk8').versionRef('kotlin') library('kotlin-reflect', 'org.jetbrains.kotlin', 'kotlin-reflect').versionRef('kotlin') library('kotlin-gradle-plugin', 'org.jetbrains.kotlin', 'kotlin-gradle-plugin').versionRef('kotlin') - library('ktlint', 'org.jlleitschuh.gradle:ktlint-gradle:11.1.0') + library('ktlint', 'org.jlleitschuh.gradle:ktlint-gradle:11.4.2') // Android X library('androidx-activity-ktx', 'androidx.activity', 'activity-ktx').versionRef('androidx-activity') diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index d6a33edf6e..61fdf583be 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1481,11 +1481,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -2864,6 +2874,30 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + + + + + @@ -2880,6 +2914,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + @@ -2896,6 +2946,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2912,6 +2970,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2920,6 +2986,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2936,6 +3010,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2952,6 +3034,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2968,6 +3058,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + @@ -2984,6 +3090,30 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + + + + + @@ -3016,6 +3146,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -3368,6 +3506,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3397,6 +3540,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -3405,6 +3556,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -4096,6 +4255,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4121,6 +4285,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4239,6 +4408,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4349,6 +4523,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4374,6 +4553,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4478,6 +4662,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4494,11 +4683,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + @@ -4507,6 +4709,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -4515,6 +4725,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -4866,6 +5084,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + diff --git a/libsignal/service/build.gradle b/libsignal/service/build.gradle index ff53305d35..7b63faf14e 100644 --- a/libsignal/service/build.gradle +++ b/libsignal/service/build.gradle @@ -43,8 +43,7 @@ afterEvaluate { } ktlint { - // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507 - version.set("0.47.1") + version.set("0.49.1") filter { exclude { entry -> diff --git a/microbenchmark/build.gradle.kts b/microbenchmark/build.gradle.kts index b2ae0d58f6..d1f74bd1fb 100644 --- a/microbenchmark/build.gradle.kts +++ b/microbenchmark/build.gradle.kts @@ -1,11 +1,11 @@ @file:Suppress("UnstableApiUsage") plugins { - id("com.android.library") - id("androidx.benchmark") - id("org.jetbrains.kotlin.android") - id("android-constants") - id("ktlint") + id("com.android.library") + id("androidx.benchmark") + id("org.jetbrains.kotlin.android") + id("android-constants") + id("ktlint") } val signalBuildToolsVersion: String by extra @@ -15,49 +15,49 @@ val signalMinSdkVersion: Int by extra val signalJavaVersion: JavaVersion by extra android { - namespace = "org.signal.microbenchmark" - compileSdkVersion = signalCompileSdkVersion + namespace = "org.signal.microbenchmark" + compileSdkVersion = signalCompileSdkVersion - compileOptions { - sourceCompatibility = signalJavaVersion - targetCompatibility = signalJavaVersion + compileOptions { + sourceCompatibility = signalJavaVersion + targetCompatibility = signalJavaVersion + } + + kotlinOptions { + jvmTarget = "11" + } + + defaultConfig { + minSdk = signalMinSdkVersion + targetSdk = signalTargetSdkVersion + + testInstrumentationRunner = "androidx.benchmark.junit4.AndroidBenchmarkRunner" + } + + testBuildType = "release" + buildTypes { + debug { + // Since isDebuggable can't be modified by gradle for library modules, + // it must be done in a manifest - see src/androidTest/AndroidManifest.xml + isMinifyEnabled = true + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "benchmark-proguard-rules.pro") } - - kotlinOptions { - jvmTarget = "11" - } - - defaultConfig { - minSdk = signalMinSdkVersion - targetSdk = signalTargetSdkVersion - - testInstrumentationRunner = "androidx.benchmark.junit4.AndroidBenchmarkRunner" - } - - testBuildType = "release" - buildTypes { - debug { - // Since isDebuggable can't be modified by gradle for library modules, - // it must be done in a manifest - see src/androidTest/AndroidManifest.xml - isMinifyEnabled = true - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "benchmark-proguard-rules.pro") - } - release { - isDefault = true - } + release { + isDefault = true } + } } dependencies { - lintChecks(project(":lintchecks")) + lintChecks(project(":lintchecks")) - // Base dependencies - androidTestImplementation(testLibs.junit.junit) - androidTestImplementation(benchmarkLibs.androidx.test.ext.junit) - androidTestImplementation(benchmarkLibs.androidx.benchmark.micro) + // Base dependencies + androidTestImplementation(testLibs.junit.junit) + androidTestImplementation(benchmarkLibs.androidx.test.ext.junit) + androidTestImplementation(benchmarkLibs.androidx.benchmark.micro) - // Dependencies of modules being tested - androidTestImplementation(project(":libsignal-service")) - androidTestImplementation(libs.libsignal.android) - androidTestImplementation(libs.google.protobuf.javalite) + // Dependencies of modules being tested + androidTestImplementation(project(":libsignal-service")) + androidTestImplementation(libs.libsignal.android) + androidTestImplementation(libs.google.protobuf.javalite) } diff --git a/sms-exporter/lib/src/main/java/org/signal/smsexporter/SmsExportService.kt b/sms-exporter/lib/src/main/java/org/signal/smsexporter/SmsExportService.kt index 09ac89ce09..f2b0ebe2fd 100644 --- a/sms-exporter/lib/src/main/java/org/signal/smsexporter/SmsExportService.kt +++ b/sms-exporter/lib/src/main/java/org/signal/smsexporter/SmsExportService.kt @@ -235,9 +235,9 @@ abstract class SmsExportService : Service() { onMessageExportSucceeded(sms) true }, onFailure = { - onMessageExportFailed(sms) - false - }) + onMessageExportFailed(sms) + false + }) } private fun exportMms(smsExportState: SmsExportState, mms: ExportableMessage.Mms<*>): Boolean {