mirror of
https://github.com/ArcaneChat/android.git
synced 2026-07-03 14:05:24 +02:00
remove 'Delete emails from server' experiment, the function is superseded by 'Auto-delete messages'
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_marginLeft="20dp"
|
||||
android:layout_marginRight="20dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/empty_inbox_folder"
|
||||
android:text="@string/pref_empty_server_inbox"
|
||||
android:textColor="@color/red_500"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
/>
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/empty_deltachat_folder"
|
||||
android:text="@string/pref_empty_server_mvbox"
|
||||
android:textColor="@color/red_500"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</FrameLayout>
|
||||
@@ -56,9 +56,6 @@
|
||||
android:key="pref_location_streaming_enabled"
|
||||
android:title="On-demand location streaming"/>
|
||||
|
||||
<Preference android:key="pref_empty_server_folders"
|
||||
android:title="@string/pref_empty_server_title" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user