Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #5455: Resolve crash in AudioViewModel by initializing state variables #5561

Merged
merged 18 commits into from
Dec 11, 2024
Merged

Fix #5455: Resolve crash in AudioViewModel by initializing state variables #5561

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0dc284f
Fix crash in AudioViewModel by initializing state variables
TanishMoral11 Oct 28, 2024
30ca796
Fix crash in AudioViewModel on rotation by ensuring state initialization
TanishMoral11 Oct 29, 2024
418e0c5
AudioViewModel: resolved changes
TanishMoral11 Nov 7, 2024
18452ca
Remove Unnecessary Lines
TanishMoral11 Nov 7, 2024
557a0ec
Merge branch 'develop' into fix-audio-crash-rotation
adhiamboperes Nov 26, 2024
cfd199e
Merge branch 'develop' into fix-audio-crash-rotation
TanishMoral11 Dec 1, 2024
9e023f9
Correct setStateAndExplorationId
TanishMoral11 Dec 2, 2024
2180c42
Merge branch 'fix-audio-crash-rotation' of https://github.com/TanishM…
TanishMoral11 Dec 2, 2024
233d71d
Added Test
TanishMoral11 Dec 3, 2024
cde7984
Improving Formatting
TanishMoral11 Dec 3, 2024
c317356
Improve Formatting
TanishMoral11 Dec 3, 2024
84884e3
Solved Klint Issue
TanishMoral11 Dec 6, 2024
e7d3f99
Remove .idea/codeStyles/Project.xml from commit
TanishMoral11 Dec 10, 2024
a170de9
Change Helper Class Position In AudioFragmentTest.kt
TanishMoral11 Dec 10, 2024
4a4941c
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
TanishMoral11 Dec 10, 2024
eae634e
Reversed changes on Project.xml
TanishMoral11 Dec 10, 2024
e51551f
Fixed Formatting
TanishMoral11 Dec 10, 2024
c37b990
Merge branch 'develop' into fix-audio-crash-rotation
adhiamboperes Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/src/main/java/org/oppia/android/app/player/audio/AudioViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,11 @@ class AudioViewModel @Inject constructor(
processPlayStatusLiveData()
}

fun setStateAndExplorationId(newState: State, id: String) {
state = newState
explorationId = id
fun setStateAndExplorationId(newState: State?, id: String?) {
if (newState != null && id != null) {
state = newState
explorationId = id
}
adhiamboperes marked this conversation as resolved.
Show resolved Hide resolved
}

fun loadMainContentAudio(allowAutoPlay: Boolean, reloadingContent: Boolean) {
Expand All @@ -88,6 +90,8 @@ class AudioViewModel @Inject constructor(
* @param allowAutoPlay If false, audio is guaranteed not to be autoPlayed.
*/
private fun loadAudio(contentId: String?, allowAutoPlay: Boolean, reloadingMainContent: Boolean) {
// Check if 'state' is initialized before proceeding.
adhiamboperes marked this conversation as resolved.
Show resolved Hide resolved
if (!::state.isInitialized) return
val targetContentId = contentId ?: state.content.contentId
val voiceoverMapping =
state.recordedVoiceoversMap[targetContentId] ?: VoiceoverMapping.getDefaultInstance()
Expand Down
Loading