Revert "Support Variable Size Blocks (VSB)" (#1344)

app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java

@@ -103,7 +103,6 @@ public class FolderActivity extends SyncthingActivity
     private TextView mVersioningDescriptionView;
     private TextView mVersioningTypeView;
     private TextView mEditIgnores;
-    private SwitchCompat mVariableSizeBlocks;
 
     private boolean mIsCreateMode;
     private boolean mFolderNeedsToUpdate = false;
@@ -145,10 +144,6 @@ public class FolderActivity extends SyncthingActivity
                     }
                     mFolderNeedsToUpdate = true;
                     break;
-                case R.id.variableSizeBlocks:
-                    mFolder.useLargeBlocks = isChecked;
-                    mFolderNeedsToUpdate = true;
-                    break;
             }
         }
     };
@@ -174,7 +169,6 @@ public class FolderActivity extends SyncthingActivity
         mPullOrderDescriptionView = findViewById(R.id.pullOrderDescription);
         mVersioningDescriptionView = findViewById(R.id.versioningDescription);
         mVersioningTypeView = findViewById(R.id.versioningType);
-        mVariableSizeBlocks = findViewById(R.id.variableSizeBlocks);
         mDevicesContainer = findViewById(R.id.devicesContainer);
         mEditIgnores = findViewById(R.id.edit_ignores);
 
@@ -415,7 +409,6 @@ public class FolderActivity extends SyncthingActivity
         mIdView.removeTextChangedListener(mTextWatcher);
         mFolderFileWatcher.setOnCheckedChangeListener(null);
         mFolderPaused.setOnCheckedChangeListener(null);
-        mVariableSizeBlocks.setOnCheckedChangeListener(null);
 
         // Update views
         mLabelView.setText(mFolder.label);
@@ -425,7 +418,6 @@ public class FolderActivity extends SyncthingActivity
         updateVersioningDescription();
         mFolderFileWatcher.setChecked(mFolder.fsWatcherEnabled);
         mFolderPaused.setChecked(mFolder.paused);
-        mVariableSizeBlocks.setChecked(mFolder.useLargeBlocks);
         List<Device> devicesList = getApi().getDevices(false);
 
         mDevicesContainer.removeAllViews();
@@ -442,7 +434,6 @@ public class FolderActivity extends SyncthingActivity
         mIdView.addTextChangedListener(mTextWatcher);
         mFolderFileWatcher.setOnCheckedChangeListener(mCheckedListener);
         mFolderPaused.setOnCheckedChangeListener(mCheckedListener);
-        mVariableSizeBlocks.setOnCheckedChangeListener(mCheckedListener);
     }
 
     @Override

app/src/main/java/com/nutomic/syncthingandroid/model/Folder.java

