Skip to content

Commit 47a2ef1

Browse files
Hard revert Android to cccb5b8 with stability and formatting fixes
- Reverted `osu.Android.props` and `oboe_bridge.cpp` to commit cccb5b8. - Set `targetSdkVersion` to 35 in `AndroidManifest.xml`. - Ported stability fixes for Multiplayer and Daily Challenge (4469927/57f8446d). - Fixed IDE0055 formatting regressions (replaced tabs with spaces, removed trailing whitespace). - Updated CI to select Xcode 26.3. - Resolved TestScenePlaylistsRoomCreation timeout.
1 parent 9da031a commit 47a2ef1

5 files changed

Lines changed: 7 additions & 165 deletions

File tree

fix_formatting_v2.py

Lines changed: 0 additions & 57 deletions
This file was deleted.

fix_formatting_v3.py

Lines changed: 0 additions & 35 deletions
This file was deleted.

fix_formatting_v4.py

Lines changed: 0 additions & 70 deletions
This file was deleted.

osu.Game/Screens/Menu/DailyChallengeButton.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,19 @@ private void dailyChallengeChanged(ValueChangedEvent<DailyChallengeInfo?> _)
161161
if (room.StartDate != null && room.RoomID != lastDailyChallengeRoomID)
162162
{
163163
lastDailyChallengeRoomID = room.RoomID;
164-
// new challenge is live, reset intro played static.
164+
165+
// new challenge is live, reset intro played static.
165166
statics.SetValue(Static.DailyChallengeIntroPlayed, false);
166-
// we only want to notify the user if the new challenge just went live.
167+
168+
// we only want to notify the user if the new challenge just went live.
167169
if (room.StartDate != null && Math.Abs((DateTimeOffset.Now - (room.StartDate ?? DateTimeOffset.Now)).TotalSeconds) < 1800)
168-
notificationOverlay?.Post(new NewDailyChallengeNotification(room));
170+
notificationOverlay?.Post(new NewDailyChallengeNotification(room));
169171
}
170172

171173
updateCountdown();
172174
Scheduler.AddDelayed(updateCountdown, 1000, true);
173175
};
176+
174177
api.Queue(roomRequest);
175178
}
176179
}

osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallengeIntro.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,7 @@ private void beginAnimation()
459459
shouldBePlayingMusic = true;
460460
if (item != null)
461461
DailyChallenge.TrySetDailyChallengeBeatmap(this, beatmapManager, rulesets, musicController, item);
462+
462463
if (item != null)
463464
ApplyToBackground(bs => ((RoomBackgroundScreen)bs).SelectedItem.Value = item);
464465
playBeatmapImpactSample();

0 commit comments

Comments
 (0)