update core

deltachat-ios/libraries/deltachat-core/README.md

@@ -112,6 +112,15 @@ standard.  It is possible your system uses
 just work as well.
 
 
+Testing program
+--------------------------------------------------------------------------------
+
+After a successful build there is also a little testing program in `builddir/cmdline`.
+You start the program with `./delta <database-file>`
+(if the database file does not exist, it is created).
+The program then shows a promt and typing `help` gives some help about the available commands.
+
+
 License
 --------------------------------------------------------------------------------
 

deltachat-ios/libraries/deltachat-core/python/src/deltachat/_build.py

@@ -10,7 +10,7 @@ def ffibuilder():
     builder.set_source(
         'deltachat.capi',
         """
-            #include <deltachat/mrmailbox.h>
+            #include <deltachat/deltachat.h>
         """,
         libraries=['deltachat'],
     )
@@ -21,7 +21,7 @@ def ffibuilder():
     cc = distutils.ccompiler.new_compiler(force=True)
     distutils.sysconfig.customize_compiler(cc)
     with tempfile.NamedTemporaryFile(mode='w', suffix='.h') as src_fp:
-        src_fp.write('#include <deltachat/mrmailbox.h>')
+        src_fp.write('#include <deltachat/deltachat.h>')
         src_fp.flush()
         with tempfile.NamedTemporaryFile(mode='r') as dst_fp:
             cc.preprocess(source=src_fp.name,

deltachat-ios/libraries/deltachat-core/python/tests/test_mrmailbox.py

@@ -5,12 +5,6 @@ import pytest
 from deltachat import capi
 
 
-@pytest.fixture
-def tmppath(tmpdir):
-    return pathlib.Path(tmpdir.strpath)
-
-
-def test_new():
-    mbox = capi.lib.mrmailbox_new(capi.ffi.NULL, capi.ffi.NULL, capi.ffi.NULL)
-    capi.lib.mrmailbox_close(mbox)
-    assert 0
+def test_empty_context():
+    ctx = capi.lib.dc_context_new(capi.ffi.NULL, capi.ffi.NULL, capi.ffi.NULL)
+    capi.lib.dc_close(ctx)

deltachat-ios/libraries/deltachat-core/src/dc_openssl.c

@@ -134,16 +134,16 @@ void dc_openssl_init(void)
 				CRYPTO_set_dynlock_destroy_callback(dyn_destroy_function);
 
 				// see https://wiki.openssl.org/index.php/Library_Initialization
-#ifdef __APPLE__
-                OPENSSL_init();
-#else
-				SSL_load_error_strings();
-				#if OPENSSL_VERSION_NUMBER < 0x10100000L
-				SSL_library_init();
+				#ifdef __APPLE__
+					OPENSSL_init();
 				#else
-				OPENSSL_init_ssl(0, NULL);
+					SSL_load_error_strings();
+					#if OPENSSL_VERSION_NUMBER < 0x10100000L
+					SSL_library_init();
+					#else
+					OPENSSL_init_ssl(0, NULL);
+					#endif
 				#endif
-#endif
 				OpenSSL_add_all_algorithms();
 			}
 			mailstream_openssl_init_not_required();

deltachat-ios/libraries/deltachat-core/src/deltachat.h

