Remove config val+UI: userLargeBlocks

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

@@ -111,7 +111,6 @@ public class FolderActivity extends SyncthingActivity {
     private TextView mPullOrderDescriptionView;
     private TextView mVersioningDescriptionView;
     private TextView mVersioningTypeView;
-    private SwitchCompat mVariableSizeBlocks;
     private ViewGroup mIgnoreDeleteContainer;
     private SwitchCompat mIgnoreDelete;
     private TextView mEditIgnoreListTitle;
@@ -175,10 +174,6 @@ public class FolderActivity extends SyncthingActivity {
                     }
                     mFolderNeedsToUpdate = true;
                     break;
-                case R.id.variableSizeBlocks:
-                    mFolder.useLargeBlocks = isChecked;
-                    mFolderNeedsToUpdate = true;
-                    break;
                 case R.id.ignoreDelete:
                     mFolder.ignoreDelete = isChecked;
                     mFolderNeedsToUpdate = true;
@@ -214,7 +209,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);
         mIgnoreDeleteContainer = findViewById(R.id.ignoreDeleteContainer);
         mIgnoreDelete = findViewById(R.id.ignoreDelete);
         mDevicesContainer = findViewById(R.id.devicesContainer);
@@ -476,7 +470,6 @@ public class FolderActivity extends SyncthingActivity {
         mFolderFileWatcher.setOnCheckedChangeListener(null);
         mFolderPaused.setOnCheckedChangeListener(null);
         mCustomSyncConditionsSwitch.setOnCheckedChangeListener(null);
-        mVariableSizeBlocks.setOnCheckedChangeListener(null);
         mIgnoreDelete.setOnCheckedChangeListener(null);
 
         // Update views
@@ -487,7 +480,6 @@ public class FolderActivity extends SyncthingActivity {
         updateVersioningDescription();
         mFolderFileWatcher.setChecked(mFolder.fsWatcherEnabled);
         mFolderPaused.setChecked(mFolder.paused);
-        mVariableSizeBlocks.setChecked(mFolder.useLargeBlocks);
         mIgnoreDelete.setChecked(mFolder.ignoreDelete);
         findViewById(R.id.editIgnoresContainer).setVisibility(mIsCreateMode ? View.GONE : View.VISIBLE);
 
@@ -523,7 +515,6 @@ public class FolderActivity extends SyncthingActivity {
         mFolderFileWatcher.setOnCheckedChangeListener(mCheckedListener);
         mFolderPaused.setOnCheckedChangeListener(mCheckedListener);
         mCustomSyncConditionsSwitch.setOnCheckedChangeListener(mCheckedListener);
-        mVariableSizeBlocks.setOnCheckedChangeListener(mCheckedListener);
         mIgnoreDelete.setOnCheckedChangeListener(mCheckedListener);
     }
 

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

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

app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java

@@ -438,7 +438,6 @@ public class ConfigXml {
             folder.hashers = getContentOrDefault(r.getElementsByTagName("hashers").item(0), folder.hashers);
             folder.order = getContentOrDefault(r.getElementsByTagName("order").item(0), folder.order);
             folder.paused = getContentOrDefault(r.getElementsByTagName("paused").item(0), folder.paused);
-            folder.useLargeBlocks = getContentOrDefault(r.getElementsByTagName("useLargeBlocks").item(0), folder.useLargeBlocks);
             folder.ignoreDelete = getContentOrDefault(r.getElementsByTagName("ignoreDelete").item(0), folder.ignoreDelete);
             folder.copyOwnershipFromParent = getContentOrDefault(r.getElementsByTagName("copyOwnershipFromParent").item(0), folder.copyOwnershipFromParent);
 
@@ -535,7 +534,6 @@ public class ConfigXml {
                 setConfigElement(r, "hashers", Integer.toString(folder.hashers));
                 setConfigElement(r, "order", folder.order);
                 setConfigElement(r, "paused", Boolean.toString(folder.paused));
-                setConfigElement(r, "useLargeBlocks", Boolean.toString(folder.useLargeBlocks));
                 setConfigElement(r, "ignoreDelete", Boolean.toString(folder.ignoreDelete));
 
                 // Update devices that share this folder.
@@ -1003,7 +1001,6 @@ public class ConfigXml {
         folder.setAttribute("type", Constants.FOLDER_TYPE_SEND_ONLY);
         folder.setAttribute("fsWatcherEnabled", Boolean.toString(defaultFolder.fsWatcherEnabled));
         folder.setAttribute("fsWatcherDelayS", Integer.toString(defaultFolder.fsWatcherDelayS));
-        setConfigElement(folder, "useLargeBlocks", Boolean.toString(defaultFolder.useLargeBlocks));
         return true;
     }
 

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

@@ -281,39 +281,6 @@
 
             </LinearLayout>
 
-            <!-- variableSizeBlocks -->
-            <LinearLayout
-                android:id="@+id/variableSizeBlocksContainer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?selectableItemBackground"
-                android:orientation="vertical"
-                android:gravity="center_vertical"
-                android:focusable="true">
-
-                <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>
-
             <!-- ignoreDelete -->
             <LinearLayout
                 android:id="@+id/ignoreDeleteContainer"

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

@@ -215,10 +215,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 and description -->
     <string name="folder_ignore_delete_caption">Ignore Delete</string>
     <string name="folder_ignore_delete_description">Expert option that affects the handling of incoming index updates. When set, incoming updates with the delete flag set are ignored. See &folder_ignore_delete_docs_url;</string>