Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3c92585 authored Mar 15, 2025 by Nishith Khanna

Merge remote-tracking branch 'origin/lineage-22.1' into a15

parents c8ed325d cf15b218

app/src/main/java/org/lineageos/twelve/fragments/AlbumFragment.kt

+5 −1

Original line number	Diff line number	Diff line
		@@ -343,7 +343,11 @@ class AlbumFragment : Fragment(R.layout.fragment_album) {
		}

		is FlowResult.Error -> {
		Log.e(LOG_TAG, "Error loading album, error: ${it.error}")
		Log.e(
		LOG_TAG,
		"Error loading album, error: ${it.error}",
		it.throwable
		)

		toolbar.title = ""
		albumTitleTextView.text = ""

app/src/main/java/org/lineageos/twelve/fragments/ArtistFragment.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -257,7 +257,7 @@ class ArtistFragment : Fragment(R.layout.fragment_artist) {
		}

		is FlowResult.Error -> {
		Log.e(LOG_TAG, "Error loading artist, error: ${it.error}")
		Log.e(LOG_TAG, "Error loading artist, error: ${it.error}", it.throwable)

		toolbar.title = ""

app/src/main/java/org/lineageos/twelve/fragments/GenreFragment.kt

+5 −1

Original line number	Diff line number	Diff line
		@@ -280,7 +280,11 @@ class GenreFragment : Fragment(R.layout.fragment_genre) {
		}

		is FlowResult.Error -> {
		Log.e(LOG_TAG, "Error loading genre, error: ${it.error}")
		Log.e(
		LOG_TAG,
		"Error loading genre, error: ${it.error}",
		it.throwable
		)

		toolbar.title = ""
		genreNameTextView.text = ""

app/src/main/java/org/lineageos/twelve/fragments/ManageProviderFragment.kt

+5 −1

Original line number	Diff line number	Diff line
		@@ -236,7 +236,11 @@ class ManageProviderFragment : Fragment(R.layout.fragment_manage_provider) {
		}

		is FlowResult.Error -> {
		Log.e(LOG_TAG, "Failed to load provider")
		Log.e(
		LOG_TAG,
		"Failed to load provider, error: ${it.error}",
		it.throwable
		)

		if (it.error == Error.NOT_FOUND) {
		// Get out of here

app/src/main/java/org/lineageos/twelve/fragments/NowPlayingFragment.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ import org.lineageos.twelve.ext.loadThumbnail
		import org.lineageos.twelve.ext.navigateSafe
		import org.lineageos.twelve.ext.updatePadding
		import org.lineageos.twelve.models.FlowResult
		import org.lineageos.twelve.models.FlowResult.Companion.getOrNull
		import org.lineageos.twelve.models.PlaybackState
		import org.lineageos.twelve.models.RepeatMode
		import org.lineageos.twelve.models.Result