fix: Flatpak builds didn't work

Fixes #434

![image](/attachments/351cc025-8dae-44f2-9bca-18f8950e0780)

Co-authored-by: Inex Code <inex.code@selfprivacy.org>
Reviewed-on: #500
Reviewed-by: Inex Code <inex.code@selfprivacy.org>
Co-authored-by: NaiJi ✨ <naiji@noreply.git.selfprivacy.org>
Co-committed-by: NaiJi ✨ <naiji@noreply.git.selfprivacy.org>

assets/translations/en.json

@@ -606,5 +606,16 @@
         "reset_onboarding": "Reset onboarding switch",
         "reset_onboarding_description": "Reset onboarding switch to show onboarding screen again",
         "cubit_statuses": "Cubit loading statuses"
+    },
+    "countries": {
+        "germany": "Germany",
+        "netherlands": "Netherlands",
+        "singapore": "Singapore",
+        "united_kingdom": "United Kingdom",
+        "canada": "Canada",
+        "india": "India",
+        "australia": "Australia",
+        "united_states": "United States",
+        "finland": "Finland"
     }
-}
+}

lib/config/hive_config.dart

@@ -32,6 +32,16 @@ class HiveConfig {
       await getEncryptedKey(BNames.serverInstallationEncryptionKey),
     );
 
+    await Hive.openBox<User>(BNames.usersDeprecated);
+    await Hive.openBox<User>(BNames.usersBox, encryptionCipher: cipher);
+
+    final Box<User> deprecatedUsers = Hive.box<User>(BNames.usersDeprecated);
+    if (deprecatedUsers.isNotEmpty) {
+      final Box<User> users = Hive.box<User>(BNames.usersBox);
+      await users.addAll(deprecatedUsers.values.toList());
+      await deprecatedUsers.clear();
+    }
+
     await Hive.openBox(BNames.serverInstallationBox, encryptionCipher: cipher);
   }
 
