From b024c17f66e76645c7f73af8910c52dc3b8c847b Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 11 Jan 2021 17:42:34 +0100 Subject: [PATCH 1/3] update deltachat-core-rust submodule --- jni/deltachat-core-rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust index 7fa794cd7..e2688f635 160000 --- a/jni/deltachat-core-rust +++ b/jni/deltachat-core-rust @@ -1 +1 @@ -Subproject commit 7fa794cd72e68b2c0233d840243313a44b7f1503 +Subproject commit e2688f63556edb68f4585892f67e1bbe6eb7607f From 5a2d742bdfed227636f4f9f4501ea1a642ce73b8 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 11 Jan 2021 17:44:53 +0100 Subject: [PATCH 2/3] update translations --- res/values-tr/strings.xml | 4 ++-- res/values-uk/strings.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 217d823af..6ce535437 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -413,8 +413,8 @@ İlet… - %1$d dosya seçilen sohbete gönderilsin mi?\n\nDosyalar, değiştirilmeden özgün boyutlarında gönderilir; örn. görseller ve videolar yeniden kodlanmaz. - %1$d dosya %2$d sohbete gönderilsin mi?\n\nDosyalar, değiştirilmeden özgün boyutlarında gönderilir; örn. görseller ve videolar yeniden kodlanmaz. + %1$d dosya seçilen sohbete gönderilsin mi?\n\nDosyalar, değiştirilmeden özgün boyutlarında gönderilir; ör. görseller ve videolar yeniden kodlanmaz. + %1$d dosya %2$d sohbete gönderilsin mi?\n\nDosyalar, değiştirilmeden özgün boyutlarında gönderilir; ör. görseller ve videolar yeniden kodlanmaz. Bu metin %1$d sohbete gönderilsin mi?\n\n\"%2$s\" Eksik izinlerden dolayı paylaşımdan vazgeçildi. diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 18657f0f4..8068dc1fd 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -11,7 +11,7 @@ Вимкн. За замовчуванням За замовчуванням (%1$s) - За замовчуванням (так сам, як вказано вище) + За замовчуванням (так само, як вказано вище) Персональне налаштування Не задано Автоматично From 5371f312acdcf305d5725f7077805604b5153e32 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Thu, 14 Jan 2021 14:00:30 +0100 Subject: [PATCH 3/3] remove unused isIoRunning() api the api is about to be removed from core as well, see https://github.com/deltachat/deltachat-core-rust/pull/2139 --- jni/dc_wrapper.c | 6 ------ src/com/b44t/messenger/DcContext.java | 1 - 2 files changed, 7 deletions(-) diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c index ec2268072..e2753cdca 100644 --- a/jni/dc_wrapper.c +++ b/jni/dc_wrapper.c @@ -256,12 +256,6 @@ JNIEXPORT void Java_com_b44t_messenger_DcContext_stopIo(JNIEnv *env, jobject obj } -JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_isIoRunning(JNIEnv *env, jobject obj) -{ - return dc_is_io_running(get_dc_context(env, obj)) != 0; -} - - JNIEXPORT void Java_com_b44t_messenger_DcContext_maybeNetwork(JNIEnv *env, jobject obj) { dc_maybe_network(get_dc_context(env, obj)); diff --git a/src/com/b44t/messenger/DcContext.java b/src/com/b44t/messenger/DcContext.java index dc687cea8..7a6998f58 100644 --- a/src/com/b44t/messenger/DcContext.java +++ b/src/com/b44t/messenger/DcContext.java @@ -101,7 +101,6 @@ public class DcContext { public native void startIo (); public native void stopIo (); - public native boolean isIoRunning (); public native void maybeNetwork (); public native void setConfig (String key, String value);