Add UI support for delta index resets (fixes #1060)

2024-11-22 20:31:16 +00:00 · 2018-04-27 21:57:15 +02:00 · 2018-04-27 21:57:15 +02:00 · 203dfc753f
commit 203dfc753f
parent f8f3f723e4
35 changed files with 163 additions and 113 deletions
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
@ -80,7 +80,8 @@ public class SettingsActivity extends SyncthingActivity {
        private static final String KEY_STTRACE = "sttrace";
        private static final String KEY_EXPORT_CONFIG = "export_config";
        private static final String KEY_IMPORT_CONFIG = "import_config";
-        private static final String KEY_STRESET = "streset";
+        private static final String KEY_ST_RESET_DATABASE = "st_reset_database";
+        private static final String KEY_ST_RESET_DELTAS = "st_reset_deltas";

        @Inject NotificationHandler mNotificationHandler;
        @Inject SharedPreferences mPreferences;
@ -184,7 +185,8 @@ public class SettingsActivity extends SyncthingActivity {

            Preference stTrace              = findPreference("sttrace");
            Preference environmentVariables = findPreference("environment_variables");
-            Preference stReset              = findPreference("streset");
+            Preference stResetDatabase      = findPreference("st_reset_database");
+            Preference stResetDeltas        = findPreference("st_reset_deltas");

            mUseRoot                     = (CheckBoxPreference) findPreference(Constants.PREF_USE_ROOT);
            Preference useWakelock       = findPreference(Constants.PREF_USE_WAKE_LOCK);
@ -204,7 +206,8 @@ public class SettingsActivity extends SyncthingActivity {

            stTrace.setOnPreferenceChangeListener(this);
            environmentVariables.setOnPreferenceChangeListener(this);
-            stReset.setOnPreferenceClickListener(this);
+            stResetDatabase.setOnPreferenceClickListener(this);
+            stResetDeltas.setOnPreferenceClickListener(this);

            mUseRoot.setOnPreferenceClickListener(this);
            useWakelock.setOnPreferenceChangeListener((p, o) -> requireRestart());
@ -376,6 +379,7 @@ public class SettingsActivity extends SyncthingActivity {

        @Override
        public boolean onPreferenceClick(Preference preference) {
+            final Intent intent;
            switch (preference.getKey()) {
                case Constants.PREF_USE_ROOT:
                    if (mUseRoot.isChecked()) {
@ -418,16 +422,31 @@ public class SettingsActivity extends SyncthingActivity {
                            .setNegativeButton(android.R.string.no, null)
                            .show();
                    return true;
-                case KEY_STRESET:
-                    final Intent intent = new Intent(getActivity(), SyncthingService.class)
-                            .setAction(SyncthingService.ACTION_RESET);
+                case KEY_ST_RESET_DATABASE:
+                    intent = new Intent(getActivity(), SyncthingService.class)
+                            .setAction(SyncthingService.ACTION_RESET_DATABASE);

                    new AlertDialog.Builder(getActivity())
-                            .setTitle(R.string.streset_title)
-                            .setMessage(R.string.streset_question)
+                            .setTitle(R.string.st_reset_database_title)
+                            .setMessage(R.string.st_reset_database_question)
                            .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> {
                                getActivity().startService(intent);
-                                Toast.makeText(getActivity(), R.string.streset_done, Toast.LENGTH_LONG).show();
+                                Toast.makeText(getActivity(), R.string.st_reset_database_done, Toast.LENGTH_LONG).show();
+                            })
+                            .setNegativeButton(android.R.string.no, (dialogInterface, i) -> {
+                            })
+                            .show();
+                    return true;
+                case KEY_ST_RESET_DELTAS:
+                    intent = new Intent(getActivity(), SyncthingService.class)
+                            .setAction(SyncthingService.ACTION_RESET_DELTAS);
+
+                    new AlertDialog.Builder(getActivity())
+                            .setTitle(R.string.st_reset_deltas_title)
+                            .setMessage(R.string.st_reset_deltas_question)
+                            .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> {
+                                getActivity().startService(intent);
+                                Toast.makeText(getActivity(), R.string.st_reset_deltas_done, Toast.LENGTH_LONG).show();
                            })
                            .setNegativeButton(android.R.string.no, (dialogInterface, i) -> {
                            })
--- a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
@ -57,7 +57,8 @@ public class SyncthingRunnable implements Runnable {
    public enum Command {
        generate,           // Generate keys, a config file and immediately exit.
        main,               // Run the main Syncthing application.
-        reset,    // Reset Syncthing's indexes
+        resetdatabase,      // Reset Syncthing's database
+        resetdeltas,        // Reset Syncthing's delta indexes
    }

    /**
@ -78,8 +79,11 @@ public class SyncthingRunnable implements Runnable {
            case main:
                mCommand = new String[]{ mSyncthingBinary.getPath(), "-home", mContext.getFilesDir().toString(), "-no-browser", "-logflags=0" };
                break;
-            case reset:
-                mCommand = new String[]{ mSyncthingBinary.getPath(), "-home", mContext.getFilesDir().toString(), "-reset", "-logflags=0" };
+            case resetdatabase:
+                mCommand = new String[]{ mSyncthingBinary.getPath(), "-home", mContext.getFilesDir().toString(), "-reset-database", "-logflags=0" };
+                break;
+            case resetdeltas:
+                mCommand = new String[]{ mSyncthingBinary.getPath(), "-home", mContext.getFilesDir().toString(), "-reset-deltas", "-logflags=0" };
                break;
            default:
                throw new InvalidParameterException("Unknown command option");
--- a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java
@ -45,8 +45,14 @@ public class SyncthingService extends Service {
    /**
     * Intent action to reset Syncthing's database.
     */
-    public static final String ACTION_RESET =
-            "com.nutomic.syncthingandroid.service.SyncthingService.RESET";
+    public static final String ACTION_RESET_DATABASE =
+            "com.nutomic.syncthingandroid.service.SyncthingService.RESET_DATABASE";
+
+    /**
+     * Intent action to reset Syncthing's delta indexes.
+     */
+    public static final String ACTION_RESET_DELTAS =
+            "com.nutomic.syncthingandroid.service.SyncthingService.RESET_DELTAS";

    public static final String ACTION_REFRESH_NETWORK_INFO =
            "com.nutomic.syncthingandroid.service.SyncthingService.REFRESH_NETWORK_INFO";
@ -120,9 +126,14 @@ public class SyncthingService extends Service {

        if (ACTION_RESTART.equals(intent.getAction()) && mCurrentState == State.ACTIVE) {
            shutdown(State.INIT, () -> new StartupTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR));
-        } else if (ACTION_RESET.equals(intent.getAction())) {
+        } else if (ACTION_RESET_DATABASE.equals(intent.getAction())) {
            shutdown(State.INIT, () -> {
-                new SyncthingRunnable(this, SyncthingRunnable.Command.reset).run();
+                new SyncthingRunnable(this, SyncthingRunnable.Command.resetdatabase).run();
+                new StartupTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+            });
+        } else if (ACTION_RESET_DELTAS.equals(intent.getAction())) {
+            shutdown(State.INIT, () -> {
+                new SyncthingRunnable(this, SyncthingRunnable.Command.resetdeltas).run();
                new StartupTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
            });
        } else if (ACTION_REFRESH_NETWORK_INFO.equals(intent.getAction())) {
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@ -187,13 +187,13 @@
  <!--Toast after entering invalid STTRACE params-->
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">В настройките на STTRACE са разрешени само символите 0-9, a-z и \',\'</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Нулиране на базата данни</string>
+  <string name="st_reset_database_title">Нулиране на базата данни</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Действието трябва да се изпълнява след препоръка от поддържащия екип.
+  <string name="st_reset_database_question">Действието трябва да се изпълнява след препоръка от поддържащия екип.
 \nНаистина ли желаете базата данни на Syncthing\'s да бъде нулирана?
    </string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Базата данни на Syncthing е нулирана успешно</string>
+  <string name="st_reset_database_done">Базата данни на Syncthing е нулирана успешно</string>
  <string name="category_about">За програмата</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Отвори журнала</string>
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@ -222,13 +222,13 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Només es permet utilitzar 0-9, a-z i \',\' a les opcions de STTRACE</string>
  <string name="toast_invalid_environment_variables">Aquest valor no és una cadena de variable d\'entorn vàlida</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Reinicia la base de dades</string>
+  <string name="st_reset_database_title">Reinicia la base de dades</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Només hauríeu de fer això si us ho recomana el nostre equip de suport.
+  <string name="st_reset_database_question">Només hauríeu de fer això si us ho recomana el nostre equip de suport.
        \nSegur que voleu esborrar la base de dades d\'índexs del Syncthing?
    </string>
  <!--Syncthing was reset-->
-  <string name="streset_done">La base de dades del Syncthing s\'ha reiniciat amb èxit</string>
+  <string name="st_reset_database_done">La base de dades del Syncthing s\'ha reiniciat amb èxit</string>
  <string name="category_about">Quant a</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Obre el registre</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -223,12 +223,12 @@ Všechny zaznamenané chyby prosím hlašte přes Github.</string>
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">V STTRACE jsou povoleny pouze znaky \'0-9\', \'a-z\' a \',\'</string>
  <string name="toast_invalid_environment_variables">Hodnota není platným řetězcem proměnné prostředí</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Resetovat databázi</string>
+  <string name="st_reset_database_title">Resetovat databázi</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Tento krok by měl být proveden pouze na základě doporučení našeho technického týmu.
+  <string name="st_reset_database_question">Tento krok by měl být proveden pouze na základě doporučení našeho technického týmu.
 \nOpravdu chcete vyčistit databázi aplikace Syncthing?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Databáze aplikace Syncthing úspěšně resetována</string>
+  <string name="st_reset_database_done">Databáze aplikace Syncthing úspěšně resetována</string>
  <string name="category_about">O aplikaci</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Otevřít log</string>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -221,12 +221,12 @@ Vær venlig at rapportere ethvert problem, du støder på, via Github. </string>
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Kun 0-9, a-z og \',\' er tilladte i STTRACE options</string>
  <string name="toast_invalid_environment_variables">Værdien er ugyldig som miljøvariablestreng</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Nulstil database</string>
+  <string name="st_reset_database_title">Nulstil database</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Denne handling burde kun gennemføres baseret på anvisning af vores support tem.
+  <string name="st_reset_database_question">Denne handling burde kun gennemføres baseret på anvisning af vores support tem.
 \nEr du sikker på at du ønsker at nulstille Syncthing\'s indeks database?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Syncthing\'s database successfuldt nulstillet</string>
+  <string name="st_reset_database_done">Syncthing\'s database successfuldt nulstillet</string>
  <string name="category_about">Omkring</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Åben Log</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -222,12 +222,12 @@ Bitte melden Sie auftretende Probleme via Github.</string>
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Nur 0-9, a-z und \',\' sind erlaubt in STTRACE Optionen</string>
  <string name="toast_invalid_environment_variables">Wert ist kein gültiger Umgebungsvariablen-String</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Datenbank zurücksetzen</string>
+  <string name="st_reset_database_title">Datenbank zurücksetzen</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Diese Aktion sollte nur auf Empfehlung des Support-Teams ausgeführt werden.
+  <string name="st_reset_database_question">Diese Aktion sollte nur auf Empfehlung des Support-Teams ausgeführt werden.
 \nBist du sicher, dass du die Syncthing Datenbank leeren möchtest?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Datenbank erfolgreich zurückgesetzt</string>
+  <string name="st_reset_database_done">Datenbank erfolgreich zurückgesetzt</string>
  <string name="category_about">Über</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Log öffnen</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -222,13 +222,13 @@
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Οι αποδεκτοί χαρακτήρες στις επιλογές STTRACE είναι τα 0-9, a-z και το \',\'.</string>
  <string name="toast_invalid_environment_variables">Η τιμή δεν είναι έγκυρη συμβολοσειρά μεταβλητής περιβάλλοντος</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Επαναφορά βάσης δεδομένων</string>
+  <string name="st_reset_database_title">Επαναφορά βάσης δεδομένων</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Αυτή η ενέργεια πρέπει να εκτελείται μόνο κατόπιν προτροπής από την ομάδα υποστήριξης μας.
+  <string name="st_reset_database_question">Αυτή η ενέργεια πρέπει να εκτελείται μόνο κατόπιν προτροπής από την ομάδα υποστήριξης μας.
 \nΣίγουρα επιθυμείτε να διαγράψετε τη βάση δεδομένων ευρετηρίων του Syncthing;
 </string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Η επαναφορά της βάσης δεδομένων του Syncthing ήταν επιτυχής</string>
+  <string name="st_reset_database_done">Η επαναφορά της βάσης δεδομένων του Syncthing ήταν επιτυχής</string>
  <string name="category_about">Σχετικά με το Syncthing</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Άνοιγμα καταγραφής συμβάντων</string>
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@ -168,13 +168,13 @@
  <!--Title for the preference to set STTRACE parameters-->
  <!--Toast after entering invalid STTRACE params-->
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Reiniciar Base de Datos</string>
+  <string name="st_reset_database_title">Reiniciar Base de Datos</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Esta acción sólo debe ser realizada basada en una recomendación de nuestro equipo de soporte.
+  <string name="st_reset_database_question">Esta acción sólo debe ser realizada basada en una recomendación de nuestro equipo de soporte.
 \n¿Está seguro que quiere limpiar el índice de la base de datos de Syncthing?
 </string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Satisfactoriamente reiniciada la base de datos de Syncthing</string>
+  <string name="st_reset_database_done">Satisfactoriamente reiniciada la base de datos de Syncthing</string>
  <string name="category_about">Acerca de</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Abrir Registro</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -197,12 +197,12 @@
  <!--Toast after entering invalid STTRACE params-->
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Sólo se permite 0-9, a-z y coma (\',\') en las opciones de STTRACE</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Restablecer base de datos</string>
+  <string name="st_reset_database_title">Restablecer base de datos</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Esta acción sólo se debería realizar por recomendación de nuestro equipo de soporte.
+  <string name="st_reset_database_question">Esta acción sólo se debería realizar por recomendación de nuestro equipo de soporte.
 \n¿Estás seguro de que quieres limpiar la base de datos de índices de Syncthing?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Base de datos de Syncthing restablecida con éxito</string>
+  <string name="st_reset_database_done">Base de datos de Syncthing restablecida con éxito</string>
  <string name="category_about">Acerca de</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Abrir registro</string>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@ -198,12 +198,12 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
  <!--Toast after entering invalid STTRACE params-->
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Vain 0-9, a-z ja \',\' ovat sallittuja STTRACE valintoja</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Nollaa tietokanta</string>
+  <string name="st_reset_database_title">Nollaa tietokanta</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Tätä toimintoa tulee käyttää vain, jos tukemme suosittelee sitä.
+  <string name="st_reset_database_question">Tätä toimintoa tulee käyttää vain, jos tukemme suosittelee sitä.
 \nOletko varma, että haluat tyhjentää Synthingin indeksitietokannan?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Syncthingin tietokannan tyhjentäminen onnistui</string>
+  <string name="st_reset_database_done">Syncthingin tietokannan tyhjentäminen onnistui</string>
  <string name="category_about">Tietoja</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Avaa loki</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -222,13 +222,13 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</str
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Seulement 0-9, a-z et \',\' sont autorisés dans les options STTRACE</string>
  <string name="toast_invalid_environment_variables">La valeur n\'est pas une chaîne de variable d\'environnement valide</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Remise à zéro de la base de données</string>
+  <string name="st_reset_database_title">Remise à zéro de la base de données</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Cette action ne doit être réalisée que sur recommandation de l\'équipe support.
+  <string name="st_reset_database_question">Cette action ne doit être réalisée que sur recommandation de l\'équipe support.
        \nEtes-vous sûr de vouloir effacer l\'index de base de données de Syncthing ?
    </string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Réinitialisation réussie de la base de données Syncthing</string>
+  <string name="st_reset_database_done">Réinitialisation réussie de la base de données Syncthing</string>
  <string name="category_about">A propos</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Ouvrir le journal</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -230,13 +230,13 @@ VIGYÁZAT! Más alkalmazások kiolvashatják a backupból a titkos kulcsot, és
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Az STTRACE beállítás csak 0-9, a-z és \',\' karaktereket tartalmazhat</string>
  <string name="toast_invalid_environment_variables">Az érték nem egy érvényes környezeti változó string</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Adatbázis törlése</string>
+  <string name="st_reset_database_title">Adatbázis törlése</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Ezt az opciót csak akkor javasolt kiválasztani, ha a kifejezetten ezt javasolta egy fejlesztő.
+  <string name="st_reset_database_question">Ezt az opciót csak akkor javasolt kiválasztani, ha a kifejezetten ezt javasolta egy fejlesztő.

 Biztosan törölni szeretnéd a Syncthing index adatbázisát?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">A Syncthing adatbázisának törlése megtörtént</string>
+  <string name="st_reset_database_done">A Syncthing adatbázisának törlése megtörtént</string>
  <string name="category_about">Névjegy</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Napló megnyitása</string>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@ -212,12 +212,12 @@ Jika ada masalah silakan laporkan lewat Github.</string>
  <!--Toast after entering invalid STTRACE params-->
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Hanya 0-9, a-z dan \',\' yang dibolehkan dalam opsi STTRACE</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Reset Database</string>
+  <string name="st_reset_database_title">Reset Database</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Perintah ini sebaiknya dijalankan hanya menurut saran dari tim dukungan kami.
+  <string name="st_reset_database_question">Perintah ini sebaiknya dijalankan hanya menurut saran dari tim dukungan kami.
 \nAnda yakin ingin membersihkan database indeks Syncthing?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Berhasil melakukan reset database Syncthing</string>
+  <string name="st_reset_database_done">Berhasil melakukan reset database Syncthing</string>
  <string name="category_about">Tentang</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Buka Log</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -222,13 +222,13 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.</string>
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Solo 0-9, a-z e \',\' sono consentiti nelle opzioni STTRACE</string>
  <string name="toast_invalid_environment_variables">Il valore non è una stringa valida per una variabile d\'ambiente</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Reset del Database</string>
+  <string name="st_reset_database_title">Reset del Database</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Questa operazione dovrebbe essere eseguita solo su raccomandazione del nostro team di supporto.
+  <string name="st_reset_database_question">Questa operazione dovrebbe essere eseguita solo su raccomandazione del nostro team di supporto.
 \nSei sicuro di voler svuotare il database degli indici di Syncthing?
 </string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Reset del database di Syncthing riuscito</string>
+  <string name="st_reset_database_done">Reset del database di Syncthing riuscito</string>
  <string name="category_about">Info</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Apri Registro</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -221,12 +221,12 @@
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">STTRACE オプションでは、0-9、a-z および \',\' のみ使用できます。</string>
  <string name="toast_invalid_environment_variables">値は有効な環境変数文字列ではありません</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">データベースをリセットする</string>
+  <string name="st_reset_database_title">データベースをリセットする</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">この操作は、サポートチームに推奨された場合にのみ行ってください。
+  <string name="st_reset_database_question">この操作は、サポートチームに推奨された場合にのみ行ってください。
 \n本当に Syncthing のインデックスデータベースをクリアしてもよろしいですか?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">正常に Syncthing のデータベースをリセットしました</string>
+  <string name="st_reset_database_done">正常に Syncthing のデータベースをリセットしました</string>
  <string name="category_about">アプリについて</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">ログを開く</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -220,12 +220,12 @@
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">STTRACE 옵션에서는 0-9, a-z 와 \'.\' 외의 문자를 사용할 수 없습니다.</string>
  <string name="toast_invalid_environment_variables">값이 유효한 환경 변수 문자열이 아닙니다</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">데이터베이스 리셋</string>
+  <string name="st_reset_database_title">데이터베이스 리셋</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">이 행동은 우리의 지원팀이 권장한 경우에만 시도하세요.
+  <string name="st_reset_database_question">이 행동은 우리의 지원팀이 권장한 경우에만 시도하세요.
 \n정말로 Syncthing의 인덱스 데이터베이스를 지우시겠습니까?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Syncthing의 데이터베이스가 성공적으로 리셋되었습니다</string>
+  <string name="st_reset_database_done">Syncthing의 데이터베이스가 성공적으로 리셋되었습니다</string>
  <string name="category_about">정보</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">로그 열기</string>
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@ -173,12 +173,12 @@
  <!--Title for the preference to set STTRACE parameters-->
  <!--Toast after entering invalid STTRACE params-->
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Nullstill database</string>
+  <string name="st_reset_database_title">Nullstill database</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Denne operasjonen bør bare utføres på anbefaling fra vår brukerstøttegruppe.
+  <string name="st_reset_database_question">Denne operasjonen bør bare utføres på anbefaling fra vår brukerstøttegruppe.
 \nEr du sikker på at du vil nullstille Syncthings indeks-database?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Nullstilling av Syncthings database var vellykket</string>
+  <string name="st_reset_database_done">Nullstilling av Syncthings database var vellykket</string>
  <string name="category_about">Om</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Åpne logg</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -222,12 +222,12 @@ Als je problemen tegenkomt, meld ze dan via GitHub.</string>
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Enkel 0-9, a-z en \',\' zijn toegestaan in STTRACE-opties</string>
  <string name="toast_invalid_environment_variables">Waarde is geen geldige omgevingsvariabele</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Database opnieuw instellen</string>
+  <string name="st_reset_database_title">Database opnieuw instellen</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Deze actie moet je enkel uitvoeren wanneer ons ondersteuningsteam je dit aanraadt.
+  <string name="st_reset_database_question">Deze actie moet je enkel uitvoeren wanneer ons ondersteuningsteam je dit aanraadt.
 \nZeker dat je de indexdatabase van Syncthing wilt wissen?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Opnieuw instellen van Syncthing-database geslaagd</string>
+  <string name="st_reset_database_done">Opnieuw instellen van Syncthing-database geslaagd</string>
  <string name="category_about">Over</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Log openen</string>
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@ -173,12 +173,12 @@
  <!--Title for the preference to set STTRACE parameters-->
  <!--Toast after entering invalid STTRACE params-->
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Nullstill database</string>
+  <string name="st_reset_database_title">Nullstill database</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Denne handlinga bør berre utførast om vår brukarstøttegruppe har anbefalt det.
+  <string name="st_reset_database_question">Denne handlinga bør berre utførast om vår brukarstøttegruppe har anbefalt det.
 \nEr du sikker på at du vil nullstille indeksdatabasen til Syncthing?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Vellukka nullstilling av Syncthings database</string>
+  <string name="st_reset_database_done">Vellukka nullstilling av Syncthings database</string>
  <string name="category_about">Om</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Opne logg</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -191,13 +191,13 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.<
  <!--Toast after entering invalid STTRACE params-->
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Tylko 0-9, a-z i \",\" są dozwolone w opcjach STTRACE</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Przywróć pierwotny stan bazy danych</string>
+  <string name="st_reset_database_title">Przywróć pierwotny stan bazy danych</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">To działanie powinno się przeprowadzać tylko, kiedy jest ono zalecone przez dział wsparcia programu.
+  <string name="st_reset_database_question">To działanie powinno się przeprowadzać tylko, kiedy jest ono zalecone przez dział wsparcia programu.

 \nPrzywrócić bazę danych do stanu początkowego?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Przywrócono stan początkowy bazy danych</string>
+  <string name="st_reset_database_done">Przywrócono stan początkowy bazy danych</string>
  <string name="category_about">O programie</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Otwórz dziennik</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -218,13 +218,13 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Somente os caracteres 0-9, a-z e vírgula são permitidos nas opções de STTRACE</string>
  <string name="toast_invalid_environment_variables">O a variável de ambiente não é um valor válido</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Limpar banco de dados</string>
+  <string name="st_reset_database_title">Limpar banco de dados</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Esta ação deve ser executada somente com base em uma recomendação da nossa equipe de suporte.
+  <string name="st_reset_database_question">Esta ação deve ser executada somente com base em uma recomendação da nossa equipe de suporte.
 \nTem certeza de que quer limpar o banco de dados do Syncthing?
 </string>
  <!--Syncthing was reset-->
-  <string name="streset_done">O banco de dados do Syncthing foi limpo com sucesso</string>
+  <string name="st_reset_database_done">O banco de dados do Syncthing foi limpo com sucesso</string>
  <string name="category_about">Sobre</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Abrir log</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -193,13 +193,13 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.</strin
  <!--Toast after entering invalid STTRACE params-->
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Nas opções STTRACE apenas é permitido 0-9, a-z e \',\'</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Reiniciar a base de dados</string>
+  <string name="st_reset_database_title">Reiniciar a base de dados</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Esta acção só deve ser executada com base numa recomendação da nossa equipa de suporte.
+  <string name="st_reset_database_question">Esta acção só deve ser executada com base numa recomendação da nossa equipa de suporte.
 \nTem a certeza que quer limpar o índice da base de dados do Syncthing?
    </string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Base de dados do Syncthing reiniciada com sucesso.</string>
+  <string name="st_reset_database_done">Base de dados do Syncthing reiniciada com sucesso.</string>
  <string name="category_about">Sobre</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Abrir registo</string>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -223,12 +223,12 @@ Vă rugăm să raportați orice problemă întâlniți, prin intermediul GitHub.
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Doar 0-9, a-z și \',\' sunt permise în opțiunile STTRACE</string>
  <string name="toast_invalid_environment_variables">Această valoare nu este un șir de variabile de mediu valabil</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Resetează baza de date</string>
+  <string name="st_reset_database_title">Resetează baza de date</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Această acțiune ar trebui efectuată numai la recomandarea echipei noastre de suport tehnic.
+  <string name="st_reset_database_question">Această acțiune ar trebui efectuată numai la recomandarea echipei noastre de suport tehnic.
       \nSigur doriți să ștergeți indexul bazei de date Syncthing?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Baza de date Syncthing a fost resetată cu succes</string>
+  <string name="st_reset_database_done">Baza de date Syncthing a fost resetată cu succes</string>
  <string name="category_about">Despre</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Deschide jurnal de erori</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -195,13 +195,13 @@
  <!--Toast after entering invalid STTRACE params-->
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Только 0-9, a-z и \',\' допустимы для параметра STTRACE</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Сбросить базу данных</string>
+  <string name="st_reset_database_title">Сбросить базу данных</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Это действие должно выполняться только по рекомендации нашей поддержки.
+  <string name="st_reset_database_question">Это действие должно выполняться только по рекомендации нашей поддержки.
        \nВы уверены что хотите очистить индекс базы Syncthing?
    </string>
  <!--Syncthing was reset-->
-  <string name="streset_done">БД Syncthing успешно сброшена</string>
+  <string name="st_reset_database_done">БД Syncthing успешно сброшена</string>
  <string name="category_about">О программе</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Открыть лог</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -156,12 +156,12 @@
  <!--Title for the preference to set STTRACE parameters-->
  <!--Toast after entering invalid STTRACE params-->
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Resetovať Databázu</string>
+  <string name="st_reset_database_title">Resetovať Databázu</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Túto možnosť by ste mali využiť iba ak Vám to odporučí naša podpora.\n
+  <string name="st_reset_database_question">Túto možnosť by ste mali využiť iba ak Vám to odporučí naša podpora.\n
 Naozaj chcete resetovať databázu s indexom súborov?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Reset databázy bol úspešný</string>
+  <string name="st_reset_database_done">Reset databázy bol úspešný</string>
  <string name="category_about">O programe</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Zobraziť Záznam</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -222,12 +222,12 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">Endast 0-9, a-z och \',\' är tillåtna i STTRACE alternativ</string>
  <string name="toast_invalid_environment_variables">Värdet är inte en giltig miljövariabel sträng</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Återställ databas</string>
+  <string name="st_reset_database_title">Återställ databas</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Denna åtgärd bör endast utföras baserad på en rekommendation från vår support grupp.
+  <string name="st_reset_database_question">Denna åtgärd bör endast utföras baserad på en rekommendation från vår support grupp.
 \nÄr du säker på att du vill rensa Syncthings index-databas?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Syncthings databas återställdes</string>
+  <string name="st_reset_database_done">Syncthings databas återställdes</string>
  <string name="category_about">Om</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Öppna logg</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -191,12 +191,12 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.</st
  <!--Toast after entering invalid STTRACE params-->
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">STTRACE seçeneklerinde yalnızca 0-9, a-z ve \",\" karakterlerine izin verilir</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Veritabanını Sıfırla</string>
+  <string name="st_reset_database_title">Veritabanını Sıfırla</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Bu eylem yalnızca destek takımımızdan alınan öneriye dayanarak gerçekleştirilmelidir.
+  <string name="st_reset_database_question">Bu eylem yalnızca destek takımımızdan alınan öneriye dayanarak gerçekleştirilmelidir.
 \nSyncthing\'in dizin veritabanını temizlemek istediğine emin misin?</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Syncthing\'in veritabanı başarıyla sıfırlandı.</string>
+  <string name="st_reset_database_done">Syncthing\'in veritabanı başarıyla sıfırlandı.</string>
  <string name="category_about">Hakkında</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Günlüğü Aç</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -169,10 +169,10 @@
  <!--Toast after entering invalid STTRACE params-->
  <string name="toast_invalid_environment_variables">Значення не відповідає формату рядка змінних оточення</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Очистити базу даних</string>
+  <string name="st_reset_database_title">Очистити базу даних</string>
  <!--Syncthing was reset-->
  <!--Syncthing was reset-->
-  <string name="streset_done">База даних  Syncthing успішно очищена</string>
+  <string name="st_reset_database_done">База даних  Syncthing успішно очищена</string>
  <string name="category_about">Про додаток</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Відкрити журнал</string>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -168,13 +168,13 @@
  <!--Title for the preference to set STTRACE parameters-->
  <!--Toast after entering invalid STTRACE params-->
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">Cài lại CSDL</string>
+  <string name="st_reset_database_title">Cài lại CSDL</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">Chỉ nên thực hiện thao tác này dựa trên khuyến nghị từ nhóm hỗ trợ của chúng tôi.
+  <string name="st_reset_database_question">Chỉ nên thực hiện thao tác này dựa trên khuyến nghị từ nhóm hỗ trợ của chúng tôi.
 \nCó chắc là bạn muốn xoá CSDL chỉ mục của Syncthing?
 </string>
  <!--Syncthing was reset-->
-  <string name="streset_done">Cài lại thành công CSDL của Syncthing</string>
+  <string name="st_reset_database_done">Cài lại thành công CSDL của Syncthing</string>
  <string name="category_about">Thông tin về</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">Mở lịch sử</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -223,12 +223,12 @@
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">STTRACE 选项仅允许 0-9、a-z 与半角逗号“,”</string>
  <string name="toast_invalid_environment_variables">该值不是有效的环境变量字符串</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">重置数据库</string>
+  <string name="st_reset_database_title">重置数据库</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">本操作仅应在支持团队的推荐下进行。\n
+  <string name="st_reset_database_question">本操作仅应在支持团队的推荐下进行。\n
 您确定要清理 Syncthing 的索引数据库吗？</string>
  <!--Syncthing was reset-->
-  <string name="streset_done">重置 Syncthing 数据库完成</string>
+  <string name="st_reset_database_done">重置 Syncthing 数据库完成</string>
  <string name="category_about">关于</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">打开日志</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -221,13 +221,13 @@
  <string name="toast_invalid_sttrace" tools:ignore="TypographyDashes">STTRACE 選項僅允許 0-9、a-z 及 \',\'</string>
  <string name="toast_invalid_environment_variables">輸入的值不是有效的環境變數字串</string>
  <!--Title for the preference to reset Syncthing indexes-->
-  <string name="streset_title">重設資料庫</string>
+  <string name="st_reset_database_title">重設資料庫</string>
  <!--Syncthing was reset-->
-  <string name="streset_question">執行這個動作應該只會基於來自我們支援團隊的建議。
+  <string name="st_reset_database_question">執行這個動作應該只會基於來自我們支援團隊的建議。
        \n你確定要清除 Syncthing 的索引資料庫？
    </string>
  <!--Syncthing was reset-->
-  <string name="streset_done">成功重設 Syncthing 資料庫</string>
+  <string name="st_reset_database_done">成功重設 Syncthing 資料庫</string>
  <string name="category_about">關於</string>
  <!--Settings item that opens the log activity-->
  <string name="open_log">打開日誌</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -372,15 +372,26 @@ Please report any problems you encounter via Github.</string>
    <string name="toast_invalid_environment_variables">Value is not a valid environment variable string</string>

    <!-- Title for the preference to reset Syncthing indexes -->
-    <string name="streset_title">Reset Database</string>
+    <string name="st_reset_database_title">Reset Database</string>

    <!-- Syncthing was reset -->
-    <string name="streset_question">This action should only be performed based on a recommendation from our support team.
-        \nAre you sure you want to clear Syncthing\'s index database?
+    <string name="st_reset_database_question">This action should only be performed based on a recommendation from our support team.
+        \nAre you sure you want to clear Syncthing\'s database?
    </string>

    <!-- Syncthing was reset -->
-    <string name="streset_done">Successfully reset Syncthing\'s database</string>
+    <string name="st_reset_database_done">Successfully reset Syncthing\'s database</string>
+
+    <!-- Title for the preference to reset Syncthing indexes -->
+    <string name="st_reset_deltas_title">Reset Delta Indexes</string>
+
+    <!-- Syncthing was reset -->
+    <string name="st_reset_deltas_question">This action should only be performed based on a recommendation from our support team.
+        \nAre you sure you want to clear Syncthing\'s delta indexes?
+    </string>
+
+    <!-- Syncthing was reset -->
+    <string name="st_reset_deltas_done">Successfully reset Syncthing\'s delta indexes</string>

    <string name="category_about">About</string>

--- a/app/src/main/res/xml/app_settings.xml
+++ b/app/src/main/res/xml/app_settings.xml
@ -174,8 +174,13 @@
            android:inputType="textNoSuggestions"/>

        <Preference
-            android:key="streset"
-            android:title="@string/streset_title"
+            android:key="st_reset_database"
+            android:title="@string/st_reset_database_title"
+            android:singleLine="true" />
+
+        <Preference
+            android:key="st_reset_deltas"
+            android:title="@string/st_reset_deltas_title"
            android:singleLine="true" />

    </PreferenceScreen>