Skip to content

Commit 75db002

Browse files
committed
Update ktlint to 0.43.2
1 parent dbfa4e5 commit 75db002

3 files changed

Lines changed: 2 additions & 10 deletions

File tree

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ dependencies {
192192

193193
/** Checkstyle **/
194194
checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
195-
ktlint 'com.pinterest:ktlint:0.40.0'
195+
ktlint 'com.pinterest:ktlint:0.43.2'
196196

197197
/** Kotlin **/
198198
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"

app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -183,28 +183,23 @@ class FeedLoadService : Service() {
183183

184184
subscriptions
185185
.take(1)
186-
187186
.doOnNext {
188187
currentProgress.set(0)
189188
maxProgress.set(it.size)
190189
}
191190
.filter { it.isNotEmpty() }
192-
193191
.observeOn(AndroidSchedulers.mainThread())
194192
.doOnNext {
195193
startForeground(NOTIFICATION_ID, notificationBuilder.build())
196194
updateNotificationProgress(null)
197195
broadcastProgress()
198196
}
199-
200197
.observeOn(Schedulers.io())
201198
.flatMap { Flowable.fromIterable(it) }
202199
.takeWhile { !cancelSignal.get() }
203-
204200
.parallel(PARALLEL_EXTRACTIONS, PARALLEL_EXTRACTIONS * 2)
205201
.runOn(Schedulers.io(), PARALLEL_EXTRACTIONS * 2)
206202
.filter { !cancelSignal.get() }
207-
208203
.map { subscriptionEntity ->
209204
var error: Throwable? = null
210205
try {
@@ -239,14 +234,11 @@ class FeedLoadService : Service() {
239234
}
240235
}
241236
.sequential()
242-
243237
.observeOn(AndroidSchedulers.mainThread())
244238
.doOnNext(notificationsConsumer)
245-
246239
.observeOn(Schedulers.io())
247240
.buffer(BUFFER_COUNT_BEFORE_INSERT)
248241
.doOnNext(databaseConsumer)
249-
250242
.subscribeOn(Schedulers.io())
251243
.observeOn(AndroidSchedulers.mainThread())
252244
.subscribe(resultSubscriber)

app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import org.junit.Before
99
import org.junit.Test
1010
import org.junit.runner.RunWith
1111
import org.mockito.Mockito
12-
import org.mockito.Mockito.`when`
1312
import org.mockito.Mockito.anyBoolean
1413
import org.mockito.Mockito.anyInt
1514
import org.mockito.Mockito.anyString
1615
import org.mockito.Mockito.atLeastOnce
1716
import org.mockito.Mockito.verify
17+
import org.mockito.Mockito.`when`
1818
import org.mockito.Mockito.withSettings
1919
import org.mockito.junit.MockitoJUnitRunner
2020
import org.schabi.newpipe.streams.io.StoredFileHelper

0 commit comments

Comments
 (0)