-
Notifications
You must be signed in to change notification settings - Fork 9
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
feat: Block only photo sync on wifi only #1466
Closed
Closed
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
# Conflicts: # kDrive/Resources/de.lproj/Localizable.strings # kDrive/Resources/en.lproj/Localizable.strings # kDrive/Resources/es.lproj/Localizable.strings # kDrive/Resources/fr.lproj/Localizable.strings # kDrive/Resources/it.lproj/Localizable.strings
# Conflicts: # Tuist/Package.resolved
* feat: Add style on button # Conflicts: # kDrive/UI/Controller/Menu/WifiSyncSettingsViewController.swift * feat: Link syncOffline with back # Conflicts: # kDrive/UI/Controller/Menu/ParameterTableViewController.swift # kDrive/UI/Controller/Menu/PhotoSyncSettingsViewController.swift # kDrive/UI/Controller/Menu/WifiSyncSettingsViewController.swift # kDrive/UI/View/Menu/Parameters/ParameterSyncTableViewCell.swift # kDriveCore/Utils/DriveUserDefaults+Extension.swift * feat: Sync photos wifiOnly # Conflicts: # kDrive/Resources/de.lproj/Localizable.strings # kDrive/Resources/en.lproj/Localizable.strings # kDrive/Resources/es.lproj/Localizable.strings # kDrive/Resources/fr.lproj/Localizable.strings # kDrive/Resources/it.lproj/Localizable.strings * fix: Change mode # Conflicts: # kDrive/UI/Controller/Menu/OfflineSyncSettingsViewController.swift # kDrive/UI/Controller/Menu/WifiSyncSettingsViewController.swift # kDriveCore/Utils/DriveUserDefaults+Extension.swift * feat: Sync wifi # Conflicts: # kDrive/UI/Controller/Files/Upload/UploadQueueViewController.swift # kDrive/UI/Controller/Menu/MenuViewController.swift * feat: Change cells while no Wifi * feat: Apply requested changes + loco # Conflicts: # kDrive/Resources/de.lproj/Localizable.strings # kDrive/Resources/en.lproj/Localizable.strings # kDrive/Resources/es.lproj/Localizable.strings # kDrive/Resources/fr.lproj/Localizable.strings # kDrive/Resources/it.lproj/Localizable.strings * fix: Remove useless reloadData * fix: Resolve issues since merge and cherry-picks * fix: Clean the code according to review * refactor(uploadQueue): Suspension logic * fix: Variable name * refactor: Merge 2 duplicated files in one * fix: Remove literal --------- Co-authored-by: Adrien Coye de Brunélis <adrien.coye@infomaniak.com>
Signed-off-by: adrien-coye <adrien.coye@infomaniak.com>
5291da3
to
52a80ec
Compare
92fc36c
to
07c248a
Compare
…exit as soon as possible
…reasons if we only allow wifi sync upload
|
7d7bad7
to
0d9637d
Compare
0d9637d
to
3a6b4b0
Compare
This is not scaling right and easy to maintain. We took another direction here #1471 |
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.
root pr #1440
This PR is only exists for reference, will be dropped soon.