Skip to content

Commit 7eb5607

Browse files
committed
Analysis: Resolve detekt warnings by manually updating the baseline
After resolving some of the compile related deprecated warnings, some Detekt baseline related warnings needed to be removed and suppressed closer to source because the lines on those classes got changed.
1 parent ceae5bc commit 7eb5607

3 files changed

Lines changed: 2 additions & 3 deletions

File tree

WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class PhotoPickerFragment : Fragment(R.layout.photo_picker_fragment) {
8484
viewModel = ViewModelProvider(this, viewModelFactory).get(PhotoPickerViewModel::class.java)
8585
}
8686

87-
@Suppress("DEPRECATION")
87+
@Suppress("DEPRECATION", "LongMethod")
8888
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
8989
super.onViewCreated(view, savedInstanceState)
9090

WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/RemoveMediaUseCase.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class RemoveMediaUseCase @Inject constructor(
2121
private val uploadService: UploadServiceFacade,
2222
@Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
2323
) {
24+
@Suppress("LoopWithTooManyJumpStatements")
2425
suspend fun removeMediaIfNotUploading(mediaIds: List<String>) = withContext(bgDispatcher) {
2526
for (mediaId in mediaIds) {
2627
if (!TextUtils.isEmpty(mediaId)) {

config/detekt/baseline.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,11 @@
7474
<ID>LongMethod:HomepageSettingsDialog.kt$HomepageSettingsDialog$override fun onCreateDialog(savedInstanceState: Bundle?): Dialog</ID>
7575
<ID>LongMethod:MediaPickerFragment.kt$MediaPickerFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
7676
<ID>LongMethod:MediaPickerViewModel.kt$MediaPickerViewModel$private fun buildUiModel( domainModel: DomainModel?, selectedIds: List&lt;Identifier>?, softAskRequest: SoftAskRequest?, isSearching: Boolean? ): PhotoListUiModel</ID>
77-
<ID>LongMethod:PhotoPickerFragment.kt$PhotoPickerFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
7877
<ID>LongMethod:PrepublishingHomeViewModel.kt$PrepublishingHomeViewModel$private fun setupHomeUiState( editPostRepository: EditPostRepository, site: SiteModel, isStoryPost: Boolean )</ID>
7978
<ID>LongMethod:PublishSettingsFragment.kt$PublishSettingsFragment$override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View?</ID>
8079
<ID>LongMethod:ReferrersUseCase.kt$ReferrersUseCase$override fun buildUiModel(domainModel: ReferrersModel, uiState: SelectedGroup): List&lt;BlockListItem></ID>
8180
<ID>LongMethod:SearchListViewModel.kt$SearchListViewModel$private fun PageModel.toPageItem(areActionsEnabled: Boolean): PageItem</ID>
8281
<ID>LongMethod:SuggestionActivity.kt$SuggestionActivity$private fun initializeActivity(siteModel: SiteModel, suggestionType: SuggestionType)</ID>
83-
<ID>LoopWithTooManyJumpStatements:RemoveMediaUseCase.kt$RemoveMediaUseCase$for (mediaId in mediaIds) { if (!TextUtils.isEmpty(mediaId)) { // make sure the MediaModel exists val mediaModel = try { mediaStore.getMediaWithLocalId(Integer.valueOf(mediaId)) ?: continue } catch (e: NumberFormatException) { AppLog.e(AppLog.T.MEDIA, "Invalid media id: $mediaId") continue } // also make sure it's not being uploaded anywhere else (maybe on some other Post, // simultaneously) if (mediaModel.uploadState != null &amp;&amp; mediaUtils.isLocalFile(mediaModel.uploadState.toLowerCase(Locale.ROOT)) &amp;&amp; !uploadService.isPendingOrInProgressMediaUpload(mediaModel)) { dispatcher.dispatch(MediaActionBuilder.newRemoveMediaAction(mediaModel)) } } }</ID>
8482
<ID>MagicNumber:ActivityViewHolder.kt$ActivityViewHolder$3</ID>
8583
<ID>MagicNumber:ActivityViewHolder.kt$ActivityViewHolder$50</ID>
8684
<ID>MagicNumber:BarChartViewHolder.kt$BarChartViewHolder$10</ID>

0 commit comments

Comments
 (0)