@@ -27,15 +27,15 @@ extern "C" {
 #endif
 
 
+#ifndef PY_CFFI
 #include <stdint.h>
 #include <time.h>
+#endif
 
 
 #define DC_VERSION_STR "0.19.0"
 
 
-
-
 /**
  * @mainpage Getting started
  *
@@ -91,10 +91,17 @@ extern "C" {
  * NB: The deltachat-core library itself does not create any threads on its own, however, functions,
  * unless stated otherwise, are thread-safe.
  *
+ * After that you can  **define and open a database.** The database is a normal
+ * sqlite-file and is created as needed:
+ *
+ * ```
+ * dc_open(context, "example.db");
+ * ```
+ *
  * Now you can **configure the context:**
  *
  * ```
- * dc_set_config(context, "addr", "alice@delta.chat"); // use some real test credentials here
+ * dc_set_config(context, "addr", "alice@example.org"); // use some real test credentials here
  * dc_set_config(context, "mail_pw", "***");
  * dc_configure(context);
  * ```
@@ -108,7 +115,7 @@ extern "C" {
  * Now you can **send the first message:**
  *
  * ```
- * uint32_t contact_id = dc_create_contact(context, NULL, "bob@delta.chat"); // use a real testing address here
+ * uint32_t contact_id = dc_create_contact(context, NULL, "bob@example.org"); // use a real testing address here
  * uint32_t chat_id    = dc_create_chat_by_contact_id(context, contact_id);
  *
  * dc_send_text_msg(context, chat_id, "Hi, here is my first message!");
@@ -591,7 +598,7 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
  * This event should not be reported to the end-user using a popup or something like that.
  *
  * @param data1 0
- * @param data2 Info string in english language.
+ * @param data2 (const char*) Info string in english language.
  * @return 0
  */
 #define DC_EVENT_INFO                     100
@@ -604,7 +611,7 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
  * This event should not be reported to the end-user using a popup or something like that.
  *
  * @param data1 0
- * @param data2 Warning string in english language.
+ * @param data2 (const char*) Warning string in english language.
  * @return 0
  */
 #define DC_EVENT_WARNING                  300
@@ -623,8 +630,8 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
  * failed (returned false). It should be sufficient to report only the _last_ error
  * in a messasge box then.
  *
- * @param data1 Error code, see @ref DC_ERROR for a list of constants.
- * @param data2 Error string, always set, never NULL. Frequent error strings are
+ * @param data1 (int) Error code, see @ref DC_ERROR for a list of constants.
+ * @param data2 (const char*) Error string, always set, never NULL. Frequent error strings are
  *     localized using #DC_EVENT_GET_STRING, however, most error strings will be
  *     in english language.
  * @return 0
@@ -639,8 +646,8 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
  * - Chats created, deleted or archived
  * - A draft has been set
  *
- * @param data1 chat_id for single added messages
- * @param data2 msg_id for single added messages
+ * @param data1 (int) chat_id for single added messages
+ * @param data2 (int) msg_id for single added messages
  * @return 0
  */
 #define DC_EVENT_MSGS_CHANGED             2000
@@ -652,8 +659,8 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
  *
  * There is no extra #DC_EVENT_MSGS_CHANGED event send together with this event.
  *
- * @param data1 chat_id
- * @param data2 msg_id
+ * @param data1 (int) chat_id
+ * @param data2 (int) msg_id
  * @return 0
  */
 #define DC_EVENT_INCOMING_MSG             2005
@@ -663,8 +670,8 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
  * A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
  * DC_STATE_OUT_DELIVERED, see dc_msg_get_state().
  *
- * @param data1 chat_id
- * @param data2 msg_id
+ * @param data1 (int) chat_id
+ * @param data2 (int) msg_id
  * @return 0
  */
 #define DC_EVENT_MSG_DELIVERED            2010
@@ -674,8 +681,8 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
  * A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to
  * DC_STATE_OUT_FAILED, see dc_msg_get_state().
  *
- * @param data1 chat_id
- * @param data2 msg_id
+ * @param data1 (int) chat_id
+ * @param data2 (int) msg_id
  * @return 0
  */
 #define DC_EVENT_MSG_FAILED               2012
@@ -685,8 +692,8 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
  * A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
  * DC_STATE_OUT_MDN_RCVD, see dc_msg_get_state().
  *
- * @param data1 chat_id
- * @param data2 msg_id
+ * @param data1 (int) chat_id
+ * @param data2 (int) msg_id
  * @return 0
  */
 #define DC_EVENT_MSG_READ                 2015
@@ -698,7 +705,7 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
  * See dc_set_chat_name(), dc_set_chat_profile_image(), dc_add_contact_to_chat()
  * and dc_remove_contact_from_chat().
  *
- * @param data1 chat_id
+ * @param data1 (int) chat_id
  * @param data2 0
  * @return 0
  */
@@ -708,7 +715,7 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
 /**
  * Contact(s) created, renamed, blocked or deleted.
  *
- * @param data1 If not 0, this is the contact_id of an added contact that should be selected.
+ * @param data1 (int) If not 0, this is the contact_id of an added contact that should be selected.
  * @param data2 0
  * @return 0
  */
@@ -718,7 +725,7 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
 /**
  * Inform about the configuration progress started by dc_configure().
  *
- * @param data1 0=error, 1-999=progress in permille, 1000=success and done
+ * @param data1 (int) 0=error, 1-999=progress in permille, 1000=success and done
  * @param data2 0
  * @return 0
  */
@@ -728,7 +735,7 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
 /**
  * Inform about the import/export progress started by dc_imex().
  *
- * @param data1 0=error, 1-999=progress in permille, 1000=success and done
+ * @param data1 (int) 0=error, 1-999=progress in permille, 1000=success and done
  * @param data2 0
  * @return 0
  */
@@ -742,7 +749,7 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
  * A typical purpose for a handler of this event may be to make the file public to some system
  * services.
  *
- * @param data1 File name
+ * @param data1 (const char*) File name
  * @param data2 0
  * @return 0
  */
@@ -756,8 +763,8 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
  * These events are typically sent after a joiner has scanned the QR code
  * generated by dc_get_securejoin_qr().
  *
- * @param data1 ID of the contact that wants to join.
- * @param data2 Progress as:
+ * @param data1 (int) ID of the contact that wants to join.
+ * @param data2 (int) Progress as:
  *     300=vg-/vc-request received, typically shown as "bob@addr joins".
  *     600=vg-/vc-request-with-auth received, vg-member-added/vc-contact-confirm sent, typically shown as "bob@addr verified".
  *     800=vg-member-added-received received, shown as "bob@addr securely joined GROUP", only sent for the verified-group-protocol.
@@ -774,8 +781,8 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
  * The events are typically sent while dc_join_securejoin(), which
  * may take some time, is executed.
  *
- * @param data1 ID of the inviting contact.
- * @param data2 Progress as:
+ * @param data1 (int) ID of the inviting contact.
+ * @param data2 (int) Progress as:
  *     400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
  *     (Bob has verified alice and waits until Alice does the same for him)
  * @return 0
@@ -800,9 +807,9 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
 /**
  * Requeste a localized string from the frontend.
  *
- * @param data1 ID of the string to request, one of the DC_STR_* constants as defined in stock.h
+ * @param data1 (int) ID of the string to request, one of the DC_STR_* constants as defined in stock.h
  * @param data2 0
- * @return Null-terminated UTF-8 string.  CAVE: The string will be free()'d by the core, so make
+ * @return (const char*) Null-terminated UTF-8 string.  CAVE: The string will be free()'d by the core, so make
  *     sure it is allocated using malloc() or a compatible function.
  *     If you cannot provide the requested string, just return 0; the core will use a default string then.
  */
@@ -814,10 +821,10 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
  * Quantitiy strings may have eg. different plural forms and usually also include the count itself to the string.
  * Typical strings in this form are "1 Message" vs. "2 Messages".
  *
- * @param data1 ID of the string to request, one of the DC_STR_* constants as defined in stock.h
- * @param data2 The count. The frontend may return different strings on this value and normally also includes
+ * @param data1 (int) ID of the string to request, one of the DC_STR_* constants as defined in stock.h
+ * @param data2 (int) The count. The frontend may return different strings on this value and normally also includes
  *     the value itself to the string.
- * @return Null-terminated UTF-8 string.  CAVE: The string will be free()'d by the core, so make
+ * @return (const char*) Null-terminated UTF-8 string.  CAVE: The string will be free()'d by the core, so make
  *     sure it is allocated using malloc() or a compatible function.
  *     If you cannot provide the requested string, just return 0; the core will use a default string then.
  */
@@ -827,9 +834,9 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
 /**
  * Request a HTTP-file or HTTPS-file from the frontend.
  *
- * @param data1 Null-terminated UTF-8 string containing the URL. The string starts with https:// or http://. Must not be free()'d or modified by the frontend.
+ * @param data1 (const char*) Null-terminated UTF-8 string containing the URL. The string starts with https:// or http://. Must not be free()'d or modified by the frontend.
  * @param data2 0
- * @return The content of the requested file as a null-terminated UTF-8 string;
+ * @return (const char*) The content of the requested file as a null-terminated UTF-8 string;
  *     Response headers, encodings etc. must be stripped, only the raw file, which may be binary, should be returned.
  *     CAVE: The string will be free()'d by the core,
  *     so make sure it is allocated using malloc() or a compatible function.
@@ -842,6 +849,11 @@ time_t          dc_lot_get_timestamp     (const dc_lot_t*);
  */
 
 
+#define DC_EVENT_DATA2_IS_STRING(e)  ((e)==DC_EVENT_INFO) || (e)==DC_EVENT_WARNING || (e)==DC_EVENT_ERROR))
+#define DC_EVENT_RETURNS_INT         ((e)==DC_EVENT_IS_OFFLINE)
+#define DC_EVENT_RETURNS_STRING(e)   ((e)==DC_EVENT_INFO) || (e)==DC_EVENT_GET_QUANTITY_STRING || (e)==DC_EVENT_GET_STRING))
+
+
 /**
  * @defgroup DC_ERROR DC_ERROR
  *