Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat: PhotoSync with explicit wifi or 4G #1440

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

feat: PhotoSync with explicit wifi or 4G #1440

wants to merge 19 commits into from

Conversation

BaptGrv
Copy link
Contributor

@BaptGrv BaptGrv commented Feb 17, 2025 •
edited by adrien-coye
Loading

Depends on #1444
Depends on #1441
Depends on #1452
Depends on #1453
Depends on #1460
Depends on #1463
Depends on #1466
Depends on #1470

Superseding #1310

@BaptGrv BaptGrv requested a review from adrien-coye February 17, 2025 12:47
@adrien-coye adrien-coye mentioned this pull request Feb 17, 2025
Closed
adrien-coye
adrien-coye reviewed Feb 18, 2025
View reviewed changes
Copy link
Contributor

@adrien-coye adrien-coye left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two small remarks left, almost there 👍

@adrien-coye adrien-coye mentioned this pull request Feb 21, 2025
Merged
adrien-coye
adrien-coye reviewed Feb 21, 2025
View reviewed changes
Copy link
Contributor

@adrien-coye adrien-coye left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small remark

@BaptGrv BaptGrv force-pushed the feat/sync-mode-wifi branch from 758f3fe to a30a605 Compare February 21, 2025 12:12
@BaptGrv BaptGrv force-pushed the feat/sync-mode-wifi branch from 7c9bf49 to efe48e0 Compare February 21, 2025 13:47
adrien-coye
adrien-coye approved these changes Feb 21, 2025
View reviewed changes
Copy link
Contributor

@adrien-coye adrien-coye left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did some testing of the PR
I found a tiny UI glitch when the queue is suspended, it hides an upload.
I also found a strange bug related but not caused by the PR that I want to investigate before I make a new beta.

I will merge it later after further tests.

@BaptGrv BaptGrv force-pushed the feat/sync-mode-wifi branch from 5816e7f to 516b38b Compare February 25, 2025 10:18
@adrien-coye adrien-coye mentioned this pull request Feb 25, 2025
Merged
@BaptGrv BaptGrv force-pushed the feat/sync-mode-wifi branch from 76d0187 to 8d5f25a Compare February 26, 2025 07:54
adrien-coye
adrien-coye requested changes Feb 26, 2025
View reviewed changes
Copy link
Contributor

@adrien-coye adrien-coye left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We just need to make sure the "Sync offline files" is used by the DownoadQueue.

@adrien-coye adrien-coye mentioned this pull request Feb 28, 2025
Merged
@BaptGrv BaptGrv force-pushed the feat/sync-mode-wifi branch from c341f8a to 72b65f3 Compare March 4, 2025 14:17
@adrien-coye adrien-coye added this to the 5.3.0 milestone Mar 5, 2025
BaptGrv and others added 8 commits March 5, 2025 09:11
@BaptGrv
feat: SyncMod wifi or mobileData
e4c3dc0
@BaptGrv
feat: Front for syncMod wifi or mobileData
20c548b 
# 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
@BaptGrv
fix: Add "e" to "syncMod"
f5ed074 
# Conflicts:
#	Tuist/Package.resolved
@BaptGrv
fix: Remove hardcode
db09497
@adrien-coye @BaptGrv
fix: Fix import InfomaniakCoreUIKit
282eb5e
@adrien-coye @BaptGrv
fix: Resolve issues since merge and cherry-picks
db63c1e
@BaptGrv
fix: Remove force unwrap
fe1e9e2
@BaptGrv
fix: Create init for the selectedMode
131050c
BaptGrv and others added 6 commits March 5, 2025 09:11
@BaptGrv @adrien-coye
feat: UI for PhotoSync with explicit wifi or 4G (#1441)
1e10680 
* 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 <[email protected]>
@BaptGrv
fix: SwiftFormat
aeba203
@BaptGrv
fix: Wrong condition to suspend queue
33b2a39
@adrien-coye @BaptGrv
feat(UploadQueueViewController): Section support using DiffKit
7edcc42
@adrien-coye @BaptGrv
refactor(UploadQueue): New updateQueueSuspension public function
0e7a81c
@adrien-coye @BaptGrv
fix(PhotoSyncSettingsViewController): Update upload queue on save pho…
d316336 
…to sync settings
@BaptGrv BaptGrv force-pushed the feat/sync-mode-wifi branch from 72b65f3 to d316336 Compare March 5, 2025 08:11
@github-actions github-actions bot removed the dependent label Mar 5, 2025
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 5, 2025 •
edited
Loading

This PR/issue depends on:

@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 5, 2025

This PR/issue depends on:

@adrien-coye adrien-coye mentioned this pull request Mar 5, 2025
Draft
1 task
@sonarqubecloud SonarQubeCloud
Copy link

sonarqubecloud bot commented Mar 6, 2025

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adrien-coye adrien-coye adrien-coye requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
dependent
Projects
None yet
Milestone
5.3.0
Development

Successfully merging this pull request may close these issues.
2 participants
@BaptGrv @adrien-coye