nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-22 12:21:15 +00:00
Code Releases Activity

Show error when folder is out of sync (#925)

Browse source 
* Show error when folder is out of sync

* Translate status_outofsync

Copied from Syncthing GUI

* Colorize status message of folders
This commit is contained in:
Unrud 2017-07-19 04:18:37 +02:00 committed by Felix Ableitner
parent 596bc1c49d
commit 6718811c29
27 changed files with 46 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/nutomic/syncthingandroid/model/Model.java
View file

@ -12,6 +12,8 @@ public class Model {
public long needBytes;
public long needFiles;
public long needDeletes;
public long needDirectories;
public long needSymlinks;
public String state;
public String invalid;
}

21
src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java
View file

@ -50,7 +50,6 @@ public class FoldersAdapter extends ArrayAdapter<Folder> {
Folder folder = getItem(position);
Model model = mModels.get(folder.id);
binding.label.setText(TextUtils.isEmpty(folder.label) ? folder.id : folder.label);
binding.state.setTextColor(ContextCompat.getColor(getContext(), R.color.text_green));
binding.directory.setText(folder.path);
binding.openFolder.setOnClickListener(v -> {
Intent intent = new Intent(Intent.ACTION_VIEW);
@ -66,7 +65,25 @@ public class FoldersAdapter extends ArrayAdapter<Folder> {
int percentage = (model.globalBytes != 0)
? Math.round(100 * model.inSyncBytes / model.globalBytes)
: 100;
binding.state.setText(getLocalizedState(getContext(), model.state, percentage));
long neededItems = model.needFiles + model.needDirectories + model.needSymlinks + model.needDeletes;
if (model.state.equals("idle") && neededItems > 0) {
binding.state.setText(getContext().getString(R.string.status_outofsync));
binding.state.setTextColor(ContextCompat.getColor(getContext(), R.color.text_red));
} else {
binding.state.setText(getLocalizedState(getContext(), model.state, percentage));
switch(model.state) {
case "idle":
binding.state.setTextColor(ContextCompat.getColor(getContext(), R.color.text_green));
break;
case "scanning":
case "cleaning":
case "syncing":
binding.state.setTextColor(ContextCompat.getColor(getContext(), R.color.text_blue));
break;
default:
binding.state.setTextColor(ContextCompat.getColor(getContext(), R.color.text_red));
}
}
binding.items.setVisibility(VISIBLE);
binding.items.setText(getContext()
.getString(R.string.files, model.inSyncFiles, model.globalFiles));

1
src/main/res/values-bg/strings.xml
View file

@ -304,6 +304,7 @@
<string name="state_syncing">Синхронизиране (%1$d%%)</string>
<string name="state_error">Грешка</string>
<string name="state_unknown">Неясно</string>
<string name="status_outofsync">Несинхронизирано</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
</resources>

1
src/main/res/values-cs/strings.xml
View file

@ -314,6 +314,7 @@ Všechny zaznamenané chyby prosím hlašte přes Github.</string>
<string name="state_syncing">Synchronizuje se (%1$d%%)</string>
<string name="state_error">Chyba</string>
<string name="state_unknown">Neznámý</string>
<string name="status_outofsync">Nesesynchronizováno</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">Syncthing nelze zastavit když je povolený běh na pozadí.</string>

1
src/main/res/values-de/strings.xml
View file

@ -308,6 +308,7 @@ Bitte melden Sie auftretende Probleme via Github.</string>
<string name="state_syncing">Synchronisiere (%1$d%%)</string>
<string name="state_error">Fehler</string>
<string name="state_unknown">Unbekannt</string>
<string name="status_outofsync">Nicht synchronisiert</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">Syncthing zu stoppen wird nicht unterstützt solange das Ausführen im Hintergrund aktiviert ist.</string>

1
src/main/res/values-el/strings.xml
View file

@ -319,6 +319,7 @@
<string name="state_syncing">Συγχρονισμός (%1$d%%)</string>
<string name="state_error">Σφάλμα</string>
<string name="state_unknown">Άγνωστο</string>
<string name="status_outofsync">Μη συγχρονισμένα</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">Ο τερματισμός του Syncthing δεν υποστηρίζεται όταν έχει ενεργοποιηθεί η εκτέλεση στο παρασκήνιο.</string>

1
src/main/res/values-es-rMX/strings.xml
View file

@ -283,6 +283,7 @@
<string name="state_syncing">Sincronizando (%1$d%%)</string>
<string name="state_error">Error</string>
<string name="state_unknown">Desconocido</string>
<string name="status_outofsync">No sincronizado</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
</resources>

1
src/main/res/values-es/strings.xml
View file

@ -310,6 +310,7 @@
<string name="state_syncing">Sincronizando (%1$d%%)</string>
<string name="state_error">Error</string>
<string name="state_unknown">Desconocido</string>
<string name="status_outofsync">No sincronizado</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">No está soportado detener Syncthing mientras está activada la ejecución en segundo plano.</string>

1
src/main/res/values-fi/strings.xml
View file

@ -305,6 +305,7 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
<string name="state_syncing">Synkronoidaan (%1$d%%)</string>
<string name="state_error">Virhe</string>
<string name="state_unknown">Tuntematon</string>
<string name="status_outofsync">Ei ajan tasalla</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">Syncthingin pysäyttäminen ei ole käytettävissä kun käynti taustalla on valittuna.</string>

1
src/main/res/values-fr/strings.xml
View file

@ -319,6 +319,7 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</str
<string name="state_syncing">Synchronisation (%1$d%%)</string>
<string name="state_error">Erreur</string>
<string name="state_unknown">Inconnu</string>
<string name="status_outofsync">Désynchronisé</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">L\'arrêt de Syncthing n\'est pas supporté quand le fonctionnement en tâche de fond est activé.</string>

1
src/main/res/values-hu/strings.xml
View file

@ -224,5 +224,6 @@
<string name="state_syncing">Szinkronizálás (%1$d%%)</string>
<string name="state_error">Hiba</string>
<string name="state_unknown">Ismeretlen</string>
<string name="status_outofsync">Nincs szinkronban</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
</resources>

1
src/main/res/values-it/strings.xml
View file

@ -319,6 +319,7 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.</string>
<string name="state_syncing">Sincronizzazione (%1$d%%)</string>
<string name="state_error">Errore</string>
<string name="state_unknown">Sconosciuto</string>
<string name="status_outofsync">Non sincronizzato</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">Arrestare Syncthing non è possibile quando è abilitato il funzionamento in background.</string>

1
src/main/res/values-ja/strings.xml
View file

@ -337,6 +337,7 @@
<string name="state_syncing">同期中 (%1$d%%)</string>
<string name="state_error">エラー</string>
<string name="state_unknown">不明</string>
<string name="status_outofsync">未同期</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">バックグラウンドでの実行が有効になっているとき、Syncthing の停止はサポートされていません。</string>

1
src/main/res/values-ko/strings.xml
View file

@ -337,6 +337,7 @@
<string name="state_syncing">동기화 중 (%1$d%%)</string>
<string name="state_error">오류</string>
<string name="state_unknown">알 수 없음</string>
<string name="status_outofsync">동기화 오류</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">백그라운드에서 실행이 활성화되어 있을 때는 Syncthing 중단은 지원되지 않습니다.</string>

1
src/main/res/values-nb/strings.xml
View file

@ -291,6 +291,7 @@
<string name="state_syncing">Synkroniserer (%1$d%%)</string>
<string name="state_error">Feil</string>
<string name="state_unknown">Ukjent</string>
<string name="status_outofsync">Ikke synkronisert</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">Du kan ikke stoppe Syncthing når «kjør i bakgrunnen» er skrudd på.</string>

1
src/main/res/values-nl/strings.xml
View file

@ -318,6 +318,7 @@ Als je problemen tegenkomt, meld ze dan via GitHub.</string>
<string name="state_syncing">Bezig met synchroniseren (%1$d%%)</string>
<string name="state_error">Fout</string>
<string name="state_unknown">Onbekend</string>
<string name="status_outofsync">Niet gesynchroniseerd</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">Syncthing stoppen terwijl uitvoeren in achtergrond is ingeschakeld wordt niet ondersteund.</string>

1
src/main/res/values-nn/strings.xml
View file

@ -290,6 +290,7 @@
<string name="state_syncing">Synkroniserer (%1$d%%)</string>
<string name="state_error">Feil</string>
<string name="state_unknown">Ukjend</string>
<string name="status_outofsync">Ikkje synkronisert</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">Du kan ikkje stoppe Syncthing når «køyr i bakgrunnen» er skrudd på.</string>

1
src/main/res/values-pl/strings.xml
View file

@ -307,6 +307,7 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.<
<string name="state_syncing">Synchronizowanie (%1$d%%)</string>
<string name="state_error">Błąd</string>
<string name="state_unknown">Nieznany</string>
<string name="status_outofsync">Niezsynchronizowane</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">Zatrzymywanie programu nie jest obsługiwane podczas działania w tle.</string>

1
src/main/res/values-pt-rBR/strings.xml
View file

@ -319,6 +319,7 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</
<string name="state_syncing">Sincronizando (%1$d%%)</string>
<string name="state_error">Erro</string>
<string name="state_unknown">Desconhecido</string>
<string name="status_outofsync">Fora de sincronia</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">Não é possível parar o Syncthing enquanto ele estiver configurado para rodar em segundo plano.</string>

1
src/main/res/values-pt/strings.xml
View file

@ -313,6 +313,7 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.</strin
<string name="state_syncing">Sincronizando (%1$d%%)</string>
<string name="state_error">Erro</string>
<string name="state_unknown">Desconhecido</string>
<string name="status_outofsync">Fora de sincronia</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">Parar o Syncthing não é suportado quando está activada a opção para correr em segundo plano.</string>

1
src/main/res/values-ru/strings.xml
View file

@ -319,6 +319,7 @@
<string name="state_syncing">Синхронизация (%1$d%%)</string>
<string name="state_error">Ошибка</string>
<string name="state_unknown">Неизвестно</string>
<string name="status_outofsync">Нет синхронизации</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">Остановка Syncthing не поддерживается, если включено выполнение в фоновом режиме.</string>

1
src/main/res/values-sk/strings.xml
View file

@ -268,5 +268,6 @@ Naozaj chcete resetovať databázu s indexom súborov?</string>
<string name="state_syncing">Synchronizuje sa (%1$d%%)</string>
<string name="state_error">Chyba</string>
<string name="state_unknown">Neznámy</string>
<string name="status_outofsync">Nesynchronizované</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
</resources>

1
src/main/res/values-sv/strings.xml
View file

@ -340,6 +340,7 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
<string name="state_syncing">Synkroniserar (%1$d%%)</string>
<string name="state_error">Fel</string>
<string name="state_unknown">Okänd</string>
<string name="status_outofsync">Osynkroniserad</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">Det går inte att stoppa Syncthing när körning i bakgrunden är aktiverad.</string>

1
src/main/res/values-tr/strings.xml
View file

@ -312,6 +312,7 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.</st
<string name="state_syncing">Eşzamanlama gerçekleştiriliyor (%1$d%%)</string>
<string name="state_error">Hata</string>
<string name="state_unknown">Bilinmiyor</string>
<string name="status_outofsync">Eşzamanlama Dışı</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">Arka planda çalışma etkinken Syncthing\'i durdurma desteklenmiyor.</string>

1
src/main/res/values-vi/strings.xml
View file

@ -283,6 +283,7 @@
<string name="state_syncing">Đang đ.bộ (%1$d%%)</string>
<string name="state_error">Lỗi</string>
<string name="state_unknown">Không rõ</string>
<string name="status_outofsync">Mất đồng bộ</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
</resources>

1
src/main/res/values-zh-rCN/strings.xml
View file

@ -339,6 +339,7 @@
<string name="state_syncing">正在同步 (%1$d%%)</string>
<string name="state_error">错误</string>
<string name="state_unknown">未知</string>
<string name="status_outofsync">未同步</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">当启用后台运行时不支持停止 Syncthing。</string>

1
src/main/res/values/strings.xml
View file

@ -556,6 +556,7 @@ Please report any problems you encounter via Github.</string>
<string name="state_syncing">Syncing (%1$d%%)</string>
<string name="state_error">Error</string>
<string name="state_unknown">Unknown</string>
<string name="status_outofsync">Out of Sync</string>
<!-- Format string for folder size, eg "500 MiB / 1 GiB" -->
<string name="folder_size_format">%1$s / %2$s</string>