-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
BugFix - CalendarImportWork #14757
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
BugFix - CalendarImportWork #14757
Conversation
Codecov ReportAttention: Patch coverage is
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
🚀 New features to boost your workflow:
|
dfef7bf
to
f2dfc6a
Compare
@@ -239,61 +249,67 @@ class BackupFragment : FileFragment(), OnDateSetListener, Injectable { | |||
openDate(selectedDate) | |||
} | |||
|
|||
val contactsPreferenceActivity = activity as ContactsPreferenceActivity? | |||
if (contactsPreferenceActivity != null) { | |||
val backupFolderPath = resources.getString(R.string.contacts_backup_folder) + OCFile.PATH_SEPARATOR |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is only contactsBackupFolder being used in this case? We also have a calendarBackupFolder, so shouldn't we be checking for the existence of both?
Additionally, how is it that refreshing the contents of the contactsBackupFolder results in calendar backups appearing as well? With the new implementation, I can now see both calendars and contacts, but I’d like to understand the reasoning behind this behavior.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is only contactsBackupFolder being used in this case? We also have a calendarBackupFolder, so shouldn't we be checking for the existence of both?
Indeed, we should.
Additionally, how is it that refreshing the contents of the contactsBackupFolder results in calendar backups appearing as well? With the new implementation, I can now see both calendars and contacts, but I’d like to understand the reasoning behind this behavior.
Both folders are updated within onDateSet and openDate.
Test also on master to check if the import works |
b541498
to
56326c6
Compare
56326c6
to
f7ca5cf
Compare
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
…restore backup button. Because if backup exists restore backup button will be visible without backupNow button and UI going to look weird Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
f7ca5cf
to
7bdcc9c
Compare
APK file: https://www.kaminsky.me/nc-dev/android-artifacts/14757.apk |
blue-Light-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14757-Screenshot-blue-Light-15-24 |
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.