@@ -62,7 +72,7 @@ class BNames {
   /// A boolean field of [appSettingsBox] box.
   static String isOnboardingShowing = 'isOnboardingShowing';
 
-  /// Encryption key to decrypt [serverInstallationBox] box.
+  /// Encryption key to decrypt [serverInstallationBox] and [usersBox] box.
   static String serverInstallationEncryptionKey = 'key';
 
   /// Server installation box. Contains server details and provider tokens.
@@ -121,4 +131,10 @@ class BNames {
 
   /// A boolean field of [serverInstallationBox] box.
   static String isRecoveringServer = 'isRecoveringServer';
+
+  /// Deprecated users box as it is unencrypted
+  static String usersDeprecated = 'users';
+
+  /// Box with users
+  static String usersBox = 'usersEncrypted';
 }

lib/logic/cubit/server_installation/server_installation_repository.dart

@@ -34,6 +34,7 @@ class ServerAuthorizationException implements Exception {
 
 class ServerInstallationRepository {
   Box box = Hive.box(BNames.serverInstallationBox);
+  Box<User> usersBox = Hive.box(BNames.usersBox);
 
   Future<ServerInstallationState> load() async {
     final String? providerApiToken = getIt<ApiConfigModel>().serverProviderKey;
@@ -176,6 +177,7 @@ class ServerInstallationRepository {
 
   void clearAppConfig() {
     box.clear();
+    usersBox.clear();
   }
 
   Future<ServerHostingDetails> startServer(

lib/logic/cubit/server_installation/server_installation_state.dart

@@ -49,11 +49,11 @@ abstract class ServerInstallationState extends Equatable {
   bool get isPrimaryUserFilled => rootUser != null;
   bool get isServerCreated => serverDetails != null;
 
-  bool get isFullyInitialized => _fulfillmentList.every((final el) => el!);
+  bool get isFullyInitilized => _fulfilementList.every((final el) => el!);
   ServerSetupProgress get progress => ServerSetupProgress
-      .values[_fulfillmentList.where((final el) => el!).length];
+      .values[_fulfilementList.where((final el) => el!).length];
 
-  int get progressBar {
+  int get porgressBar {
     if (progress.index < 6) {
       return progress.index;
     } else if (progress.index < 10) {
@@ -63,7 +63,7 @@ abstract class ServerInstallationState extends Equatable {
     }
   }
 
-  List<bool?> get _fulfillmentList {
+  List<bool?> get _fulfilementList {
     final List<bool> res = [
       isServerProviderApiKeyFilled,
       isServerTypeFilled,
@@ -118,7 +118,7 @@ class TimerState extends ServerInstallationNotFinished {
 enum ServerSetupProgress {
   nothingYet,
   serverProviderFilled,
-  serverTypeFilled,
+  servertTypeFilled,
   dnsProviderFilled,
   backblazeFilled,
   domainFilled,

lib/logic/models/json/digital_ocean_server_info.dart

@@ -65,14 +65,59 @@ class DigitalOceanLocation {
         emoji = '🇮🇳';
         break;
 
+      case 'syd':
+        emoji = '🇦🇺';
+        break;
+
       case 'nyc':
       case 'sfo':
         emoji = '🇺🇸';
         break;
     }
-
     return emoji;
   }
+
+  String get countryDisplayKey {
+    String displayKey = 'countries.';
+    switch (slug.substring(0, 3)) {
+      case 'fra':
+        displayKey += 'germany';
+        break;
+
+      case 'ams':
+        displayKey += 'netherlands';
+        break;
+
+      case 'sgp':
+        displayKey += 'singapore';
+        break;
+
+      case 'lon':
+        displayKey += 'united_kingdom';
+        break;
+
+      case 'tor':
+        displayKey += 'canada';
+        break;
+
+      case 'blr':
+        displayKey += 'india';
+        break;
+
+      case 'syd':
+        displayKey += 'australia';
+        break;
+
+      case 'nyc':
+      case 'sfo':
+        displayKey += 'united_states';
+        break;
+
+      default:
+        displayKey = slug;
+    }
+    return displayKey;
+  }
 }
 
 @JsonSerializable()

lib/logic/models/json/hetzner_server_info.dart

@@ -155,6 +155,27 @@ class HetznerLocation {
     }
     return emoji;
   }
+
+  String get countryDisplayKey {
+    String displayKey = 'countries.';
+    switch (country.substring(0, 2)) {
+      case 'DE':
+        displayKey += 'germany';
+        break;
+
+      case 'FI':
+        displayKey += 'finland';
+        break;
+
+      case 'US':
+        displayKey += 'united_states';
+        break;
+
+      default:
+        displayKey = country;
+    }
+    return displayKey;
+  }
 }
 
 /// A Volume is a highly-available, scalable, and SSD-based block storage for Servers.

lib/logic/models/price.dart

@@ -11,7 +11,7 @@ class Price {
 enum CurrencyType {
   eur,
   usd,
-  unknown,
+  unkown,
 }
 
 class Currency {

lib/logic/models/server_provider_location.dart

@@ -2,12 +2,14 @@ class ServerProviderLocation {
   ServerProviderLocation({
     required this.title,
     required this.identifier,
+    required this.countryDisplayKey,
     this.description,
     this.flag = '',
   });
 
   final String title;
   final String identifier;
+  final String countryDisplayKey;
   final String? description;
   final String flag;
 }

lib/logic/providers/server_providers/digital_ocean.dart

@@ -438,6 +438,7 @@ class DigitalOceanServerProvider extends ServerProvider {
           description: rawLocation.name,
           flag: rawLocation.flag,
           identifier: rawLocation.slug,
+          countryDisplayKey: rawLocation.countryDisplayKey,
         );
       } catch (e) {
         continue;

lib/logic/providers/server_providers/hetzner.dart

@@ -156,6 +156,7 @@ class HetznerServerProvider extends ServerProvider {
           description: server.location.description,
           flag: server.location.flag,
           identifier: server.location.name,
+          countryDisplayKey: server.location.countryDisplayKey,
         ),
       ),
     );
@@ -456,6 +457,7 @@ class HetznerServerProvider extends ServerProvider {
           description: rawLocation.description,
           flag: rawLocation.flag,
           identifier: rawLocation.name,
+          countryDisplayKey: rawLocation.countryDisplayKey,
         );
       } catch (e) {
         continue;

lib/ui/pages/backups/backup_details.dart

@@ -38,8 +38,14 @@ class BackupDetailsPage extends StatelessWidget {
         : StateType.uninitialized;
     final bool preventActions = backupsState.preventActions;
     final List<Backup> backups = backupsState.backups;
-    final List<Service> services =
-        context.watch<ServicesBloc>().state.servicesThatCanBeBackedUp;
+    final List<Service> services = context
+        .watch<ServicesBloc>()
+        .state
+        .servicesThatCanBeBackedUp
+        .where(
+          (final service) => service.isEnabled,
+        )
+        .toList();
     final Duration? autobackupPeriod = backupsState.autobackupPeriod;
     final List<ServerJob> backupJobs = context
         .watch<ServerJobsBloc>()

lib/ui/pages/backups/create_backups_modal.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:selfprivacy/logic/bloc/backups/backups_bloc.dart';
 import 'package:selfprivacy/logic/bloc/server_jobs/server_jobs_bloc.dart';
+import 'package:selfprivacy/logic/bloc/volumes/volumes_bloc.dart';
 import 'package:selfprivacy/logic/models/json/server_job.dart';
 import 'package:selfprivacy/logic/models/service.dart';
 
@@ -103,6 +104,29 @@ class _CreateBackupsModalState extends State<CreateBackupsModal> {
         ...widget.services.map(
           (final Service service) {
             final bool busy = busyServices.contains(service.id);
+            final List<Widget> descriptionWidgets = [];
+            if (busy) {
+              descriptionWidgets.add(Text('backup.service_busy'.tr()));
+            } else {
+              descriptionWidgets.add(
+                Text(
+                  'service_page.uses'.tr(
+                    namedArgs: {
+                      'usage': service.storageUsage.used.toString(),
+                      'volume': context
+                          .read<VolumesBloc>()
+                          .state
+                          .getVolume(service.storageUsage.volume ?? '')
+                          .displayName,
+                    },
+                  ),
+                  style: Theme.of(context).textTheme.labelMedium,
+                ),
+              );
+              descriptionWidgets.add(
+                Text(service.backupDescription),
+              );
+            }
             return CheckboxListTile.adaptive(
               onChanged: !busy
                   ? (final bool? value) {
@@ -122,8 +146,9 @@ class _CreateBackupsModalState extends State<CreateBackupsModal> {
               title: Text(
                 service.displayName,
               ),
-              subtitle: Text(
-                busy ? 'backup.service_busy'.tr() : service.backupDescription,
+              subtitle: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: descriptionWidgets,
               ),
               secondary: SvgPicture.string(
                 service.svgIcon,

lib/ui/pages/setup/initializing/initializing.dart

@@ -112,7 +112,7 @@ class InitializingPage extends StatelessWidget {
                           'Server',
                           'Installation',
                         ],
-                        activeIndex: cubit.state.progressBar,
+                        activeIndex: cubit.state.porgressBar,
                       ),
                     ),
                   ),

lib/ui/pages/setup/initializing/server_type_picker.dart

@@ -120,6 +120,14 @@ class SelectLocationPage extends StatelessWidget {
                                           .titleMedium,
                                     ),
                                     const SizedBox(height: 8),
+                                    Text(
+                                      location.countryDisplayKey.tr(),
+                                      style: Theme.of(context)
+                                          .textTheme
+                                          .bodyMedium,
+                                    ),
+                                    if (location.description != null)
+                                      const SizedBox(height: 4),
                                     if (location.description != null)
                                       Text(
                                         location.description!,