@@ -37,7 +37,7 @@ public class Folder {
     public boolean disableSparseFiles;
     public boolean disableTempIndexes;
     public boolean paused;
-    public boolean useLargeBlocks = true;
+    public boolean useLargeBlocks;
     public int weakHashThresholdPct = 25;
     public String markerName = ".stfolder";
     public String invalid;

app/src/main/res/layout/fragment_folder.xml

@@ -221,38 +221,6 @@
                     android:layout_marginStart="75dp"
                     android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
 
-            </LinearLayout>
-
-            <!-- variableSizeBlocks -->
-            <android.support.v7.widget.SwitchCompat
-                android:id="@+id/variableSizeBlocks"
-                style="@style/Widget.Syncthing.TextView.Label.Details"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:checked="false"
-                android:drawableLeft="@drawable/ic_developer_board_black_24dp"
-                android:drawableStart="@drawable/ic_developer_board_black_24dp"
-                android:text="@string/folder_variable_size_blocks_caption" />
-
-            <TextView
-                android:id="@+id/variableSizeBlocksDescription"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="75dp"
-                android:layout_marginStart="75dp"
-                android:layout_marginTop="-20dp"
-                android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                android:text="@string/folder_variable_size_blocks_description"
-                android:focusable="false"/>
-
-            <LinearLayout
-                android:id="@+id/editIgnoresContainer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?selectableItemBackground"
-                android:orientation="vertical"
-                android:gravity="center_vertical">
-
                 <TextView
                     android:id="@+id/edit_ignores"
                     style="@style/Widget.Syncthing.TextView.Label.Details"

app/src/main/res/values-ar/strings.xml

@@ -52,7 +52,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->

app/src/main/res/values-bg/strings.xml

@@ -95,7 +95,6 @@
   <string name="directory">Директория</string>
   <!--Setting title and description-->
   <string name="folder_fileWatcher">Следи за промени</string>
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <string name="devices">Устройства</string>

app/src/main/res/values-ca-rES/strings.xml

@@ -116,9 +116,6 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
   <!--Setting title and description-->
   <string name="folder_fileWatcher">Vigila els canvis</string>
   <string name="folder_fileWatcherDescription">Demana al sistema que notifiqui dels canvis als fitxers. Si es desactiva es faran comprovacions cada hora.</string>
-  <!--Setting title and description-->
-  <string name="folder_variable_size_blocks_caption">Blocs de Mida Variable</string>
-  <string name="folder_variable_size_blocks_description">El blocs de mida variable (o \"blocs grans\") són més eficients pels fitxers grans. Si ho activeu per una carpeta, ho heu d\'activar per aquella carpeta en tots els dispositius.</string>
   <!--Setting title-->
   <string name="folder_pause">Posa la carpeta en pausa</string>
   <!--Setting title-->

app/src/main/res/values-cs/strings.xml

@@ -109,7 +109,6 @@ Všechny zaznamenané chyby prosím hlašte přes Github.</string>
   <string name="directory">Adresář</string>
   <!--Setting title and description-->
   <string name="folder_fileWatcher">Sledovat změny</string>
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <string name="devices">Přístroje</string>

app/src/main/res/values-da/strings.xml

@@ -103,7 +103,6 @@ Vær venlig at rapportere ethvert problem, du støder på, via Github. </string>
   <!--Setting title-->
   <string name="directory">Katalog</string>
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <string name="devices">Enheder</string>

app/src/main/res/values-de/strings.xml

@@ -116,9 +116,6 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
   <!--Setting title and description-->
   <string name="folder_fileWatcher">Auf Änderungen achten</string>
   <string name="folder_fileWatcherDescription">Fordert das Betriebssystem auf, über Änderungen an Dateien zu informieren. Falls deaktiviert erfolgt stattdessen stündliches Scannen.</string>
-  <!--Setting title and description-->
-  <string name="folder_variable_size_blocks_caption">Blöcke mit variabler Größe</string>
-  <string name="folder_variable_size_blocks_description">Blöcke mit variabler Größe (auch \"große Blöcke\") sind effizienter für große Dateien. Wenn Sie diese für einen Ordner aktivieren, müssen Sie dies auch auf allen anderen Geräten tun.</string>
   <!--Setting title-->
   <string name="folder_pause">Ordner pausieren</string>
   <!--Setting title-->

app/src/main/res/values-el/strings.xml

@@ -91,7 +91,6 @@
   <!--Setting title-->
   <string name="directory">Κατάλογος</string>
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <string name="devices">Συσκευές</string>

app/src/main/res/values-es-rEC/strings.xml

@@ -39,7 +39,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->

app/src/main/res/values-es-rMX/strings.xml

@@ -97,7 +97,6 @@ Algunos dispositivos tienen aplicaciones de eliminación de tareas adicionales p
   <!--Setting title-->
   <string name="directory">Directorio</string>
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <string name="devices">Dispositivos</string>

app/src/main/res/values-es/strings.xml

@@ -83,7 +83,6 @@
   <!--Setting title-->
   <string name="directory">Directorio</string>
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <string name="devices">Dispositivos</string>

app/src/main/res/values-eu/strings.xml

@@ -39,7 +39,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->

app/src/main/res/values-fi/strings.xml

@@ -94,7 +94,6 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
   <!--Setting title-->
   <string name="directory">Hakemisto</string>
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <string name="devices">Laitteet</string>

app/src/main/res/values-fr/strings.xml

@@ -116,9 +116,6 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</str
   <!--Setting title and description-->
   <string name="folder_fileWatcher">Surveiller les changements</string>
   <string name="folder_fileWatcherDescription">Demande au système d\'exploitation de signaler les modifications apportées aux fichiers. Si désactivé, revient aux analyses horaires périodiques.</string>
-  <!--Setting title and description-->
-  <string name="folder_variable_size_blocks_caption">Taille de blocs variable</string>
-  <string name="folder_variable_size_blocks_description">Les blocs de taille variable (\"grands blocs\") sont plus efficaces pour les gros fichiers. Si vous l\'activez sur un partage, vous devrez l\'activer pour ce partage sur tous les périphériques.</string>
   <!--Setting title-->
   <string name="folder_pause">Mettre le partage en pause</string>
   <!--Setting title-->

app/src/main/res/values-hu/strings.xml

@@ -119,7 +119,6 @@ Néhány eszközön extra alkalmazás-leállító alkalmazást telepített fel a
   <!--Setting title and description-->
   <string name="folder_fileWatcher">Figyeli a változásokat</string>
   <string name="folder_fileWatcherDescription">Megkéri az operációs rendszert, hogy értesítsen a fájlok módosításairól. Kikapcsolt állapotban, visszatér az időszakos óránkénti ellenőrzésekhez.</string>
-  <!--Setting title and description-->
   <!--Setting title-->
   <string name="folder_pause">Mappa szüneteltetés</string>
   <!--Setting title-->

app/src/main/res/values-in/strings.xml

@@ -87,7 +87,6 @@ Jika ada masalah silakan laporkan lewat Github.</string>
   <!--Setting title-->
   <string name="directory">Direktori</string>
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <string name="devices">Perangkat</string>

app/src/main/res/values-it/strings.xml

@@ -116,9 +116,6 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.</string>
   <!--Setting title and description-->
   <string name="folder_fileWatcher">Monitorare i cambiamenti</string>
   <string name="folder_fileWatcherDescription">Chiede al sistema operativo di notificare le modifiche ai file. Se disabilitato, ritorna a scansioni orarie periodiche.</string>
-  <!--Setting title and description-->
-  <string name="folder_variable_size_blocks_caption"> Blocchi di dimensioni variabile</string>
-  <string name="folder_variable_size_blocks_description"> I blocchi di dimensioni variabile (anche \"blocchi di grandi dimensioni\") sono più efficienti per file di grandi dimensioni. Se lo abiliti su una cartella, devi abilitarlo per questa cartella su tutti i dispositivi.</string>
   <!--Setting title-->
   <string name="folder_pause">Metti in pausa la cartella</string>
   <!--Setting title-->

app/src/main/res/values-ja/strings.xml

@@ -115,9 +115,6 @@
   <!--Setting title and description-->
   <string name="folder_fileWatcher">変更を監視する</string>
   <string name="folder_fileWatcherDescription">オペレーティングシステムにファイルの変更を通知するよう要求します。 無効にすると、定期的な1時間ごとのスキャンに戻ります。</string>
-  <!--Setting title and description-->
-  <string name="folder_variable_size_blocks_caption">可変サイズブロック</string>
-  <string name="folder_variable_size_blocks_description">可変サイズブロック（「ラージブロック」）は、大きなファイルにとって効率的です。 1つのフォルダでこれを有効にする場合、すべてのデバイスでこのフォルダに対して有効にする必要があります。</string>
   <!--Setting title-->
   <string name="folder_pause">フォルダーを一時停止</string>
   <!--Setting title-->

app/src/main/res/values-ko/strings.xml

@@ -90,7 +90,6 @@
   <!--Setting title-->
   <string name="directory">디렉토리</string>
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <string name="devices">기기</string>

app/src/main/res/values-lt/strings.xml

@@ -39,7 +39,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->

app/src/main/res/values-nb/strings.xml

@@ -75,7 +75,6 @@
   <!--Setting title-->
   <string name="directory">Katalog</string>
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <string name="devices">Enheter</string>

app/src/main/res/values-nl-rBE/strings.xml

@@ -39,7 +39,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->

app/src/main/res/values-nl/strings.xml

@@ -98,7 +98,6 @@ Als je problemen tegenkomt, meld ze dan via GitHub.</string>
   <!--Setting title and description-->
   <string name="folder_fileWatcher">Controleren op wijzigingen</string>
   <string name="folder_fileWatcherDescription">Vraagt het besturingssysteem om meldingen over gewijzigde bestanden. Indien uitgeschakeld wordt elk uur gescand.</string>
-  <!--Setting title and description-->
   <!--Setting title-->
   <string name="folder_pause">Map pauzeren</string>
   <!--Setting title-->

app/src/main/res/values-nn/strings.xml

@@ -75,7 +75,6 @@
   <!--Setting title-->
   <string name="directory">Katalog</string>
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <string name="devices">Einingar</string>

app/src/main/res/values-pl/strings.xml

@@ -111,7 +111,6 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.<
   <!--Setting title and description-->
   <string name="folder_fileWatcher">Obserwuj zmiany</string>
   <string name="folder_fileWatcherDescription">Poproś system operacyjny o powiadomienia o zmienionych plikach. Kiedy opcja jest wyłączona, zmiany skanowane są co godzinę</string>
-  <!--Setting title and description-->
   <!--Setting title-->
   <string name="folder_pause">Zatrzymaj folder</string>
   <!--Setting title-->

app/src/main/res/values-pt-rBR/strings.xml

@@ -97,7 +97,6 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</
   <!--Setting title and description-->
   <string name="folder_fileWatcher">observe as mudanças</string>
   <string name="folder_fileWatcherDescription">Pede ao sistema em operação para notificar sobre mudanças em arquivos. Se desabilitado cai para uma varredura periódica por hora.</string>
-  <!--Setting title and description-->
   <!--Setting title-->
   <string name="folder_pause">Repositório pausado</string>
   <!--Setting title-->

app/src/main/res/values-pt/strings.xml

@@ -116,7 +116,6 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.</strin
   <!--Setting title and description-->
   <string name="folder_fileWatcher">Monitorizar alterações</string>
   <string name="folder_fileWatcherDescription">Pede ao sistema operativo para notificar quando ocorrem alterações a ficheiros. Se for desactivado, reverte para a verificação periódica a cada hora.</string>
-  <!--Setting title and description-->
   <!--Setting title-->
   <string name="folder_pause">Pausar a pasta</string>
   <!--Setting title-->

app/src/main/res/values-ro/strings.xml

@@ -116,8 +116,6 @@ Vă rugăm să raportați orice problemă întâlniți, prin intermediul GitHub.
   <!--Setting title and description-->
   <string name="folder_fileWatcher">Monitorizează schimbările</string>
   <string name="folder_fileWatcherDescription">Se cere sistemului să notifice despre schimbarea fișierelor. Dacă este dezactivat se folosește scanarea o dată pe oră.</string>
-  <!--Setting title and description-->
-  <string name="folder_variable_size_blocks_caption">Blocuri de mărime variabilă</string>
   <!--Setting title-->
   <string name="folder_pause">Întrerupe director</string>
   <!--Setting title-->

app/src/main/res/values-ru/strings.xml

@@ -99,7 +99,6 @@
   <!--Setting title and description-->
   <string name="folder_fileWatcher">Следить за изменениями</string>
   <string name="folder_fileWatcherDescription">Запросить операционную систему сообщать об изменениях в файлах. Если отключено, сканирование будет происходить ежечасно.</string>
-  <!--Setting title and description-->
   <!--Setting title-->
   <string name="folder_pause">Приостановить папку</string>
   <!--Setting title-->

app/src/main/res/values-sk/strings.xml

@@ -72,7 +72,6 @@
   <!--Setting title-->
   <string name="directory">Adersár</string>
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <string name="devices">Zariadenia</string>

app/src/main/res/values-sl/strings.xml

@@ -39,7 +39,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->

app/src/main/res/values-sr/strings.xml

@@ -39,7 +39,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->

app/src/main/res/values-sv/strings.xml

@@ -116,7 +116,6 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
   <!--Setting title and description-->
   <string name="folder_fileWatcher">Håll utkik efter ändringar</string>
   <string name="folder_fileWatcherDescription">Frågar operativsystemet att meddela om ändringar i filer. Om inaktiverad faller tillbaka på återkommande uppdateringar varje timme.</string>
-  <!--Setting title and description-->
   <!--Setting title-->
   <string name="folder_pause">Pausa mapp</string>
   <!--Setting title-->

app/src/main/res/values-ta/strings.xml

@@ -39,7 +39,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->

app/src/main/res/values-tr/strings.xml

@@ -85,7 +85,6 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.</st
   <!--Setting title-->
   <string name="directory">Dizin</string>
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <string name="devices">Aygıtlar</string>

app/src/main/res/values-uk/strings.xml

@@ -118,9 +118,6 @@
   <!--Setting title and description-->
   <string name="folder_fileWatcher">Відстеження змін</string>
   <string name="folder_fileWatcherDescription">Просить операційну систему повідомляти про зміни у файлах. Якщо вимкнено, повертається до періодичного погодинного сканування.</string>
-  <!--Setting title and description-->
-  <string name="folder_variable_size_blocks_caption">Блоки змінного розміру</string>
-  <string name="folder_variable_size_blocks_description">Блоки змінного розміру (також \"великі блоки\") більш ефективні для великих файлів. Якщо ви увімкнете це для певної теки на одному пристрої, ви маєте увімкнути і на всіх інших пристроях.</string>
   <!--Setting title-->
   <string name="folder_pause">Призупинити теку</string>
   <!--Setting title-->

app/src/main/res/values-vi/strings.xml

@@ -74,7 +74,6 @@
   <!--Setting title-->
   <string name="directory">Thư mục</string>
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <string name="devices">Các th.bị</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -117,9 +117,6 @@
   <!--Setting title and description-->
   <string name="folder_fileWatcher">监视更改</string>
   <string name="folder_fileWatcherDescription">要求操作系统通知文件的更改。如果禁用，回落为定期按时扫描。</string>
-  <!--Setting title and description-->
-  <string name="folder_variable_size_blocks_caption">可变大小块</string>
-  <string name="folder_variable_size_blocks_description">可变大小块（既“较大块”）对于大文件更有效率。如果你在一个文件夹上启用此特性，你必须在所有设备上同文件夹都启用。</string>
   <!--Setting title-->
   <string name="folder_pause">暂停同步目录</string>
   <!--Setting title-->

app/src/main/res/values-zh-rTW/strings.xml

@@ -90,7 +90,6 @@
   <!--Setting title-->
   <string name="directory">資料夾</string>
   <!--Setting title and description-->
-  <!--Setting title and description-->
   <!--Setting title-->
   <!--Setting title-->
   <string name="devices">裝置</string>

app/src/main/res/values/strings.xml

@@ -184,10 +184,6 @@ Please report any problems you encounter via Github.</string>
     <string name="folder_fileWatcher">Watch for changes</string>
     <string name="folder_fileWatcherDescription">Asks operating system to notify about changes to files. If disabled falls back to periodic hourly scans.</string>
 
-    <!-- Setting title and description -->
-    <string name="folder_variable_size_blocks_caption">Variable Size Blocks</string>
-    <string name="folder_variable_size_blocks_description">Variable size blocks (also "large blocks") are more efficient for large files. If you enable this on one folder, you have to enable it for this folder on all devices.</string>
-
     <!-- Setting title -->
     <string name="folder_pause">Pause Folder</string>