mirror/thunderbird-android
0
0
Fork 0
mirror of https://github.com/thunderbird/thunderbird-android.git synced 2024-09-19 19:52:14 +02:00
Code

Update detekt baseline and resolve more max-line-length issues

Browse Source
This commit is contained in:
Wolf-Martell Montwé 2023-11-07 11:01:37 +01:00
parent 7565bb8e66
commit 783df7679e
No known key found for this signature in database
GPG Key ID: 6D45B21512ACBF72
8 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt
View File

@ -38,10 +38,11 @@ class NotificationHelper(
try {
notificationManager.notify(notificationId, notification)
} catch (e: SecurityException) {
// When importing settings from another device, we could end up with a NotificationChannel that references a
// non-existing notification sound. In that case, we end up with a SecurityException with a message similar
// to this:
// UID 123 does not have permission to content://media/external_primary/audio/media/42?title=Coins&canonical=1 [user 0]
// When importing settings from another device, we could end up with a NotificationChannel that references
// a non-existing notification sound. In that case, we end up with a SecurityException with a message
// similar to this:
// UID 123 does not have permission to
// content://media/external_primary/audio/media/42?title=Coins&canonical=1 [user 0]
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
e.message?.contains("does not have permission to") == true
) {

4
app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
View File

@ -198,8 +198,8 @@ class MessageViewFragment :
if (menuVisible) {
messageLoaderHelper.resumeCryptoOperationIfNecessary()
} else {
// When the menu is hidden, the message associated with this fragment is no longer active. If the user returns
// to it, we want to mark the message as opened again.
// When the menu is hidden, the message associated with this fragment is no longer active. If the user
// returns to it, we want to mark the message as opened again.
wasMessageMarkedAsOpened = false
}
}

2
config/detekt/detekt-baseline-app-core.xml
View File

@ -84,8 +84,6 @@
<ID>MagicNumber:ServerSettingsSerializer.kt$ServerSettingsAdapter$7</ID>
<ID>MagicNumber:SettingsExporter.kt$SettingsExporter$3</ID>
<ID>MagicNumber:TimberLogger.kt$TimberLogger$26</ID>
<ID>MaxLineLength:GenericUriParserTest.kt$GenericUriParserTest$assertUriValid("xmpp:node@example.com/repulsive%20!%23%22\$%25&amp;'()*+,-.%2F:;%3C=%3E%3F%40%5B%5C%5D%5E_%60%7B%7C%7D~resource")</ID>
<ID>MaxLineLength:NotificationHelper.kt$NotificationHelper$// UID 123 does not have permission to content://media/external_primary/audio/media/42?title=Coins&amp;canonical=1 [user 0]</ID>
<ID>MayBeConst:SummaryNotificationDataCreatorTest.kt$private val TIMESTAMP = 0L</ID>
<ID>MemberNameEqualsClassName:HtmlModification.kt$HtmlModification.Replace$abstract fun replace(textToHtml: TextToHtml)</ID>
<ID>NestedBlockDepth:HttpUriParser.kt$HttpUriParser$private fun tryMatchIpv6Address(text: CharSequence, startPos: Int): Int</ID>

2
config/detekt/detekt-baseline-app-storage.xml
View File

@ -103,8 +103,6 @@
<ID>MagicNumber:StorageMigrationTo17.kt$StorageMigrationTo17$0xFFFF00</ID>
<ID>MagicNumber:StorageMigrationTo17.kt$StorageMigrationTo17$0xFFFFFF</ID>
<ID>MagicNumber:ThreadMessageOperations.kt$ThreadMessageOperations$3</ID>
<ID>MaxLineLength:MigrationTo70.kt$MigrationTo70$db.execSQL("CREATE TRIGGER delete_folder BEFORE DELETE ON folders BEGIN DELETE FROM messages WHERE old.id = folder_id; END;")</ID>
<ID>MaxLineLength:MigrationTo84.kt$MigrationTo84$"SELECT id, to_list, cc_list, bcc_list, reply_to_list, sender_list FROM messages WHERE empty = 0 AND deleted = 0"</ID>
<ID>MaxLineLength:RetrieveMessageListOperationsTest.kt$RetrieveMessageListOperationsTest$fun</ID>
<ID>ReturnCount:SaveMessageOperationsTest.kt$SaveMessageOperationsTest$private fun Message.getDownloadState(): MessageDownloadState</ID>
<ID>ReturnCount:StorageMigrationTo19.kt$StorageMigrationTo19$private fun markIfGmailAccount(accountUuid: String)</ID>

5
config/detekt/detekt-baseline-app-ui-legacy.xml
View File

@ -82,14 +82,10 @@
<ID>MagicNumber:SizeFormatter.kt$SizeFormatter$1_000_000L</ID>
<ID>MagicNumber:SizeFormatter.kt$SizeFormatter$999_950L</ID>
<ID>MagicNumber:SizeFormatter.kt$SizeFormatter$999_950_000L</ID>
<ID>MaxLineLength:ComposeCryptoStatus.kt$ComposeCryptoStatus$OpenPgpApiManager.OpenPgpProviderState.ERROR, OpenPgpApiManager.OpenPgpProviderState.UI_REQUIRED -&gt; CryptoStatusDisplayType.ERROR</ID>
<ID>MaxLineLength:MessageViewFragment.kt$MessageViewFragment$// When the menu is hidden, the message associated with this fragment is no longer active. If the user returns</ID>
<ID>MemberNameEqualsClassName:ReplyToView.kt$ReplyToView$private val replyToView: RecipientSelectView = activity.findViewById(R.id.reply_to)</ID>
<ID>NestedBlockDepth:MessageList.kt$MessageList$override fun onBackPressed()</ID>
<ID>NestedBlockDepth:MessageList.kt$MessageList$override fun onOptionsItemSelected(item: MenuItem): Boolean</ID>
<ID>NestedBlockDepth:MessageList.kt$MessageList$private fun decodeExtrasToLaunchData(intent: Intent): LaunchData</ID>
<ID>ReturnCount:AccountSetupBasics.kt$AccountSetupBasics$private fun providersXmlDiscoveryDiscover(email: String): ConnectionSettings?</ID>
<ID>ReturnCount:AccountSetupBasics.kt$private fun DiscoveredServerSettings.toServerSettings(): ServerSettings?</ID>
<ID>ReturnCount:AccountSetupCheckSettings.kt$AccountSetupCheckSettings.CheckAccountTask$private fun isCanceled(): Boolean</ID>
<ID>ReturnCount:ChooseFolderActivity.kt$ChooseFolderActivity$private fun decodeArguments(savedInstanceState: Bundle?): Boolean</ID>
<ID>ReturnCount:EditIdentity.kt$EditIdentity$override fun onOptionsItemSelected(item: MenuItem): Boolean</ID>
@ -162,7 +158,6 @@
<ID>TooGenericExceptionThrown:MessageViewFragment.kt$MessageViewFragment$throw RuntimeException("Called showDialog(int) with unknown dialog id.")</ID>
<ID>TooManyFunctions:AccountSettingsDataStore.kt$AccountSettingsDataStore : PreferenceDataStore</ID>
<ID>TooManyFunctions:AccountSettingsFragment.kt$AccountSettingsFragment : PreferenceFragmentCompatConfirmationDialogFragmentListener</ID>
<ID>TooManyFunctions:AccountSetupBasics.kt$AccountSetupBasics : K9Activity</ID>
<ID>TooManyFunctions:AccountSetupCheckSettings.kt$AccountSetupCheckSettings : K9ActivityConfirmationDialogFragmentListener</ID>
<ID>TooManyFunctions:AuthViewModel.kt$AuthViewModel : AndroidViewModel</ID>
<ID>TooManyFunctions:AutocryptKeyTransferActivity.kt$AutocryptKeyTransferActivity : K9Activity</ID>

1
config/detekt/detekt-baseline-backend-jmap.xml
View File

@ -3,7 +3,6 @@
<ManuallySuppressedIssues></ManuallySuppressedIssues>
<CurrentIssues>
<ID>ForbiddenComment:CommandSync.kt$CommandSync$// FIXME: Add sort parameter</ID>
<ID>MaxLineLength:JmapBackend.kt$JmapBackend$override</ID>
<ID>ReturnCount:JmapAccountDiscovery.kt$JmapAccountDiscovery$fun discover(emailAddress: String, password: String): JmapDiscoveryResult</ID>
<ID>SwallowedException:JmapAccountDiscovery.kt$JmapAccountDiscovery$e: EndpointNotFoundException</ID>
<ID>SwallowedException:JmapAccountDiscovery.kt$JmapAccountDiscovery$e: UnauthorizedException</ID>

1
config/detekt/detekt-baseline-mail-common.xml
View File

@ -51,7 +51,6 @@
<ID>MagicNumber:Utf8.kt$3</ID>
<ID>MagicNumber:Utf8.kt$4</ID>
<ID>MagicNumber:Utf8.kt$6</ID>
<ID>MaxLineLength:BoundaryGeneratorTest.kt$BoundaryGeneratorTest$0</ID>
<ID>ReturnCount:DecoderUtil.kt$DecoderUtil$@JvmStatic fun decodeEncodedWords(body: String, message: Message?): String</ID>
<ID>ReturnCount:DecoderUtil.kt$DecoderUtil$private fun extractEncodedWord(body: String, begin: Int, end: Int, message: Message?): EncodedWord?</ID>
<ID>ReturnCount:FormatFlowedHelper.kt$FormatFlowedHelper$@JvmStatic fun checkFormatFlowed(contentTypeHeaderValue: String?): FormatFlowedResult</ID>

1
config/detekt/detekt-baseline-mail-protocols-imap.xml
View File

@ -39,7 +39,6 @@
<ID>MagicNumber:RealImapFolder.kt$RealImapFolder$9</ID>
<ID>MagicNumber:UidValidityResponse.kt$UidValidityResponse.Companion$0xFFFFFFFFL</ID>
<ID>MaxLineLength:RealImapFolder.kt$RealImapFolder$// [MESSAGE, RFC822, [NAME, Fwd: [#HTR-517941]: update plans at 1am Friday - Memory allocation - displayware.eml], NIL, NIL, 7BIT, 5974, NIL, [INLINE, [FILENAME*0, Fwd: [#HTR-517941]: update plans at 1am Friday - Memory all, FILENAME*1, ocation - displayware.eml]], NIL]</ID>
<ID>MaxLineLength:RealImapFolder.kt$RealImapFolder$val canCreateForwardedFlag = canCreateKeywords || internalImapStore.getPermanentFlagsIndex().contains(Flag.FORWARDED)</ID>
<ID>MaxLineLength:RealImapStoreTest.kt$RealImapStoreTest$fun</ID>
<ID>NestedBlockDepth:RealImapFolder.kt$RealImapFolder$@Throws(MessagingException::class) override fun appendMessages(messages: List&lt;Message&gt;): Map&lt;String, String&gt;?</ID>
<ID>NestedBlockDepth:RealImapFolder.kt$RealImapFolder$@Throws(MessagingException::class) override fun fetch( messages: List&lt;ImapMessage&gt;, fetchProfile: FetchProfile, listener: FetchListener?, maxDownloadSize: Int, )</ID>