Fix conflicts

[jaymengxy]

Related Issue

Closes #???

Summary of Changes

Need Regression Testing

• Yes
• No

Risk Assessment

• Low
• Medium
• High

Additional Notes

Screenshots (if applicable)

[github-actions]

PR Summary

Enhanced WebView functionality and deep linking implementation by improving URL handling, cleaning up code, and optimizing imports. Improved error handling for null URLs and added better logging for URL processing in WebView. Removed unused imports in deep linking utils.

Changes

File	Summary
app/src/main/java/com/flowfoundation/wallet/page/browser/widgets/LilicoWebView.kt	Enhanced LilicoWebView with better URL handling and null checks. Improved code organization in shouldOverrideUrlLoading() with clearer request validation, blocking checks, and URI processing. Added logging for debugging URL navigation.
app/src/main/java/com/flowfoundation/wallet/page/component/deeplinking/Utils.kt	Removed unused imports including Env, ioScope, URLDecoder, and StandardCharsets to improve code cleanliness in deep linking utilities.

---

autogenerated by presubmit.ai

[github-actions]

🚨 Pull request needs attention.

Review Summary

Commits Considered (8)

• cef301e: fix: merge conflicts
• b5b4c10: Merge r2.8.5 with version code 290 from develop to master (#1079)

• Hot fix - telegram deep linking (#1074)

• Hot fix - telegram deep linking

• Hot fix - telegram deep linking

• Hot fix - telegram deep linking

• Hot fix - telegram deep linking

• Hot fix - telegram deep linking

• Hot fix - telegram deep linking

• WC deep linking

• WC deep linking

• fix: update the version code

---

Co-authored-by: Lea Lobanov 44328396+lealobanov@users.noreply.github.com

• 9208679: Hot fix - telegram deep linking (#1074) (#1076)

• Hot fix - telegram deep linking

• 41ee1ee: Merge pull request #1068 from onflow/develop

Merge r2.8.5 with code 288 from develop to master

• b40754e: Merge pull request #1066 from onflow/develop

Merge r2.8.5 from develop to master

• 6088500: Merge pull request #1058 from onflow/develop

Merge wc debugging and token issues

• 7e54aa8: Merge pull request #1052 from onflow/develop

Merge verified/unverified token fixes to master

• 74de7a2: Merge pull request #1045 from onflow/develop

Pre-release 2.8.4

Files Processed (2)

• app/src/main/java/com/flowfoundation/wallet/page/browser/widgets/LilicoWebView.kt (5 hunks)
• app/src/main/java/com/flowfoundation/wallet/page/component/deeplinking/Utils.kt (2 hunks)

Actionable Comments (1)

• app/src/main/java/com/flowfoundation/wallet/page/browser/widgets/LilicoWebView.kt [276-279]

  possible bug: "Potential null pointer dereference in URL handling"

Skipped Comments (1)

• app/src/main/java/com/flowfoundation/wallet/page/browser/widgets/LilicoWebView.kt [285-287]

  best practice: "Hardcoded URL string comparison"

[github-actions]

The null check request?.url == null will pass if either request is null or request.url is null. However, the subsequent code directly uses request.url without null safety checks. Consider using a safe call operator or explicit null checks:

if (request == null || request.url == null) {
    logd(TAG, "shouldOverrideUrlLoading: Request or URL is null")
    return super.shouldOverrideUrlLoading(view, request)
}