Refactor FXIOS-11063 Improve how we handle failing network requests to retrieve favicon URL and images #24282
+46
−6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lmarceau
reviewed
Jan 22, 2025
| @@ -38,6 +38,12 @@ struct DefaultFaviconURLHandler: FaviconURLHandler { | |||
| await urlCache.cacheURL(cacheKey: model.cacheKey, faviconURL: url) | |||
| return url | |||
| } catch { | |||
| let isServerError = ServerErrorHelper.extractServerError(error) | |||
There was a problem hiding this comment.
Could we have unit tests for this? You might have to remove the ServerErrorHelper being static to do so
| @@ -117,7 +117,13 @@ class DefaultImageHandler: ImageHandler { | |||
| await imageCache.cacheImage(image: image, cacheKey: imageModel.cacheKey, type: imageModel.imageType) | |||
| return image | |||
| } catch { | |||
| return await fallbackToLetterFavicon(imageModel: imageModel) | |||
| let isServerError = ServerErrorHelper.extractServerError(error) | |||
There was a problem hiding this comment.
Unit tests for this as well and the fallbackToLetterFavicon code would be awesome 🙏
There was a problem hiding this comment.
LGTM 🎉 great work just some minor things. Also as @lmarceau would be nice to have test coverage for the changes
| let isServerError = ServerErrorHelper.extractServerError(error) | ||
|
|
||
| if isServerError { | ||
| return await fallbackToLetterFavicon(imageModel: imageModel, isServerError: true) |
There was a problem hiding this comment.
can we pass directly isServerError to the method ?
return await fallbackToLetterFavicon(imageModel: imageModel, isServerError: isServerError)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📜 Tickets
Jira ticket
Github issue
💡 Description
📝 Checklist
You have to check all boxes before merging
@Mergifyio backport release/v120)