From ca2d8f4b6e3f5099262e36ce9e2d6f8b34880fd7 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Sat, 5 Oct 2024 16:32:23 +0200
Subject: [PATCH] don't change delete_server_after, let core handle it

---
 src/main/java/com/b44t/messenger/DcContext.java   | 15 ---------------
 .../securesms/InstantOnboardingActivity.java      |  1 -
 .../thoughtcrime/securesms/WelcomeActivity.java   |  1 -
 .../ListSummaryPreferenceFragment.java            |  1 -
 .../securesms/qr/BackupProviderFragment.java      |  1 -
 .../securesms/qr/BackupReceiverFragment.java      |  1 -
 6 files changed, 20 deletions(-)

diff --git a/src/main/java/com/b44t/messenger/DcContext.java b/src/main/java/com/b44t/messenger/DcContext.java
index fd537691f..51e098fb1 100644
--- a/src/main/java/com/b44t/messenger/DcContext.java
+++ b/src/main/java/com/b44t/messenger/DcContext.java
@@ -254,21 +254,6 @@ public class DcContext {
       setConfigInt("is_muted", muted? 1 : 0);
     }
 
-    // Called for new profiles on chatmail servers that are "single device" initially;
-    // to save server disk space, we make use of that delete all messages immediately after download.
-    public void assumeSingleDevice() {
-      if (isChatmail()) {
-        setConfigInt("delete_server_after", 1 /*at once*/);
-      }
-    }
-
-    // Called when we get a hint that another device may be set up.
-    public void assumeMultiDevice() {
-      if (isChatmail() && getConfigInt("delete_server_after") == 1 /*at once*/) {
-        setConfigInt("delete_server_after", 0 /*never/automatic*/);
-      }
-    }
-
     public boolean isGmailOauth2Addr(String addr) {
       final String oauth2url = getOauth2Url(addr, "chat.delta:/foo");
       return isGmailOauth2Url(oauth2url);
diff --git a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
index 3adaf56e7..40cd7b100 100644
--- a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
@@ -391,7 +391,6 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
         progressUpdate((int)progress);
       } else if (progress==1000/*done*/) {
         DcHelper.getAccounts(this).startIo();
-        dcContext.assumeSingleDevice();
         progressSuccess();
       }
     }
diff --git a/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java b/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
index 54d45c075..154cdd4eb 100644
--- a/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
@@ -327,7 +327,6 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen
             else if (progress==1000/*done*/) {
                 DcHelper.getAccounts(this).startIo();
                 progressSuccess();
-                dcContext.assumeMultiDevice();
                 notificationController.close();
                 cleanupTempBackupFile();
             }
diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
index 361c427a1..a8c7b0cfa 100644
--- a/src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
@@ -138,7 +138,6 @@ public abstract class ListSummaryPreferenceFragment extends CorrectedPreferenceF
   protected void startImexInner(int accountId, int what, String imexPath, String pathAsDisplayedToUser)
   {
     DcContext dcContext = DcHelper.getAccounts(getActivity()).getAccount(accountId);
-    dcContext.assumeMultiDevice();
     this.pathAsDisplayedToUser = pathAsDisplayedToUser;
     progressWhat = what;
     dcContext.imex(progressWhat, imexPath);
diff --git a/src/main/java/org/thoughtcrime/securesms/qr/BackupProviderFragment.java b/src/main/java/org/thoughtcrime/securesms/qr/BackupProviderFragment.java
index e33423bba..4e8b8deca 100644
--- a/src/main/java/org/thoughtcrime/securesms/qr/BackupProviderFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/qr/BackupProviderFragment.java
@@ -64,7 +64,6 @@ public class BackupProviderFragment extends Fragment implements DcEventCenter.Dc
         progressBar.setIndeterminate(true);
 
         dcContext = DcHelper.getContext(getActivity());
-        dcContext.assumeMultiDevice();
         DcHelper.getEventCenter(getActivity()).addObserver(DcContext.DC_EVENT_IMEX_PROGRESS, this);
 
         prepareThread = new Thread(() -> {
diff --git a/src/main/java/org/thoughtcrime/securesms/qr/BackupReceiverFragment.java b/src/main/java/org/thoughtcrime/securesms/qr/BackupReceiverFragment.java
index 64c0fac5d..0b519c429 100644
--- a/src/main/java/org/thoughtcrime/securesms/qr/BackupReceiverFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/qr/BackupReceiverFragment.java
@@ -89,7 +89,6 @@ public class BackupReceiverFragment extends Fragment implements DcEventCenter.Dc
             } else if (permille == 1000) {
                 getTransferActivity().setTransferState(BackupTransferActivity.TransferState.TRANSFER_SUCCESS);
                 getTransferActivity().doFinish();
-                dcContext.assumeMultiDevice();
                 return;
             }