android icon indicating copy to clipboard operation
android copied to clipboard

BugFix - CalendarImportWork

Open alperozturk96 opened this issue 1 year ago • 3 comments

  • [x] Tests written, or not not needed

Changes

Previously, if any calendar source import job failed, it caused the entire calendar event import to fail.

The visibility logic for the date picker, which was previously tied only to contactsBackupFolder, has been extended to also consider calendarBackupFolderPath.

Duplicated code has been extracted into a new getBackupFiles() method.

The legacy AsyncTask implementation has been replaced with Kotlin Coroutines.

alperozturk96 avatar Apr 04 '25 10:04 alperozturk96

Codecov Report

Attention: Patch coverage is 0% with 14 lines in your changes missing coverage. Please review.

Project coverage is 24.24%. Comparing base (0cdbc00) to head (a631445).

Files with missing lines Patch % Lines
...va/com/nextcloud/client/jobs/CalendarImportWork.kt 0.00% 14 Missing :warning:
Additional details and impacted files
@@             Coverage Diff              @@
##             master   #14757      +/-   ##
============================================
+ Coverage     24.23%   24.24%   +0.01%     
- Complexity     3333     3334       +1     
============================================
  Files           700      700              
  Lines         51340    51350      +10     
  Branches       6928     6931       +3     
============================================
+ Hits          12443    12451       +8     
  Misses        36955    36955              
- Partials       1942     1944       +2     
Files with missing lines Coverage Δ
...va/com/nextcloud/client/jobs/CalendarImportWork.kt 0.00% <0.00%> (ø)

... and 8 files with indirect coverage changes

:rocket: New features to boost your workflow:
  • :snowflake: Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

codecov[bot] avatar Apr 04 '25 11:04 codecov[bot]

Test also on master to check if the import works

tobiasKaminsky avatar Apr 30 '25 08:04 tobiasKaminsky

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/14757.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

github-actions[bot] avatar Jul 28 '25 12:07 github-actions[bot]

blue-Light-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14757-Screenshot-blue-Light-12-29

github-actions[bot] avatar Jul 28 '25 12:07 github-actions[bot]

/backport to stable-3.32

alperozturk96 avatar Aug 04 '25 07:08 alperozturk96

The backport to stable-3.32 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-3.32
git pull origin stable-3.32

# Create the new backport branch
git checkout -b backport/14757/stable-3.32

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick cb042f3b f1a8b970 9ab5d4af 1afb1267 32686096 d7d7ee42 4925a971 faed7844 0da986b4 bd08c99e a60944b9 3c51a4f2

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/14757/stable-3.32

Error: Failed to push branch backport/14757/stable-3.32: remote: Invalid username or token. Password authentication is not supported for Git operations. fatal: Authentication failed for 'https://github.com/nextcloud/android.git/'


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

backportbot[bot] avatar Aug 04 '25 07:08 backportbot[bot]

Backport - https://github.com/nextcloud/android/pull/15298

alperozturk96 avatar Aug 04 '25 07:08 alperozturk96