fix: click on image notification causes wrong routing

This commit is contained in:
otsmr 2026-04-20 15:27:31 +02:00
parent bce14f5597
commit 57c165d945
2 changed files with 9 additions and 8 deletions

View file

@ -136,13 +136,11 @@ class _AppMainWidgetState extends State<AppMainWidget> {
bool _isLoaded = false;
bool _skipBackup = false;
bool _isTwonlyLocked = true;
int _initialPage = 0;
(Future<int>?, bool) _proofOfWork = (null, false);
@override
void initState() {
_initialPage = widget.initialPage;
initAsync();
super.initState();
}
@ -158,9 +156,6 @@ class _AppMainWidgetState extends State<AppMainWidget> {
if (gUser.appVersion < 62) {
_showDatabaseMigration = true;
}
if (!gUser.startWithCameraOpen) {
_initialPage = 0;
}
}
if (!_isUserCreated && !_showDatabaseMigration) {
@ -210,7 +205,7 @@ class _AppMainWidgetState extends State<AppMainWidget> {
);
} else {
child = HomeView(
initialPage: _initialPage,
initialPage: widget.initialPage,
);
}
} else if (_showOnboarding) {

View file

@ -135,7 +135,8 @@ class HomeViewState extends State<HomeView> {
_mainCameraController.setSharedLinkForPreview,
);
WidgetsBinding.instance.addPostFrameCallback((_) {
if (widget.initialPage == 0) {
if (widget.initialPage == 1 && !gUser.startWithCameraOpen ||
widget.initialPage == 0) {
globalUpdateOfHomeViewPageIndex(0);
}
});
@ -161,10 +162,15 @@ class HomeViewState extends State<HomeView> {
if (notificationAppLaunchDetails?.didNotificationLaunchApp ?? false) {
final payload =
notificationAppLaunchDetails?.notificationResponse?.payload;
if (payload != null && payload.startsWith(Routes.chats)) {
if (payload != null &&
payload.startsWith(Routes.chats) &&
payload != Routes.chats) {
await routerProvider.push(payload);
globalUpdateOfHomeViewPageIndex(0);
}
if (payload == Routes.chats) {
globalUpdateOfHomeViewPageIndex(0);
}
}
}