Skip to content

Commit 2376a83

Browse files
theimpulsontheimpulson
committed
Fix all ktlint violations and merge issues
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
1 parent 394a7f6 commit 2376a83

55 files changed

Lines changed: 482 additions & 338 deletions

Some content is hidden

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

‎app/src/androidTest/java/org/schabi/newpipe/error/ErrorInfoTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import android.os.Parcelable
66
import androidx.test.core.app.ApplicationProvider
77
import androidx.test.ext.junit.runners.AndroidJUnit4
88
import androidx.test.filters.LargeTest
9+
import java.io.IOException
10+
import java.net.SocketTimeoutException
911
import org.junit.Assert.assertEquals
1012
import org.junit.Assert.assertFalse
1113
import org.junit.Assert.assertNull
@@ -16,8 +18,6 @@ import org.schabi.newpipe.R
1618
import org.schabi.newpipe.extractor.ServiceList
1719
import org.schabi.newpipe.extractor.exceptions.ParsingException
1820
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
19-
import java.io.IOException
20-
import java.net.SocketTimeoutException
2121

2222
/**
2323
* Instrumented tests for {@link ErrorInfo}.

‎app/src/androidTest/java/org/schabi/newpipe/ui/components/common/ErrorPanelTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
77
import androidx.compose.ui.test.onNodeWithText
88
import androidx.compose.ui.test.performClick
99
import androidx.test.ext.junit.runners.AndroidJUnit4
10+
import java.net.UnknownHostException
1011
import org.junit.Rule
1112
import org.junit.Test
1213
import org.junit.runner.RunWith
@@ -16,7 +17,6 @@ import org.schabi.newpipe.error.UserAction
1617
import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException
1718
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
1819
import org.schabi.newpipe.ui.theme.AppTheme
19-
import java.net.UnknownHostException
2020

2121
@RunWith(AndroidJUnit4::class)
2222
class ErrorPanelTest {

‎app/src/androidTest/java/org/schabi/newpipe/ui/components/video/comment/CommentSectionInstrumentedTest.kt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import androidx.paging.LoadState
3434
import androidx.paging.LoadStates
3535
import androidx.paging.PagingData
3636
import androidx.paging.compose.collectAsLazyPagingItems
37+
import java.net.UnknownHostException
3738
import kotlinx.coroutines.flow.Flow
3839
import kotlinx.coroutines.flow.MutableStateFlow
3940
import kotlinx.coroutines.flow.StateFlow
@@ -54,7 +55,6 @@ import org.schabi.newpipe.ui.emptystate.EmptyStateComposable
5455
import org.schabi.newpipe.ui.emptystate.EmptyStateSpec
5556
import org.schabi.newpipe.ui.theme.AppTheme
5657
import org.schabi.newpipe.viewmodels.util.Resource
57-
import java.net.UnknownHostException
5858

5959
class CommentSectionInstrumentedTest {
6060

@@ -277,6 +277,7 @@ private fun TestCommentSection(
277277
is Resource.Loading -> item {
278278
LoadingIndicator(modifier = Modifier.padding(top = 8.dp))
279279
}
280+
280281
is Resource.Success -> {
281282
val commentInfo = (uiState as Resource.Success<CommentInfo>).data
282283
val count = commentInfo.commentCount
@@ -290,6 +291,7 @@ private fun TestCommentSection(
290291
.heightIn(min = 128.dp)
291292
)
292293
}
294+
293295
count == 0 -> item {
294296
EmptyStateComposable(
295297
spec = EmptyStateSpec.NoComments,
@@ -298,6 +300,7 @@ private fun TestCommentSection(
298300
.heightIn(min = 128.dp)
299301
)
300302
}
303+
301304
else -> {
302305
if (count >= 0) {
303306
item {
@@ -314,6 +317,7 @@ private fun TestCommentSection(
314317
is LoadState.Loading -> item {
315318
LoadingIndicator(modifier = Modifier.padding(top = 8.dp))
316319
}
320+
317321
is LoadState.Error -> item {
318322
Box(
319323
modifier = Modifier.fillMaxWidth()
@@ -329,13 +333,15 @@ private fun TestCommentSection(
329333
)
330334
}
331335
}
336+
332337
else -> items(comments.itemCount) { index ->
333338
Comment(comment = comments[index]!!) {}
334339
}
335340
}
336341
}
337342
}
338343
}
344+
339345
is Resource.Error -> item {
340346
Box(
341347
modifier = Modifier.fillMaxSize(),

‎app/src/main/java/org/schabi/newpipe/App.kt‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException
2222
import io.reactivex.rxjava3.exceptions.UndeliverableException
2323
import io.reactivex.rxjava3.functions.Consumer
2424
import io.reactivex.rxjava3.plugins.RxJavaPlugins
25+
import java.io.IOException
26+
import java.io.InterruptedIOException
27+
import java.net.SocketException
2528
import org.acra.ACRA.init
2629
import org.acra.ACRA.isACRASenderServiceProcess
2730
import org.acra.config.CoreConfigurationBuilder
@@ -38,9 +41,6 @@ import org.schabi.newpipe.util.StateSaver
3841
import org.schabi.newpipe.util.image.ImageStrategy
3942
import org.schabi.newpipe.util.image.PreferredImageQuality
4043
import org.schabi.newpipe.util.potoken.PoTokenProviderImpl
41-
import java.io.IOException
42-
import java.io.InterruptedIOException
43-
import java.net.SocketException
4444

4545
/*
4646
* Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
@@ -101,7 +101,7 @@ open class App :
101101
NewPipe.init(
102102
getDownloader(),
103103
Localization.getPreferredLocalization(this),
104-
Localization.getPreferredContentCountry(this),
104+
Localization.getPreferredContentCountry(this)
105105
)
106106
Localization.initPrettyTime(Localization.resolvePrettyTime())
107107

@@ -118,25 +118,24 @@ open class App :
118118
this,
119119
prefs.getString(
120120
getString(R.string.image_quality_key),
121-
getString(R.string.image_quality_default),
122-
),
123-
),
121+
getString(R.string.image_quality_default)
122+
)
123+
)
124124
)
125125

126126
configureRxJavaErrorHandler()
127127

128128
YoutubeStreamExtractor.setPoTokenProvider(PoTokenProviderImpl)
129129
}
130130

131-
override fun newImageLoader(context: Context): ImageLoader =
132-
ImageLoader
133-
.Builder(this)
134-
.logger(if (BuildConfig.DEBUG) DebugLogger() else null)
135-
.allowRgb565(getSystemService<ActivityManager>()!!.isLowRamDevice)
136-
.crossfade(true)
137-
.components {
138-
add(OkHttpNetworkFetcherFactory(callFactory = DownloaderImpl.getInstance().client))
139-
}.build()
131+
override fun newImageLoader(context: Context): ImageLoader = ImageLoader
132+
.Builder(this)
133+
.logger(if (BuildConfig.DEBUG) DebugLogger() else null)
134+
.allowRgb565(getSystemService<ActivityManager>()!!.isLowRamDevice)
135+
.crossfade(true)
136+
.components {
137+
add(OkHttpNetworkFetcherFactory(callFactory = DownloaderImpl.getInstance().client))
138+
}.build()
140139

141140
protected open fun getDownloader(): Downloader {
142141
val downloader = DownloaderImpl.init(null)
@@ -190,7 +189,7 @@ open class App :
190189
IOException::class.java,
191190
SocketException::class.java, // blocking code disposed
192191
InterruptedException::class.java,
193-
InterruptedIOException::class.java,
192+
InterruptedIOException::class.java
194193
)
195194
}
196195

@@ -204,7 +203,7 @@ open class App :
204203
OnErrorNotImplementedException::class.java,
205204
MissingBackpressureException::class.java,
206205
// bug in operator
207-
IllegalStateException::class.java,
206+
IllegalStateException::class.java
208207
)
209208
}
210209

@@ -215,7 +214,7 @@ open class App :
215214
.uncaughtExceptionHandler
216215
.uncaughtException(Thread.currentThread(), throwable)
217216
}
218-
},
217+
}
219218
)
220219
}
221220

@@ -241,39 +240,39 @@ open class App :
241240
NotificationChannelCompat
242241
.Builder(
243242
getString(R.string.notification_channel_id),
244-
NotificationManagerCompat.IMPORTANCE_LOW,
243+
NotificationManagerCompat.IMPORTANCE_LOW
245244
).setName(getString(R.string.notification_channel_name))
246245
.setDescription(getString(R.string.notification_channel_description))
247246
.build()
248247
val appUpdateChannel =
249248
NotificationChannelCompat
250249
.Builder(
251250
getString(R.string.app_update_notification_channel_id),
252-
NotificationManagerCompat.IMPORTANCE_LOW,
251+
NotificationManagerCompat.IMPORTANCE_LOW
253252
).setName(getString(R.string.app_update_notification_channel_name))
254253
.setDescription(getString(R.string.app_update_notification_channel_description))
255254
.build()
256255
val hashChannel =
257256
NotificationChannelCompat
258257
.Builder(
259258
getString(R.string.hash_channel_id),
260-
NotificationManagerCompat.IMPORTANCE_HIGH,
259+
NotificationManagerCompat.IMPORTANCE_HIGH
261260
).setName(getString(R.string.hash_channel_name))
262261
.setDescription(getString(R.string.hash_channel_description))
263262
.build()
264263
val errorReportChannel =
265264
NotificationChannelCompat
266265
.Builder(
267266
getString(R.string.error_report_channel_id),
268-
NotificationManagerCompat.IMPORTANCE_LOW,
267+
NotificationManagerCompat.IMPORTANCE_LOW
269268
).setName(getString(R.string.error_report_channel_name))
270269
.setDescription(getString(R.string.error_report_channel_description))
271270
.build()
272271
val newStreamChannel =
273272
NotificationChannelCompat
274273
.Builder(
275274
getString(R.string.streams_notification_channel_id),
276-
NotificationManagerCompat.IMPORTANCE_DEFAULT,
275+
NotificationManagerCompat.IMPORTANCE_DEFAULT
277276
).setName(getString(R.string.streams_notification_channel_name))
278277
.setDescription(getString(R.string.streams_notification_channel_description))
279278
.build()

0 commit comments

Comments
 (0)