From 2f4fe2c5be806f5446f35c56937d06d54fcf769e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Thu, 22 Oct 2026 00:32:28 +0300 Subject: [PATCH] fix: manual cloud-save upload/download no longer reports a skipped sync as success (#1068) --- .../droiddeck/launcher/ui/FrontEndGames.kt | 19 +++++++++-- app/src/main/res/values-ar/strings.xml | 3 ++ app/src/main/res/values-b+es+419/strings.xml | 3 ++ app/src/main/res/values-bg/strings.xml | 3 ++ app/src/main/res/values-cs/strings.xml | 3 ++ app/src/main/res/values-da/strings.xml | 3 ++ app/src/main/res/values-de/strings.xml | 3 ++ app/src/main/res/values-el/strings.xml | 3 ++ app/src/main/res/values-es/strings.xml | 3 ++ app/src/main/res/values-fi/strings.xml | 3 ++ app/src/main/res/values-fr/strings.xml | 3 ++ app/src/main/res/values-hi/strings.xml | 3 ++ app/src/main/res/values-hu/strings.xml | 3 ++ app/src/main/res/values-in/strings.xml | 3 ++ app/src/main/res/values-it/strings.xml | 3 ++ app/src/main/res/values-ja/strings.xml | 3 ++ app/src/main/res/values-ko/strings.xml | 3 ++ app/src/main/res/values-ms/strings.xml | 3 ++ app/src/main/res/values-nb/strings.xml | 3 ++ app/src/main/res/values-nl/strings.xml | 3 ++ app/src/main/res/values-pl/strings.xml | 3 ++ app/src/main/res/values-pt-rPT/strings.xml | 3 ++ app/src/main/res/values-pt/strings.xml | 3 ++ app/src/main/res/values-ro/strings.xml | 3 ++ app/src/main/res/values-ru/strings.xml | 3 ++ app/src/main/res/values-sv/strings.xml | 3 ++ app/src/main/res/values-th/strings.xml | 3 ++ app/src/main/res/values-tr/strings.xml | 3 ++ app/src/main/res/values-uk/strings.xml | 3 ++ app/src/main/res/values-vi/strings.xml | 3 ++ app/src/main/res/values-zh-rCN/strings.xml | 3 ++ app/src/main/res/values-zh-rHK/strings.xml | 3 ++ app/src/main/res/values-zh-rTW/strings.xml | 3 ++ app/src/main/res/values/strings.xml | 3 ++ .../droiddeck/launcher/ui/CloudMessageTest.kt | 33 +++++++++++++++++++ 35 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/CloudMessageTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt index a6032cd3c5..f86062e241 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt @@ -268,6 +268,21 @@ private fun ManageSaves(g: Library.SteamGame, prefix: java.io.File, a: FrontEndA } } +/** A skipped sync is not a success: "0 files" used to show for a signed-out store or cloud saves turned off. */ +internal fun cloudMessage(context: android.content.Context, r: com.droiddeck.launcher.stores.CloudSaves.Result): String = when (r.result) { + "ok" -> when { + r.conflicts > 0 -> context.getString(R.string.cloud_conflict_files, r.conflicts) + r.files == 0 -> context.getString(R.string.cloud_up_to_date) + else -> context.getString(R.string.cloud_done, r.files) + } + "skipped" -> context.getString(when (r.reason) { + "not-signed-in" -> R.string.cloud_signed_out + "no-cloud-saves" -> R.string.cloud_none + else -> R.string.cloud_not_synced + }) + else -> context.getString(R.string.cloud_not_synced) +} + @Composable private fun CloudRows(g: Library.SteamGame, open: Boolean, first: androidx.compose.ui.focus.FocusRequester) { val store = com.droiddeck.launcher.stores.Store.byId(g.source)?.takeIf { it != com.droiddeck.launcher.stores.Store.AMAZON } ?: return @@ -290,7 +305,7 @@ private fun CloudRows(g: Library.SteamGame, open: Boolean, first: androidx.compo busy = if (up) "up" else "down" Thread({ val r = if (up) com.droiddeck.launcher.stores.CloudSaves.upload(context, store, id, force) else com.droiddeck.launcher.stores.CloudSaves.download(context, store, id, force) - com.droiddeck.launcher.stores.StoresState.post { busy = null; tick++; android.widget.Toast.makeText(context, if (r.ok) context.getString(R.string.cloud_done, r.files) else r.reason, android.widget.Toast.LENGTH_SHORT).show() } + com.droiddeck.launcher.stores.StoresState.post { busy = null; tick++; android.widget.Toast.makeText(context, cloudMessage(context, r), android.widget.Toast.LENGTH_SHORT).show() } }, "cloud-manual").start() } MenuItem(stringResource(R.string.store_cloud_saves), checked = enabled && supported, enabled = supported, focusRequester = first, @@ -302,7 +317,7 @@ private fun CloudRows(g: Library.SteamGame, open: Boolean, first: androidx.compo com.droiddeck.launcher.stores.StoresState.post { enabled = written?.cloud ?: enabled } }, "cloud-switch").start() } - val ready = st != null && supported && busy == null + val ready = st != null && supported && enabled && busy == null val pending = stringResource(R.string.cloud_pending) val summary = when { st == null || busy != null -> pending diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index ab19b8be3e..e541ee2635 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2120,6 +2120,9 @@ آخر مزامنة %1$s لم تتم المزامنة بعد %1$d ملفات + محدَّث بالفعل + سجّل الدخول إلى المتجر لمزامنة الحفظ + لم تتم مزامنة الحفظ مثبَّتة في مكتبتك متجر diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index d8b12c4653..343fc12fa6 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2063,6 +2063,9 @@ Última sincronización %1$s Aún sin sincronizar %1$d archivos + Ya está al día + Inicia sesión en la tienda para sincronizar las partidas + No se sincronizaron las partidas instalado en tu biblioteca tienda diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index ac4bfb1034..937197e554 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2036,6 +2036,9 @@ Последна синхронизация %1$s Още не е синхронизирано %1$d файла + Вече е актуално + Влезте в магазина, за да синхронизирате записите + Записите не бяха синхронизирани инсталирана в библиотеката ти магазин diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index adc83ae753..7a475f7d6a 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2078,6 +2078,9 @@ Poslední synchronizace %1$s Ještě nesynchronizováno %1$d souborů + Už je aktuální + Pro synchronizaci uložených pozic se přihlaste do obchodu + Uložené pozice nebyly synchronizovány nainstalováno ve vaší knihovně obchod diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 79d25b5faa..fa2aa94cb6 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2036,6 +2036,9 @@ Senest synkroniseret %1$s Ikke synkroniseret endnu %1$d filer + Allerede opdateret + Log ind i butikken for at synkronisere gemte spil + Gemte spil blev ikke synkroniseret installeret i dit bibliotek butik diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8ea85cf579..5ab9b43f66 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2025,6 +2025,9 @@ Zuletzt synchronisiert %1$s Noch nicht synchronisiert %1$d Dateien + Bereits aktuell + Im Store anmelden, um Spielstände zu synchronisieren + Spielstände wurden nicht synchronisiert installiert in deiner Bibliothek Store diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index e4674d8f23..da62fa3f86 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2036,6 +2036,9 @@ Τελευταίος συγχρονισμός %1$s Δεν έχει συγχρονιστεί ακόμα %1$d αρχεία + Ήδη ενημερωμένο + Συνδεθείτε στο κατάστημα για συγχρονισμό αποθηκεύσεων + Οι αποθηκεύσεις δεν συγχρονίστηκαν εγκατεστημένο στη βιβλιοθήκη σας κατάστημα diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f6494af6d8..8aa6c13b6e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2054,6 +2054,9 @@ Última sincronización %1$s Aún sin sincronizar %1$d archivos + Ya está al día + Inicia sesión en la tienda para sincronizar las partidas + No se sincronizaron las partidas instalado en tu biblioteca tienda diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 2c49eb23e0..1a13b271a3 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2036,6 +2036,9 @@ Viimeisin synkronointi %1$s Ei synkronoitu vielä %1$d tiedostoa + Jo ajan tasalla + Kirjaudu kauppaan synkronoidaksesi tallennukset + Tallennuksia ei synkronoitu asennettu kirjastossasi kauppa diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 23084bf78d..b98fbc905b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2054,6 +2054,9 @@ Dernière synchro : %1$s Pas encore synchronisé %1$d fichiers + Déjà à jour + Connectez-vous à la boutique pour synchroniser les sauvegardes + Les sauvegardes n’ont pas été synchronisées installé dans votre bibliothèque boutique diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 9557c02f84..1bb268afe3 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2036,6 +2036,9 @@ आख़िरी सिंक %1$s अभी सिंक नहीं हुआ %1$d फ़ाइलें + पहले से अप टू डेट + सेव सिंक करने के लिए स्टोर में साइन इन करें + सेव सिंक नहीं हुए इंस्टॉल है आपकी लाइब्रेरी में स्टोर diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index add9dfdddf..62cad81fe1 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2036,6 +2036,9 @@ Utolsó szinkronizálás: %1$s Még nincs szinkronizálva %1$d fájl + Már naprakész + Jelentkezz be az áruházba a mentések szinkronizálásához + A mentések nem lettek szinkronizálva telepítve a könyvtárában áruház diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index cceb3c540c..385748c1a9 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2015,6 +2015,9 @@ Sinkronisasi terakhir %1$s Belum disinkronkan %1$d file + Sudah terbaru + Masuk ke toko untuk menyinkronkan simpanan + Simpanan tidak disinkronkan terinstal dalam pustaka Anda toko diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index b98751afe4..ef4bbacbd9 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2046,6 +2046,9 @@ Ultima sincronizzazione %1$s Non ancora sincronizzato %1$d file + Già aggiornato + Accedi allo store per sincronizzare i salvataggi + I salvataggi non sono stati sincronizzati installato nella tua libreria negozio diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0adf7aa359..2d8bae0d2e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2015,6 +2015,9 @@ 最終同期 %1$s 未同期 %1$d個のファイル + すでに最新です + セーブを同期するにはストアにサインインしてください + セーブは同期されませんでした インストール済み ライブラリ内 ストア diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index f024bd09de..c091198e31 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2015,6 +2015,9 @@ 마지막 동기화 %1$s 아직 동기화 안 됨 파일 %1$d개 + 이미 최신 상태입니다 + 저장 파일을 동기화하려면 스토어에 로그인하세요 + 저장 파일이 동기화되지 않았습니다 설치됨 내 라이브러리 스토어 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index f5514e9877..88d04d09f8 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2015,6 +2015,9 @@ Segerak terakhir %1$s Belum disegerakkan %1$d fail + Sudah terkini + Log masuk ke kedai untuk menyegerakkan simpanan + Simpanan tidak disegerakkan dipasang dalam pustaka anda kedai diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 53c5aa2f53..ad9c5aca96 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2036,6 +2036,9 @@ Siste synkronisering %1$s Ikke synkronisert ennå %1$d filer + Allerede oppdatert + Logg inn i butikken for å synkronisere lagrede spill + Lagrede spill ble ikke synkronisert installert i biblioteket ditt butikk diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index e994c2b87e..8f895a218c 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2036,6 +2036,9 @@ Laatste synchronisatie %1$s Nog niet gesynchroniseerd %1$d bestanden + Al up-to-date + Log in bij de winkel om opslagbestanden te synchroniseren + Opslagbestanden zijn niet gesynchroniseerd geïnstalleerd in je bibliotheek winkel diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 5f08cd038a..30df0484a1 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2078,6 +2078,9 @@ Ostatnia synchronizacja %1$s Jeszcze nie zsynchronizowano %1$d plików + Już aktualne + Zaloguj się do sklepu, aby synchronizować zapisy + Zapisy nie zostały zsynchronizowane zainstalowana w Twojej bibliotece sklep diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 9928b1691b..3282330fbb 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2046,6 +2046,9 @@ Última sincronização: %1$s Ainda não sincronizado %1$d ficheiros + Já está atualizado + Inicie sessão na loja para sincronizar os jogos guardados + Os jogos guardados não foram sincronizados instalado na sua biblioteca loja diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index a11ab80e23..f07547c636 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2046,6 +2046,9 @@ Última sincronização: %1$s Ainda não sincronizado %1$d arquivos + Já está atualizado + Entre na loja para sincronizar os saves + Os saves não foram sincronizados instalado na sua biblioteca loja diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 8a9f494875..c49d40cd56 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2057,6 +2057,9 @@ Ultima sincronizare %1$s Nesincronizat încă %1$d fișiere + Deja actualizat + Conectează-te la magazin pentru a sincroniza salvările + Salvările nu au fost sincronizate instalat în biblioteca ta magazin diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index d4059d29d3..431a4c1cb1 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2075,6 +2075,9 @@ Последняя синхронизация: %1$s Еще не синхронизировано Файлов: %1$d + Уже актуально + Войдите в магазин, чтобы синхронизировать сохранения + Сохранения не синхронизированы установлено в вашей библиотеке магазин diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 6dcd74542b..3c6a3dc747 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2036,6 +2036,9 @@ Senast synkad %1$s Inte synkad än %1$d filer + Redan uppdaterat + Logga in i butiken för att synkronisera sparfiler + Sparfilerna synkroniserades inte installerat i ditt bibliotek butik diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 6415ac1d5b..b41944d872 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2015,6 +2015,9 @@ ซิงค์ล่าสุด %1$s ยังไม่ได้ซิงค์ %1$d ไฟล์ + อัปเดตแล้ว + ลงชื่อเข้าใช้ร้านค้าเพื่อซิงค์เซฟ + เซฟไม่ได้ซิงค์ ติดตั้งแล้ว อยู่ในไลบรารีของคุณ สโตร์ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f32e89a652..cbb7880021 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2025,6 +2025,9 @@ Son eşitleme %1$s Henüz eşitlenmedi %1$d dosya + Zaten güncel + Kayıtları eşitlemek için mağazada oturum açın + Kayıtlar eşitlenmedi yüklü kütüphanenizde mağaza diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 01e625f54d..cfa3f10100 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2078,6 +2078,9 @@ Остання синхронізація %1$s Ще не синхронізовано %1$d файлів + Уже актуально + Увійдіть у магазин, щоб синхронізувати збереження + Збереження не синхронізовано встановлено у вашій бібліотеці магазин diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 407b2bf634..4bbcc48ef1 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2015,6 +2015,9 @@ Đồng bộ lần cuối %1$s Chưa đồng bộ %1$d tệp + Đã cập nhật + Đăng nhập cửa hàng để đồng bộ bản lưu + Bản lưu chưa được đồng bộ đã cài trong thư viện của bạn cửa hàng diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 814f12e9cd..8a94df1880 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2091,6 +2091,9 @@ 上次同步:%1$s 尚未同步 %1$d 个文件 + 已是最新 + 登录商店以同步存档 + 存档未同步 已安装 在你的库中 商店 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 1ef76a2938..eb827090bc 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2015,6 +2015,9 @@ 上次同步:%1$s 尚未同步 %1$d 個檔案 + 已是最新 + 登入商店以同步存檔 + 存檔未同步 已安裝 在你的收藏庫中 商店 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 70c0814fdf..9a81c3ab26 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2015,6 +2015,9 @@ 上次同步:%1$s 尚未同步 %1$d 個檔案 + 已是最新 + 登入商店以同步存檔 + 存檔未同步 已安裝 在你的收藏庫中 商店 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bec96f5c70..6e02992c72 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2102,6 +2102,9 @@ Last sync %1$s Not synced yet %1$d files + Already up to date + Sign in to the store to sync saves + Saves were not synced installed in your library store diff --git a/app/src/test/java/com/droiddeck/launcher/ui/CloudMessageTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/CloudMessageTest.kt new file mode 100644 index 0000000000..2bf7360edf --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/CloudMessageTest.kt @@ -0,0 +1,33 @@ +package com.droiddeck.launcher.ui + +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CloudSaves +import org.junit.Assert.assertEquals +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class CloudMessageTest { + private val ctx get() = RuntimeEnvironment.getApplication() + private fun msg(result: String, files: Int, conflicts: Int, reason: String) = + cloudMessage(ctx, CloudSaves.Result(result, files, 0L, reason, conflicts)) + + @Test fun aSkippedSyncNeverReadsAsZeroFilesDone() { + assertEquals(ctx.getString(R.string.cloud_signed_out), msg("skipped", 0, 0, "not-signed-in")) + assertEquals(ctx.getString(R.string.cloud_none), msg("skipped", 0, 0, "no-cloud-saves")) + for (reason in listOf("off", "no-baseline", "nothing-local", "store-unreachable", "unresolved")) { + assertEquals(reason, ctx.getString(R.string.cloud_not_synced), msg("skipped", 0, 0, reason)) + } + assertEquals(ctx.getString(R.string.cloud_not_synced), msg("failed", 0, 0, "SocketTimeoutException")) + } + + @Test fun okResultsSayWhatHappened() { + assertEquals(ctx.getString(R.string.cloud_up_to_date), msg("ok", 0, 0, "up-to-date")) + assertEquals(ctx.getString(R.string.cloud_done, 3), msg("ok", 3, 0, "uploaded")) + assertEquals(ctx.getString(R.string.cloud_conflict_files, 2), msg("ok", 1, 2, "conflict")) + } +}