Add UI for "ignoreDelete" folder option (fixes #356) (#357)

* Add drawable: ic_delete_forever_black_24

* Update ConfigXml

* Update FolderActivity

* Update layout: activity_folder

* Add strings

* Import de translation

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

@@ -112,6 +112,7 @@ public class FolderActivity extends SyncthingActivity {
     private TextView mVersioningDescriptionView;
     private TextView mVersioningTypeView;
     private SwitchCompat mVariableSizeBlocks;
+    private SwitchCompat mIgnoreDelete;
     private TextView mEditIgnoreListTitle;
     private EditText mEditIgnoreListContent;
 
@@ -177,6 +178,10 @@ public class FolderActivity extends SyncthingActivity {
                     mFolder.useLargeBlocks = isChecked;
                     mFolderNeedsToUpdate = true;
                     break;
+                case R.id.ignoreDelete:
+                    mFolder.ignoreDelete = isChecked;
+                    mFolderNeedsToUpdate = true;
+                    break;
             }
         }
     };
@@ -208,6 +213,7 @@ public class FolderActivity extends SyncthingActivity {
         mVersioningDescriptionView = findViewById(R.id.versioningDescription);
         mVersioningTypeView = findViewById(R.id.versioningType);
         mVariableSizeBlocks = findViewById(R.id.variableSizeBlocks);
+        mIgnoreDelete = findViewById(R.id.ignoreDelete);
         mDevicesContainer = findViewById(R.id.devicesContainer);
         mEditIgnoreListTitle = findViewById(R.id.edit_ignore_list_title);
         mEditIgnoreListContent = findViewById(R.id.edit_ignore_list_content);
@@ -458,6 +464,7 @@ public class FolderActivity extends SyncthingActivity {
         mFolderPaused.setOnCheckedChangeListener(null);
         mCustomSyncConditionsSwitch.setOnCheckedChangeListener(null);
         mVariableSizeBlocks.setOnCheckedChangeListener(null);
+        mIgnoreDelete.setOnCheckedChangeListener(null);
 
         // Update views
         mLabelView.setText(mFolder.label);
@@ -468,6 +475,7 @@ public class FolderActivity extends SyncthingActivity {
         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);
 
         // Update views - custom sync conditions.
@@ -503,6 +511,7 @@ public class FolderActivity extends SyncthingActivity {
         mFolderPaused.setOnCheckedChangeListener(mCheckedListener);
         mCustomSyncConditionsSwitch.setOnCheckedChangeListener(mCheckedListener);
         mVariableSizeBlocks.setOnCheckedChangeListener(mCheckedListener);
+        mIgnoreDelete.setOnCheckedChangeListener(mCheckedListener);
     }
 
     @Override

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

@@ -436,6 +436,7 @@ public class ConfigXml {
             folder.order = getContentOrDefault(r.getElementsByTagName("order").item(0), "random");
             folder.paused = getContentOrDefault(r.getElementsByTagName("paused").item(0), false);
             folder.useLargeBlocks = getContentOrDefault(r.getElementsByTagName("useLargeBlocks").item(0), true);
+            folder.ignoreDelete = getContentOrDefault(r.getElementsByTagName("ignoreDelete").item(0), false);
             folder.copyOwnershipFromParent = getContentOrDefault(r.getElementsByTagName("copyOwnershipFromParent").item(0), false);
 
             // Devices
@@ -532,6 +533,7 @@ public class ConfigXml {
                 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.
                 // Pass 1: Remove all devices below that folder in XML except the local device.

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

@@ -314,6 +314,39 @@
 
             </LinearLayout>
 
+            <!-- ignoreDelete -->
+            <LinearLayout
+                android:id="@+id/ignoreDeleteContainer"
+                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/ignoreDelete"
+                    style="@style/Widget.Syncthing.TextView.Label.Details"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:checked="false"
+                    android:drawableLeft="@drawable/ic_delete_forever_black_24"
+                    android:drawableStart="@drawable/ic_delete_forever_black_24"
+                    android:text="@string/folder_ignore_delete_caption" />
+
+                <TextView
+                    android:id="@+id/ignoreDeleteDescription"
+                    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_ignore_delete_description"
+                    android:focusable="false"/>
+
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/editIgnoresContainer"
                 android:layout_width="match_parent"

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

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources [
+    <!ENTITY folder_ignore_delete_docs_url "https://docs.syncthing.net/advanced/folder-ignoredelete.html">
+]>
+
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="app_name">Syncthing-Fork</string>
@@ -210,6 +214,10 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
     <string name="folder_variable_size_blocks_caption">Variable Blockgröße</string>
     <string name="folder_variable_size_blocks_description">Blöcke variabler Größe (auch \"große Blöcke\") sind effizienter für größere Dateien. Wenn Du dies für einen Ordner aktivierst, musst du es für diesen Ordner auf allen Geräten aktivieren.</string>
 
+    <!-- Setting title and description -->
+    <string name="folder_ignore_delete_caption">Löschen ignorieren</string>
+    <string name="folder_ignore_delete_description">Expertenoption, die sich auf die Verarbeitung eingehender Indexaktualisierungen auswirkt. Wenn festgelegt, werden eingehende Aktualisierungen mit dem Löschkennzeichen ignoriert. Siehe &folder_ignore_delete_docs_url;</string>
+
     <!-- Setting title -->
     <string name="folder_pause">Ordner pausieren</string>
 

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

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources [
+    <!ENTITY folder_ignore_delete_docs_url "https://docs.syncthing.net/advanced/folder-ignoredelete.html">
+]>
+
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="app_name">Syncthing-Fork</string>
@@ -213,6 +217,10 @@ Please report any problems you encounter via Github.</string>
     <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>
+
     <!-- Setting title -->
     <string name="folder_pause">Pause Folder</string>