mirror of
https://github.com/samsonjs/immich.git
synced 2026-04-27 15:07:45 +00:00
fix: deep link service when user is null (#25530)
* fix: deep link service when user is null * fix: nit
This commit is contained in:
parent
6430c88b84
commit
97220102e4
1 changed files with 14 additions and 5 deletions
|
|
@ -33,7 +33,7 @@ final deepLinkServiceProvider = Provider(
|
||||||
ref.watch(beta_asset_provider.assetServiceProvider),
|
ref.watch(beta_asset_provider.assetServiceProvider),
|
||||||
ref.watch(remoteAlbumServiceProvider),
|
ref.watch(remoteAlbumServiceProvider),
|
||||||
ref.watch(driftMemoryServiceProvider),
|
ref.watch(driftMemoryServiceProvider),
|
||||||
ref.watch(currentUserProvider.select((user) => user!)),
|
ref.watch(currentUserProvider),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -51,7 +51,7 @@ class DeepLinkService {
|
||||||
final RemoteAlbumService _betaRemoteAlbumService;
|
final RemoteAlbumService _betaRemoteAlbumService;
|
||||||
final DriftMemoryService _betaMemoryServiceProvider;
|
final DriftMemoryService _betaMemoryServiceProvider;
|
||||||
|
|
||||||
final UserDto _currentUser;
|
final UserDto? _currentUser;
|
||||||
|
|
||||||
const DeepLinkService(
|
const DeepLinkService(
|
||||||
this._memoryService,
|
this._memoryService,
|
||||||
|
|
@ -131,9 +131,18 @@ class DeepLinkService {
|
||||||
if (Store.isBetaTimelineEnabled) {
|
if (Store.isBetaTimelineEnabled) {
|
||||||
List<DriftMemory> memories = [];
|
List<DriftMemory> memories = [];
|
||||||
|
|
||||||
memories = memoryId == null
|
if (memoryId == null) {
|
||||||
? await _betaMemoryServiceProvider.getMemoryLane(_currentUser.id)
|
if (_currentUser == null) {
|
||||||
: [await _betaMemoryServiceProvider.get(memoryId)].whereType<DriftMemory>().toList();
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
memories = await _betaMemoryServiceProvider.getMemoryLane(_currentUser.id);
|
||||||
|
} else {
|
||||||
|
final memory = await _betaMemoryServiceProvider.get(memoryId);
|
||||||
|
if (memory != null) {
|
||||||
|
memories = [memory];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (memories.isEmpty) {
|
if (memories.isEmpty) {
|
||||||
return null;
|
return null;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue