diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c
index 0efe3380a..245d971e5 100644
--- a/jni/dc_wrapper.c
+++ b/jni/dc_wrapper.c
@@ -716,12 +716,6 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcContext_imexHasBackup(JNIEnv *env, j
}
-JNIEXPORT void Java_com_b44t_messenger_DcContext_emptyServer(JNIEnv *env, jobject obj, jint flags)
-{
- dc_empty_server(get_dc_context(env, obj), flags);
-}
-
-
JNIEXPORT jint Java_com_b44t_messenger_DcContext_addAddressBook(JNIEnv *env, jobject obj, jstring adrbook)
{
CHAR_REF(adrbook);
diff --git a/res/layout/empty_folder_options.xml b/res/layout/empty_folder_options.xml
deleted file mode 100644
index aef345b64..000000000
--- a/res/layout/empty_folder_options.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/res/xml/preferences_advanced.xml b/res/xml/preferences_advanced.xml
index 50361a91a..ce1cd9076 100644
--- a/res/xml/preferences_advanced.xml
+++ b/res/xml/preferences_advanced.xml
@@ -56,9 +56,6 @@
android:key="pref_location_streaming_enabled"
android:title="On-demand location streaming"/>
-
-
diff --git a/src/com/b44t/messenger/DcContext.java b/src/com/b44t/messenger/DcContext.java
index 1046a4c38..8d56189f8 100644
--- a/src/com/b44t/messenger/DcContext.java
+++ b/src/com/b44t/messenger/DcContext.java
@@ -69,9 +69,6 @@ public class DcContext {
public final static int DC_MEDIA_QUALITY_BALANCED = 0;
public final static int DC_MEDIA_QUALITY_WORSE = 1;
- public final static int DC_EMPTY_MVBOX = 0x01;
- public final static int DC_EMPTY_INBOX = 0x02;
-
public DcContext(String osName, String dbfile) {
contextCPtr = createContextCPtr(osName, dbfile);
}
@@ -118,7 +115,6 @@ public class DcContext {
public native boolean continueKeyTransfer (int msg_id, String setup_code);
public native void imex (int what, String dir);
public native String imexHasBackup (String dir);
- public native void emptyServer (int flags);
public native boolean mayBeValidAddr (String addr);
public native int lookupContactIdByAddr(String addr);
public native int[] getContacts (int flags, String query);
diff --git a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
index 2e20005eb..14bf3fe8c 100644
--- a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
@@ -91,11 +91,6 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
return true;
});
- Preference emptyServerFolders = this.findPreference("pref_empty_server_folders");
- if(emptyServerFolders!=null) {
- emptyServerFolders.setOnPreferenceClickListener(new EmptyServerFoldersListener());
- }
-
Preference manageKeys = this.findPreference("pref_manage_keys");
manageKeys.setOnPreferenceClickListener(new ManageKeysListener());
@@ -288,38 +283,4 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
})
.execute();
}
-
-
- /***********************************************************************************************
- * Empty server folder
- **********************************************************************************************/
-
- private class EmptyServerFoldersListener implements Preference.OnPreferenceClickListener {
- @Override
- public boolean onPreferenceClick(Preference preference) {
- View gl = View.inflate(getActivity(), R.layout.empty_folder_options, null);
- CheckBox inboxCb = gl.findViewById(R.id.empty_inbox_folder);
- CheckBox mvboxCb = gl.findViewById(R.id.empty_deltachat_folder);
- new AlertDialog.Builder(getActivity())
- .setTitle(R.string.pref_empty_server_title)
- .setMessage(R.string.pref_empty_server_msg)
- .setView(gl)
- .setNegativeButton(R.string.cancel, null)
- .setPositiveButton(R.string.pref_empty_server_do_button, (dialog, which) -> {
- int flags = 0;
- if (inboxCb!=null && inboxCb.isChecked()) {
- flags |= DcContext.DC_EMPTY_INBOX;
- }
- if (mvboxCb!=null && mvboxCb.isChecked()) {
- flags |= DcContext.DC_EMPTY_MVBOX;
- }
- if (flags!=0) {
- dcContext.emptyServer(flags);
- }
- })
- .show();
- return true;
- }
- }
-
}