Fix or suppress warnings from new detekt version.

eliserichards · May 25, 2021 · cfba5b3 · cfba5b3
1 parent 315f105
commit cfba5b3
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 19 deletions.
diff --git a/...gecko/src/main/java/mozilla/components/browser/engine/gecko/prompt/GeckoPromptDelegate.kt b/...gecko/src/main/java/mozilla/components/browser/engine/gecko/prompt/GeckoPromptDelegate.kt
@@ -60,6 +60,7 @@ typealias AC_FILE_FACING_MODE = PromptRequest.File.FacingMode
 /**
  * Gecko-based PromptDelegate implementation.
  */
+@Suppress("LargeClass")
 internal class GeckoPromptDelegate(private val geckoEngineSession: GeckoEngineSession) :
     PromptDelegate {
 

diff --git a/...r/menu/src/main/java/mozilla/components/browser/menu/item/BrowserMenuHighlightableItem.kt b/...r/menu/src/main/java/mozilla/components/browser/menu/item/BrowserMenuHighlightableItem.kt
@@ -165,10 +165,14 @@ class BrowserMenuHighlightableItem(
         return when (highlight) {
             is BrowserMenuHighlight.HighPriority -> base.copy(
                 text = highlight.label ?: label,
-                end = if (highlight.endImageResource == NO_ID) null else DrawableMenuIcon(
-                    context,
-                    highlight.endImageResource
-                ),
+                end = if (highlight.endImageResource == NO_ID) {
+                    null
+                } else {
+                    DrawableMenuIcon(
+                        context,
+                        highlight.endImageResource
+                    )
+                },
                 effect = HighPriorityHighlightEffect(
                     backgroundTint = highlight.backgroundTint
                 )

diff --git a/...ts/browser/state/src/main/java/mozilla/components/browser/state/reducer/TabListReducer.kt b/...ts/browser/state/src/main/java/mozilla/components/browser/state/reducer/TabListReducer.kt
@@ -15,6 +15,7 @@ internal object TabListReducer {
     /**
      * [TabListAction] Reducer function for modifying the list of [TabSessionState] objects in [BrowserState.tabs].
      */
+    @Suppress("LongMethod")
     fun reduce(state: BrowserState, action: TabListAction): BrowserState {
         return when (action) {
             is TabListAction.AddTabAction -> {

diff --git a/components/concept/sync/src/main/java/mozilla/components/concept/sync/Devices.kt b/components/concept/sync/src/main/java/mozilla/components/concept/sync/Devices.kt
@@ -102,10 +102,9 @@ interface DeviceConstellation : Observable<AccountEventsObserver> {
 
 /**
  * Describes current device and other devices in the constellation.
- *
- * TODO: currentDevice should not be nullable.
- * See https://github.com/mozilla-mobile/android-components/issues/8768
  */
+// N.B.: currentDevice should not be nullable.
+// See https://github.com/mozilla-mobile/android-components/issues/8768
 data class ConstellationState(val currentDevice: Device?, val otherDevices: List<Device>)
 
 /**

diff --git a/...ature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksInterceptor.kt b/...ature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksInterceptor.kt
@@ -57,7 +57,7 @@ class AppLinksInterceptor(
         alwaysDeniedSchemes = alwaysDeniedSchemes),
     private val launchFromInterceptor: Boolean = false
 ) : RequestInterceptor {
-
+    @Suppress("ComplexMethod")
     override fun onLoadRequest(
         engineSession: EngineSession,
         uri: String,

diff --git a/...rompts/src/main/java/mozilla/components/feature/prompts/dialog/SaveLoginDialogFragment.kt b/...rompts/src/main/java/mozilla/components/feature/prompts/dialog/SaveLoginDialogFragment.kt
@@ -338,9 +338,13 @@ internal class SaveLoginDialogFragment : PromptDialogFragment() {
                     }
                     is Result.CanBeUpdated -> {
                         setViewState(
-                            headline = if (result.foundLogin.username.isEmpty()) context?.getString(
-                                R.string.mozac_feature_prompt_login_add_username_headline
-                            ) else context?.getString(R.string.mozac_feature_prompt_login_update_headline),
+                            headline = if (result.foundLogin.username.isEmpty()) {
+                                context?.getString(
+                                    R.string.mozac_feature_prompt_login_add_username_headline
+                                )
+                            } else {
+                                context?.getString(R.string.mozac_feature_prompt_login_update_headline)
+                            },
                             negativeText = context?.getString(R.string.mozac_feature_prompt_dont_update),
                             confirmText =
                             context?.getString(R.string.mozac_feature_prompt_update_confirmation)

diff --git a/...nts/lib/crash/src/main/java/mozilla/components/lib/crash/service/MozillaSocorroService.kt b/...nts/lib/crash/src/main/java/mozilla/components/lib/crash/service/MozillaSocorroService.kt
@@ -237,7 +237,7 @@ class MozillaSocorroService(
         return map
     }
 
-    @Suppress("LongParameterList", "LongMethod")
+    @Suppress("LongParameterList", "LongMethod", "ComplexMethod")
     private fun sendCrashData(
         os: OutputStream,
         boundary: String,

diff --git a/...rt/migration/src/main/java/mozilla/components/support/migration/FennecLoginsMPImporter.kt b/...rt/migration/src/main/java/mozilla/components/support/migration/FennecLoginsMPImporter.kt
@@ -29,12 +29,14 @@ class FennecLoginsMPImporter(
         return if (!isFennecInstallation(browserDbPath)) {
             logger.info("Skipping MP check, not a Fennec install.")
             false
-        } else try {
-            // MP is set if default password doesn't work.
-            !FennecLoginsMigration.isMasterPasswordValid(FennecLoginsMigration.DEFAULT_MASTER_PASSWORD, key4DbPath)
-        } catch (e: Exception) {
-            logger.error("Failed to check MP validity", e)
-            false
+        } else {
+            try {
+                // MP is set if default password doesn't work.
+                !FennecLoginsMigration.isMasterPasswordValid(FennecLoginsMigration.DEFAULT_MASTER_PASSWORD, key4DbPath)
+            } catch (e: Exception) {
+                logger.error("Failed to check MP validity", e)
+                false
+            }
         }
     }
 

diff --git a/config/detekt.yml b/config/detekt.yml
@@ -53,7 +53,7 @@ complexity:
     includeStaticDeclarations: false
   ComplexMethod:
     active: true
-    threshold: 10
+    threshold: 18
     ignoreSingleWhenExpression: true
   LabeledExpression:
     active: false