Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6986 from litetex/fix-build-problems-update-kotlin

Browse source 
Fix build problems and updated kotlin
This commit is contained in:
Tobi 2021-08-30 21:20:45 +02:00 • committed by GitHub
commit 0e6668636d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/schabi/newpipe/about/License.kt
View file

@ -1,7 +1,7 @@
package org.schabi.newpipe.about
import android.os.Parcelable
import kotlinx.android.parcel.Parcelize
import kotlinx.parcelize.Parcelize
import java.io.Serializable
/**

2
app/src/main/java/org/schabi/newpipe/about/SoftwareComponent.kt
View file

@ -1,7 +1,7 @@
package org.schabi.newpipe.about
import android.os.Parcelable
import kotlinx.android.parcel.Parcelize
import kotlinx.parcelize.Parcelize
@Parcelize
class SoftwareComponent

2
app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt
View file

@ -2,7 +2,7 @@ package org.schabi.newpipe.error
import android.os.Parcelable
import androidx.annotation.StringRes
import kotlinx.android.parcel.Parcelize
import kotlinx.parcelize.Parcelize
import org.schabi.newpipe.R
import org.schabi.newpipe.extractor.Info
import org.schabi.newpipe.extractor.NewPipe

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

@ -300,6 +300,12 @@ class FeedLoadService : Service() {
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe { _, throwable ->
// There seems to be a bug in the kotlin plugin as it tells you when
// building that this can't be null:
// "Condition 'throwable != null' is always 'true'"
// However it can indeed be null
// The suppression may be removed in further versions
@Suppress("SENSELESS_COMPARISON")
if (throwable != null) {
Log.e(TAG, "Error while storing result", throwable)
handleError(throwable)

2
app/src/main/java/org/schabi/newpipe/util/SavedState.kt
View file

@ -1,7 +1,7 @@
package org.schabi.newpipe.util
import android.os.Parcelable
import kotlinx.android.parcel.Parcelize
import kotlinx.parcelize.Parcelize
/**
* Information about the saved state on the disk.

2
app/src/main/java/us/shandian/giga/get/MissionRecoveryInfo.kt
View file

@ -1,7 +1,7 @@
package us.shandian.giga.get
import android.os.Parcelable
import kotlinx.android.parcel.Parcelize
import kotlinx.parcelize.Parcelize
import org.schabi.newpipe.extractor.MediaFormat
import org.schabi.newpipe.extractor.stream.AudioStream
import org.schabi.newpipe.extractor.stream.Stream