mirror of
https://git.selfprivacy.org/kherel/selfprivacy.org.app.git
synced 2025-01-09 01:21:14 +00:00
Merge pull request 'fix: Don't let start service migration if the same volume was picked' (#293) from service-migration into master
Reviewed-on: https://git.selfprivacy.org/SelfPrivacy/selfprivacy.org.app/pulls/293 Reviewed-by: Inex Code <inex.code@selfprivacy.org>
This commit is contained in:
commit
8f30c3a4ba
|
@ -55,6 +55,20 @@ class _ServicesMigrationPageState extends State<ServicesMigrationPage> {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool get isVolumePicked {
|
||||||
|
bool isChangeFound = false;
|
||||||
|
for (final Service service in widget.services) {
|
||||||
|
for (final String serviceId in serviceToDisk.keys) {
|
||||||
|
if (serviceId == service.id &&
|
||||||
|
serviceToDisk[serviceId] != service.storageUsage.volume!) {
|
||||||
|
isChangeFound = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return isChangeFound;
|
||||||
|
}
|
||||||
|
|
||||||
/// Check the services and if a service is moved (in a serviceToDisk entry)
|
/// Check the services and if a service is moved (in a serviceToDisk entry)
|
||||||
/// subtract the used storage from the old volume and add it to the new volume.
|
/// subtract the used storage from the old volume and add it to the new volume.
|
||||||
/// The old volume is the volume the service is currently on, shown in services list.
|
/// The old volume is the volume the service is currently on, shown in services list.
|
||||||
|
@ -157,6 +171,7 @@ class _ServicesMigrationPageState extends State<ServicesMigrationPage> {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 16),
|
const SizedBox(height: 16),
|
||||||
|
if (widget.isMigration || (!widget.isMigration && isVolumePicked))
|
||||||
BrandButton.filled(
|
BrandButton.filled(
|
||||||
child: Text('storage.start_migration_button'.tr()),
|
child: Text('storage.start_migration_button'.tr()),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
|
Loading…
Reference in a new issue