Skip to content

Commit 09a3984

Browse files
authored
Merge pull request #17293 from wordpress-mobile/analysis/wordpress-main-other-warnings
[Compile Warnings As Errors] WordPress Module - Resolve Other Warnings
2 parents e2eb39b + 3060469 commit 09a3984

49 files changed

Lines changed: 77 additions & 86 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

WordPress/src/main/java/org/wordpress/android/AppInitializer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ class AppInitializer @Inject constructor(
533533
}
534534
}
535535

536-
@SuppressWarnings("unused")
536+
@Suppress("unused", "UNUSED_PARAMETER")
537537
@Subscribe(threadMode = ThreadMode.MAIN)
538538
fun onAuthenticationChanged(event: OnAuthenticationChanged) {
539539
if (accountStore.hasAccessToken()) {

WordPress/src/main/java/org/wordpress/android/WordPress.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ abstract class WordPress : MultiDexApplication() {
5454
@JvmStatic
5555
fun getRestClientUtils() = AppInitializer.restClientUtils
5656

57-
@SuppressWarnings("FunctionNaming")
57+
@Suppress("FunctionNaming")
5858
@JvmStatic
5959
fun getRestClientUtilsV1_1() = AppInitializer.restClientUtilsV1_1
6060

61-
@SuppressWarnings("FunctionNaming")
61+
@Suppress("FunctionNaming")
6262
@JvmStatic
6363
fun getRestClientUtilsV1_2() = AppInitializer.restClientUtilsV1_2
6464

65-
@SuppressWarnings("FunctionNaming")
65+
@Suppress("FunctionNaming")
6666
@JvmStatic
6767
fun getRestClientUtilsV1_3() = AppInitializer.restClientUtilsV1_3
6868

WordPress/src/main/java/org/wordpress/android/ui/JetpackRemoteInstallViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ class JetpackRemoteInstallViewModel
147147
}
148148

149149
// Network Callbacks
150+
@Suppress("unused")
150151
@Subscribe(threadMode = ThreadMode.BACKGROUND)
151-
@SuppressWarnings("unused")
152152
fun onEventsUpdated(event: OnJetpackInstalled) {
153153
val site = siteModel ?: return
154154
if (event.isError) {

WordPress/src/main/java/org/wordpress/android/ui/domains/DomainsDashboardViewModel.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ class DomainsDashboardViewModel @Inject constructor(
224224
TODO("Not yet implemented")
225225
}
226226
}
227-
return true
228227
}
229228

230229
fun onSuccessfulDomainRegistration() {

WordPress/src/main/java/org/wordpress/android/ui/engagement/GetLikesUseCase.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,8 @@ import kotlin.coroutines.suspendCoroutine
4646
class GetLikesUseCase @Inject constructor(
4747
private val networkUtilsWrapper: NetworkUtilsWrapper,
4848
private val dispatcher: Dispatcher,
49-
@SuppressWarnings("Unused")
50-
val commentStore: CommentStore,
51-
@SuppressWarnings("Unused")
52-
val postStore: PostStore,
49+
@Suppress("Unused") val commentStore: CommentStore,
50+
@Suppress("Unused") val postStore: PostStore,
5351
val accountStore: AccountStore
5452
) {
5553
private var getLikesContinuations = mutableMapOf<String, Continuation<OnChanged<*>>>()
@@ -76,7 +74,7 @@ class GetLikesUseCase @Inject constructor(
7674
getLikes(COMMENT_LIKE, this, fingerPrint, paginationParams)
7775
}
7876

79-
@SuppressWarnings("ComplexMethod", "NestedBlockDepth", "LoopWithTooManyJumpStatements")
77+
@Suppress("ComplexMethod", "NestedBlockDepth", "LoopWithTooManyJumpStatements")
8078
private suspend fun getLikes(
8179
category: LikeCategory,
8280
flow: FlowCollector<GetLikesState>,

WordPress/src/main/java/org/wordpress/android/ui/jetpack/JetpackCapabilitiesUseCase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ class JetpackCapabilitiesUseCase @Inject constructor(
9696
)
9797
}
9898

99+
@Suppress("unused")
99100
@Subscribe(threadMode = ThreadMode.MAIN)
100-
@SuppressWarnings("unused")
101101
fun onJetpackCapabilitiesFetched(event: OnJetpackCapabilitiesFetched) {
102102
continuation[event.remoteSiteId]?.let {
103103
continuation.remove(event.remoteSiteId)

WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener {
586586
}
587587
}
588588

589-
@SuppressWarnings("unused")
589+
@Suppress("unused", "UNUSED_PARAMETER")
590590
@Subscribe(threadMode = ThreadMode.MAIN)
591591
fun onAccountChanged(event: OnAccountChanged?) {
592592
binding?.refreshAccountDetails()

WordPress/src/main/java/org/wordpress/android/ui/mediapicker/loader/DeviceMediaLoader.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package org.wordpress.android.ui.mediapicker.loader
22

33
import android.content.ContentResolver
44
import android.content.Context
5-
import android.database.Cursor
65
import android.net.Uri
76
import android.os.Build.VERSION
87
import android.os.Build.VERSION_CODES
@@ -42,7 +41,6 @@ class DeviceMediaLoader
4241
}
4342
val result = mutableListOf<DeviceMediaItem>()
4443
val projection = arrayOf(ID_COL, ID_DATE_MODIFIED, ID_TITLE)
45-
var cursor: Cursor? = null
4644
val dateCondition = if (limitDate != null && limitDate != 0L) {
4745
"$ID_DATE_MODIFIED <= \'$limitDate\'"
4846
} else {
@@ -55,11 +53,8 @@ class DeviceMediaLoader
5553
dateCondition ?: filterCondition
5654
}
5755

58-
cursor = getCursor(condition, pageSize, baseUri, projection)
56+
val cursor = getCursor(condition, pageSize, baseUri, projection) ?: return DeviceMediaList(listOf(), null)
5957

60-
if (cursor == null) {
61-
return DeviceMediaList(listOf(), null)
62-
}
6358
try {
6459
val idIndex = cursor.getColumnIndexOrThrow(ID_COL)
6560
val dateIndex = cursor.getColumnIndexOrThrow(ID_DATE_MODIFIED)

WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ class NotificationsDetailListFragment : ListFragment(), NotificationFragment {
301301
}
302302
}
303303
}
304-
private val mOnGravatarClickedListener = OnGravatarClickedListener { siteId, userId, siteUrl ->
304+
private val mOnGravatarClickedListener = OnGravatarClickedListener { siteId, _, siteUrl ->
305305
if (!isAdded || activity !is NotificationsDetailActivity) {
306306
return@OnGravatarClickedListener
307307
}

WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragmentPage.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ class NotificationsListFragmentPage : ViewPagerFragment(R.layout.notifications_l
443443
notesAdapter!!.addAll(event.notes, true)
444444
}
445445

446-
@SuppressWarnings("unused")
446+
@Suppress("unused", "UNUSED_PARAMETER")
447447
@Subscribe(threadMode = MAIN)
448448
fun onEventMainThread(error: NotificationsRefreshError?) {
449449
if (isAdded) {

0 commit comments

Comments
 (0)