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.

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: PhotoSync with explicit wifi or 4G #1440

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

Conversation

BaptGrv
Copy link
Contributor

@BaptGrv BaptGrv commented Feb 17, 2025

Depends on #1444
Depends on #1441
Depends on #1452
Depends on #1453

Superseding #1310

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 👍

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

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.

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
BaptGrv and others added 12 commits February 26, 2025 08:54
# 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 <[email protected]>
@BaptGrv BaptGrv force-pushed the feat/sync-mode-wifi branch from 76d0187 to 8d5f25a Compare February 26, 2025 07:54
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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants