Merge remote-tracking branch 'origin/lineage-22.1' into a15 (c8ed325d) · Commits · e / os / android_packages_apps_Twelve

app/src/main/java/org/lineageos/twelve/models/Provider.kt

+4 −2

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@

		package org.lineageos.twelve.models

		import kotlinx.parcelize.Parcelize
		import org.lineageos.twelve.datasources.MediaDataSource

		/**
		@@ -17,9 +18,10 @@ import org.lineageos.twelve.datasources.MediaDataSource
		* @param name The name of the provider given by the user
		* @param visible Whether the user should be aware of it
		*/
		@Parcelize
		class Provider(
		type: ProviderType,
		typeId: Long,
		override val type: ProviderType,
		override val typeId: Long,
		val name: String,
		val visible: Boolean,
		) : ProviderIdentifier(type, typeId), UniqueItem<Provider> {

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,8 @@ import kotlinx.serialization.Serializable
		@Serializable
		@Suppress("PROVIDED_RUNTIME_TOO_LOW")
		open class ProviderIdentifier(
		val type: ProviderType,
		val typeId: Long,
		open val type: ProviderType,
		open val typeId: Long,
		) : Comparable<ProviderIdentifier>, Parcelable {
		override fun compareTo(other: ProviderIdentifier) = compareValuesBy(
		this, other,