MrBlake/MrbWebLibre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

run formatter

Browse Source
This commit is contained in:
Fabian Freund
2026-01-21 11:25:56 +01:00
parent dc4a5a9c85
commit baf19eed99
19 changed files with 231 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/features/geckoview/domain/providers/selected_tab.dart
+5 -1
View File
@@ -52,7 +52,11 @@ class SelectedTab extends _$SelectedTab {
state = tabId;
},
onError: (Object error, StackTrace stackTrace) {
logger.e('Error in selected tab events', error: error, stackTrace: stackTrace);
logger.e(
'Error in selected tab events',
error: error,
stackTrace: stackTrace,
);
},
);
app/lib/features/geckoview/domain/providers/tab_list.dart
+5 -1
View File
@@ -57,7 +57,11 @@ class TabList extends _$TabList {
}
},
onError: (Object error, StackTrace stackTrace) {
logger.e('Error in tab list events', error: error, stackTrace: stackTrace);
logger.e(
'Error in tab list events',
error: error,
stackTrace: stackTrace,
);
},
);
app/lib/features/geckoview/domain/providers/tab_state.dart
+35 -7
View File
@@ -223,7 +223,11 @@ class TabStates extends _$TabStates {
await _onTabContentStateChange(event);
},
onError: (Object error, StackTrace stackTrace) {
logger.e('Error in tab content events', error: error, stackTrace: stackTrace);
logger.e(
'Error in tab content events',
error: error,
stackTrace: stackTrace,
);
},
),
eventService.iconChangeEvents.listen(
@@ -231,7 +235,11 @@ class TabStates extends _$TabStates {
await _onIconChange(event);
},
onError: (Object error, StackTrace stackTrace) {
logger.e('Error in icon change events', error: error, stackTrace: stackTrace);
logger.e(
'Error in icon change events',
error: error,
stackTrace: stackTrace,
);
},
),
eventService.thumbnailEvents.listen(
@@ -239,7 +247,11 @@ class TabStates extends _$TabStates {
await _onThumbnailChange(event);
},
onError: (Object error, StackTrace stackTrace) {
logger.e('Error in thumbnail events', error: error, stackTrace: stackTrace);
logger.e(
'Error in thumbnail events',
error: error,
stackTrace: stackTrace,
);
},
),
eventService.securityInfoEvents.listen(
@@ -247,7 +259,11 @@ class TabStates extends _$TabStates {
_onSecurityInfoStateChange(event);
},
onError: (Object error, StackTrace stackTrace) {
logger.e('Error in security info events', error: error, stackTrace: stackTrace);
logger.e(
'Error in security info events',
error: error,
stackTrace: stackTrace,
);
},
),
eventService.historyEvents.listen(
@@ -255,7 +271,11 @@ class TabStates extends _$TabStates {
_onHistoryStateChange(event);
},
onError: (Object error, StackTrace stackTrace) {
logger.e('Error in history events', error: error, stackTrace: stackTrace);
logger.e(
'Error in history events',
error: error,
stackTrace: stackTrace,
);
},
),
eventService.readerableEvents.listen(
@@ -263,7 +283,11 @@ class TabStates extends _$TabStates {
_onReaderableStateChange(event);
},
onError: (Object error, StackTrace stackTrace) {
logger.e('Error in readerable events', error: error, stackTrace: stackTrace);
logger.e(
'Error in readerable events',
error: error,
stackTrace: stackTrace,
);
},
),
eventService.findResultsEvent
@@ -273,7 +297,11 @@ class TabStates extends _$TabStates {
_onFindResultsChange(event);
},
onError: (Object error, StackTrace stackTrace) {
logger.e('Error in find results events', error: error, stackTrace: stackTrace);
logger.e(
'Error in find results events',
error: error,
stackTrace: stackTrace,
);
},
),
];
app/lib/features/geckoview/domain/providers/web_extensions_state.dart
+20 -4
View File
@@ -106,7 +106,11 @@ class WebExtensionsState extends _$WebExtensionsState {
_onExtensionUpdate(event);
},
onError: (Object error, StackTrace stackTrace) {
logger.e('Error in browser extension stream', error: error, stackTrace: stackTrace);
logger.e(
'Error in browser extension stream',
error: error,
stackTrace: stackTrace,
);
},
),
addonService.browserIconStream.listen(
@@ -114,7 +118,11 @@ class WebExtensionsState extends _$WebExtensionsState {
await _onIconChange(event);
},
onError: (Object error, StackTrace stackTrace) {
logger.e('Error in browser icon stream', error: error, stackTrace: stackTrace);
logger.e(
'Error in browser icon stream',
error: error,
stackTrace: stackTrace,
);
},
),
],
@@ -124,7 +132,11 @@ class WebExtensionsState extends _$WebExtensionsState {
_onExtensionUpdate(event);
},
onError: (Object error, StackTrace stackTrace) {
logger.e('Error in page extension stream', error: error, stackTrace: stackTrace);
logger.e(
'Error in page extension stream',
error: error,
stackTrace: stackTrace,
);
},
),
addonService.pageIconStream.listen(
@@ -132,7 +144,11 @@ class WebExtensionsState extends _$WebExtensionsState {
await _onIconChange(event);
},
onError: (Object error, StackTrace stackTrace) {
logger.e('Error in page icon stream', error: error, stackTrace: stackTrace);
logger.e(
'Error in page icon stream',
error: error,
stackTrace: stackTrace,
);
},
),
],
app/lib/features/geckoview/domain/repositories/tab.dart
+87 -76
View File
@@ -436,100 +436,107 @@ class TabRepository extends _$TabRepository {
);
},
onError: (Object error, StackTrace stackTrace) {
logger.e('Error in tab added stream', error: error, stackTrace: stackTrace);
logger.e(
'Error in tab added stream',
error: error,
stackTrace: stackTrace,
);
},
);
final containerSiteAssignementSub = eventSerivce.siteAssignementEvent.listen((
event,
) async {
if (event.tabId != null) {
// Prevent concurrent processing of the same tab (race condition protection)
if (_tabsBeingProcessedForAssignment.contains(event.tabId)) {
logger.d(
'Skipping container assignment for tab ${event.tabId} - already being processed',
);
return;
}
final containerSiteAssignementSub = eventSerivce.siteAssignementEvent.listen(
(event) async {
if (event.tabId != null) {
// Prevent concurrent processing of the same tab (race condition protection)
if (_tabsBeingProcessedForAssignment.contains(event.tabId)) {
logger.d(
'Skipping container assignment for tab ${event.tabId} - already being processed',
);
return;
}
_tabsBeingProcessedForAssignment.add(event.tabId!);
_tabsBeingProcessedForAssignment.add(event.tabId!);
// ignore: only_use_keep_alive_inside_keep_alive
final tabState = ref.read(tabStateProvider(event.tabId));
if (tabState != null) {
final uri = Uri.parse(event.url);
final originUri = event.originUrl.mapNotNull(Uri.parse);
// ignore: only_use_keep_alive_inside_keep_alive
final tabState = ref.read(tabStateProvider(event.tabId));
if (tabState != null) {
final uri = Uri.parse(event.url);
final originUri = event.originUrl.mapNotNull(Uri.parse);
final targetContainerId = await ref
.read(containerRepositoryProvider.notifier)
.siteAssignedContainerId(Uri.parse(uri.origin));
final containerData = await targetContainerId.mapNotNull(
(id) => ref
final targetContainerId = await ref
.read(containerRepositoryProvider.notifier)
.getContainerData(id),
);
.siteAssignedContainerId(Uri.parse(uri.origin));
final containerData = await targetContainerId.mapNotNull(
(id) => ref
.read(containerRepositoryProvider.notifier)
.getContainerData(id),
);
if (containerData != null) {
final tabIsEmpty =
tabState.url == TabState.defaultUrl &&
tabState.historyState.items.isEmpty;
if (containerData != null) {
final tabIsEmpty =
tabState.url == TabState.defaultUrl &&
tabState.historyState.items.isEmpty;
if (event.blocked || tabIsEmpty) {
// Check if contextual identity is changing
final currentContainerData = await ref
.read(tabDataRepositoryProvider.notifier)
.getTabContainerData(tabState.id);
if (event.blocked || tabIsEmpty) {
// Check if contextual identity is changing
final currentContainerData = await ref
.read(tabDataRepositoryProvider.notifier)
.getTabContainerData(tabState.id);
final contextChanging =
containerData.metadata.contextualIdentity !=
currentContainerData?.metadata.contextualIdentity;
final contextChanging =
containerData.metadata.contextualIdentity !=
currentContainerData?.metadata.contextualIdentity;
await addTab(
url: uri,
private: tabState.isPrivate,
container: Value(containerData),
parentId: contextChanging
? null
: tabState.id, // Break parent chain if context changes
selectTab: true,
);
await addTab(
url: uri,
private: tabState.isPrivate,
container: Value(containerData),
parentId: contextChanging
? null
: tabState.id, // Break parent chain if context changes
selectTab: true,
);
if (tabIsEmpty) {
await closeTab(tabState.id);
}
} else {
final tabContainerId = await ref
.read(tabDataRepositoryProvider.notifier)
.getTabContainerId(tabState.id);
if (tabIsEmpty) {
await closeTab(tabState.id);
}
} else {
final tabContainerId = await ref
.read(tabDataRepositoryProvider.notifier)
.getTabContainerId(tabState.id);
if (targetContainerId != tabContainerId) {
if (originUri == null) {
await ref
.read(tabDataRepositoryProvider.notifier)
.assignContainer(tabState.id, containerData);
} else if (tabState.url == originUri) {
await ref
.read(tabDataRepositoryProvider.notifier)
.assignContainer(
tabState.id,
containerData,
closeOldTab: false,
);
} else {
logger.w(
'Could not match origin url for assignment ${tabState.url} to request ${event.originUrl}',
);
if (targetContainerId != tabContainerId) {
if (originUri == null) {
await ref
.read(tabDataRepositoryProvider.notifier)
.assignContainer(tabState.id, containerData);
} else if (tabState.url == originUri) {
await ref
.read(tabDataRepositoryProvider.notifier)
.assignContainer(
tabState.id,
containerData,
closeOldTab: false,
);
} else {
logger.w(
'Could not match origin url for assignment ${tabState.url} to request ${event.originUrl}',
);
}
}
}
}
} else {
logger.w('Could not get tab for assignement ${tabState?.url}');
}
} else {
logger.w('Could not get tab for assignement ${tabState?.url}');
}
}
},
},
onError: (Object error, StackTrace stackTrace) {
logger.e('Error in container site assignment stream', error: error, stackTrace: stackTrace);
logger.e(
'Error in container site assignment stream',
error: error,
stackTrace: stackTrace,
);
},
);
@@ -545,7 +552,11 @@ class TabRepository extends _$TabRepository {
);
},
onError: (Object error, StackTrace stackTrace) {
logger.e('Error in tab content stream', error: error, stackTrace: stackTrace);
logger.e(
'Error in tab content stream',
error: error,
stackTrace: stackTrace,
);
},
);