76-Fix_Conflict_for_upstream_update_5.913
Description
Merge conflict introduced when automatic update with upstream called for v5.913 (example: https://gitlab.e.foundation/e/os/mail/-/pipelines/171422). This MR fixed those conflicts, test for any regressions introduced or not.\
Tested by developer:
-
Is any UI/UX related regression introduced -
Login functionality -
Mail send -
Mail receive -
Default preferences -
Mail moving functionality
Issue(s)
Test environment
- Download apk from https://gitlab.e.foundation/e/os/mail/-/jobs/273320/artifacts/file/app/k9mail/build/outputs/apk/debug/k9mail-debug.apk, & install in your device
Test procedures
- Test if any our changes got revert or not
- check if the upstream changes applied or not (https://github.com/k9mail/k-9/releases/tag/5.913)
Technical details
Screenshots
| 1 | 2 | 3 | 4 | 5 |
|---|---|---|---|---|
 |
 |
 |
 |
 |
 |
 |
 |
 |
 |
Check list
-
Self review -
Test procedure explained -
Tested on fresh install -
Tested applied as an update -
License -
Internal documentation -
User documentation
Edited by Fahim Salam Chowdhury