Merge/release 7.77.1 into 7.78 (#3287)

Co-authored-by: Philip Simpson <[email protected]> Co-authored-by: Ashita Agrawal <[email protected]> Co-authored-by: Philip Simpson <[email protected]>
Automattic · Nov 26, 2024 · 005fac8 · 005fac8
1 parent 8cba3aa
commit 005fac8
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/metadata/release_notes.txt b/metadata/release_notes.txt
@@ -7,6 +7,6 @@
 *   Updates
     *   Update profile header UI
         ([#3235](https://github.com/Automattic/pocket-casts-android/pull/3235))
-    *   Deferred addition to UpNext post update after sync 
+    *   Deferred addition to UpNext post update after sync
         ([#3211](https://github.com/Automattic/pocket-casts-android/pull/312))
 
diff --git a/...tures/endofyear/src/main/java/au/com/shiftyjelly/pocketcasts/endofyear/StoriesActivity.kt b/...tures/endofyear/src/main/java/au/com/shiftyjelly/pocketcasts/endofyear/StoriesActivity.kt
@@ -1,9 +1,7 @@
 package au.com.shiftyjelly.pocketcasts.endofyear
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
-import android.content.pm.ActivityInfo
 import android.graphics.Color
 import android.os.Bundle
 import android.view.WindowManager
@@ -108,8 +106,6 @@ class StoriesActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         if (!isTablet) {
-            @SuppressLint("SourceLockedOrientationActivity")
-            requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
             enableEdgeToEdge(SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT))
             hideSystemBars()
         }

diff --git a/...ories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/playback/PlaybackState.kt b/...ories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/playback/PlaybackState.kt
@@ -66,6 +66,7 @@ data class PlaybackState(
             }
 
             return PlaybackState(
+                state = state,
                 isBuffering = !episode.isDownloaded && state == State.PLAYING,
                 isPrepared = isPrepared,
                 isSleepTimerRunning = previousPlaybackState?.isSleepTimerRunning ?: false,

diff --git a/version.properties b/version.properties
@@ -1,2 +1,2 @@
 versionName=7.78-rc-1
-versionCode=9287
+versionCode=9288