From b0ef477f6e77c0c21974f5c054c859a33039ef0b Mon Sep 17 00:00:00 2001
From: cketti <cketti@thunderbird.net>
Date: Wed, 16 Aug 2023 12:08:52 +0200
Subject: [PATCH] Remove "Show only subscribed folders" from (old) incoming
 server settings screen

---
 .../k9/activity/setup/AccountSetupIncoming.java    | 10 ----------
 .../src/main/res/layout/account_setup_incoming.xml | 14 --------------
 2 files changed, 24 deletions(-)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java
index 5ae3abb2ded..fb0a1065690 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java
@@ -82,7 +82,6 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
     private boolean mMakeDefault;
     private CheckBox useCompressionCheckBox;
     private CheckBox isSendClientIdEnabledCheckBox;
-    private CheckBox mSubscribedFoldersOnly;
     private AuthTypeAdapter mAuthTypeAdapter;
     private ConnectionSecurity[] mConnectionSecurityChoices = ConnectionSecurity.values();
     private boolean editSettings;
@@ -128,7 +127,6 @@ public void onCreate(Bundle savedInstanceState) {
         mNextButton = findViewById(R.id.next);
         useCompressionCheckBox = findViewById(R.id.use_compression);
         isSendClientIdEnabledCheckBox = findViewById(R.id.is_send_client_id_enabled);
-        mSubscribedFoldersOnly = findViewById(R.id.subscribed_folders_only);
         mAllowClientCertificateView = findViewById(R.id.account_allow_client_certificate);
 
         TextInputLayout serverLayoutView = findViewById(R.id.account_server_layout);
@@ -204,7 +202,6 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 findViewById(R.id.imap_path_prefix_section).setVisibility(View.GONE);
                 useCompressionCheckBox.setVisibility(View.GONE);
                 isSendClientIdEnabledCheckBox.setVisibility(View.GONE);
-                mSubscribedFoldersOnly.setVisibility(View.GONE);
             } else if (settings.type.equals(Protocols.IMAP)) {
                 serverLayoutView.setHint(getString(R.string.account_setup_incoming_imap_server_label));
 
@@ -215,10 +212,6 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 if (pathPrefix != null) {
                     mImapPathPrefixView.setText(pathPrefix);
                 }
-
-                if (!editSettings) {
-                    findViewById(R.id.imap_folder_setup_section).setVisibility(View.GONE);
-                }
             } else {
                 throw new Exception("Unknown account type: " + settings.type);
             }
@@ -265,8 +258,6 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 updatePortFromSecurityType();
             }
             mCurrentPortViewSetting = mPortView.getText().toString();
-
-            mSubscribedFoldersOnly.setChecked(mAccount.isSubscribedFoldersOnly());
         } catch (Exception e) {
             failure(e);
         }
@@ -579,7 +570,6 @@ protected void onNext() {
 
             mAccount.setUseCompression(useCompressionCheckBox.isChecked());
             mAccount.setSendClientIdEnabled(isSendClientIdEnabledCheckBox.isChecked());
-            mAccount.setSubscribedFoldersOnly(mSubscribedFoldersOnly.isChecked());
 
             AccountSetupCheckSettings.actionCheckSettings(this, mAccount, CheckDirection.INCOMING);
         } catch (Exception e) {
diff --git a/app/ui/legacy/src/main/res/layout/account_setup_incoming.xml b/app/ui/legacy/src/main/res/layout/account_setup_incoming.xml
index 76adecb0f25..bc645d28291 100644
--- a/app/ui/legacy/src/main/res/layout/account_setup_incoming.xml
+++ b/app/ui/legacy/src/main/res/layout/account_setup_incoming.xml
@@ -158,20 +158,6 @@
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
-            <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/imap_folder_setup_section"
-                    android:orientation="vertical">
-
-                <CheckBox
-                        android:id="@+id/subscribed_folders_only"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:text="@string/account_setup_incoming_subscribed_folders_only_label"
-                        />
-            </LinearLayout>
-
             <CheckBox
                     android:id="@+id/use_compression"
                     android:layout_height="wrap_content"