From 64e04b673bccb368e428f8ddae2fb15b8f388e56 Mon Sep 17 00:00:00 2001
From: Philip Duong <tangphilip3@gmail.com>
Date: Tue, 19 Nov 2024 22:33:03 +0100
Subject: [PATCH] added password requirement

---
 lib/l10n/app_de.arb                      | 23 +++++++++++++++++++++++
 lib/l10n/app_en.arb                      |  1 +
 lib/modules/more/settings/sync/sync.dart |  2 +-
 lib/services/sync_server.dart            |  1 +
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index f050dd0..7b9e695 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -180,6 +180,29 @@
     "one_tracker": "1 Tracker",
     "n_tracker": "{n} Tracker",
     "tracking": "Verfolgung",
+    "syncing": "Synchronisierung",
+    "sync_password": "Passwort (mind. 8 Zeichen)",
+    "sync_logged": "Login erfolgreich!",
+    "syncing_subtitle": "Sync your progress across multiple devices via a self-hosted \nserver. Make sure to upload first if this is your first time \nsyncing or download before using (auto) sync on this device!",
+    "last_sync": "Zuletzt synchronisiert: ",
+    "last_upload": "Zuletzt hochgeladen: ",
+    "last_download": "Zuletzt heruntergeladen: ",
+    "sync_server": "Sync Server IP Adresse / Domain",
+    "sync_login_invalid_creds": "Ungültiger Email oder Passwort",
+    "sync_checking": "Synchronisierung wird vorbereitet...",
+    "sync_uploading": "Hochladen...",
+    "sync_downloading": "Herunterladen...",
+    "sync_upload_finished": "Hochladen erfolgreich",
+    "sync_download_finished": "Herunterladen erfolgreich",
+    "sync_up_to_date": "Synchronisierung ist auf den neuesten Stand",
+    "sync_upload_failed": "Hochladen fehlgeschlagen",
+    "sync_download_failed": "Herunterladen fehlgeschlagen",
+    "sync_button_sync": "Jetzt synchronisieren",
+    "sync_button_upload": "Alles hochladen",
+    "sync_button_download": "Alles herunterladen",
+    "sync_confirm_upload": "Deine Daten auf dem Server werden jetzt durch deinen lokalen Daten ersetzt!",
+    "sync_confirm_download": "Deine lokalen Daten werden jetzt durch den Daten vom Server ersetzt!",
+    "dialog_confirm": "Fortfahren",
     "description": "Beschreibung",
     "episode_progress": "Fortschritt: {n}",
     "n_episodes": "{n} Episoden",
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 4cf4040..2a7c26a 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -182,6 +182,7 @@
   "n_tracker": "{n} trackers",
   "tracking": "Tracking",
   "syncing": "Sync",
+  "sync_password": "Password (at least 8 characters)",
   "sync_logged": "Login successful",
   "syncing_subtitle": "Sync your progress across multiple devices via a self-hosted \nserver. Make sure to upload first if this is your first time \nsyncing or download before using (auto) sync on this device!",
   "last_sync": "Last sync at: ",
diff --git a/lib/modules/more/settings/sync/sync.dart b/lib/modules/more/settings/sync/sync.dart
index 0d8e501..3f5ed15 100644
--- a/lib/modules/more/settings/sync/sync.dart
+++ b/lib/modules/more/settings/sync/sync.dart
@@ -407,7 +407,7 @@ void _showDialogLogin(BuildContext context, WidgetRef ref) {
                           password = value;
                         }),
                     decoration: InputDecoration(
-                        hintText: l10n.password,
+                        hintText: l10n.sync_password,
                         suffixIcon: IconButton(
                             onPressed: () => setState(() {
                                   obscureText = !obscureText;
diff --git a/lib/services/sync_server.dart b/lib/services/sync_server.dart
index f026457..a974077 100644
--- a/lib/services/sync_server.dart
+++ b/lib/services/sync_server.dart
@@ -40,6 +40,7 @@ class SyncServer extends _$SyncServer {
 
   Future<(bool, String)> login(AppLocalizations l10n, String server,
       String username, String password) async {
+    server = server[server.length - 1] == '/' ? server.substring(0, server.length - 1) : server;
     try {
       var response = await http.post(
         Uri.parse('$server$_loginUrl'),