diff --git a/CHANGELOG.md b/CHANGELOG.md
index e758a8a9b..ff5043b92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,18 +1,13 @@
# Delta Chat Android Changelog
-## v1.10.1
-2020-06
-
-* bug fixes
-
-
-## v1.10.0
+## v1.10.2
2020-06
* with this version, Delta Chat enters a whole new level of speed,
messages will be downloaded and sent way faster -
technically, this was introduced by using so called "async-processing"
* avatars can be enlarged
+* add simplified login for gsuite email addresses
* new emoji selector - including new and diversified emojis
* you can now "blur" areas in an image before sending
* new default wallpaper
diff --git a/build.gradle b/build.gradle
index 8e13b38ae..bfcefb4d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -89,8 +89,8 @@ android {
}
defaultConfig {
- versionCode 584
- versionName "1.10.1"
+ versionCode 585
+ versionName "1.10.2"
applicationId "com.b44t.messenger"
multiDexEnabled true
diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust
index 3e47564b2..75d20b899 160000
--- a/jni/deltachat-core-rust
+++ b/jni/deltachat-core-rust
@@ -1 +1 @@
-Subproject commit 3e47564b2fe01d612b1a0b4108aeba73ed70af26
+Subproject commit 75d20b899a4bb626d08737193704d5dc3bce159b
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b13183ae8..86ca19163 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -332,6 +332,8 @@
Porta SMTP
Sicurezza SMTP
Metodo di autorizzazione
+
+ Verifica %1$s
Usare il setup semplificato?
L\'indirizzo email inserito supporta l\'autenticazione semplificata (OAuth2.0).\n\nContinuando, puoi autorizzare Delta Chat ad operare come app di messaggistica via e-mail.\n\nNon esistono server di Delta Chat, i tuoi dati restano nel tuo dispositivo!
Controlli certificato
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index df798896d..ecef2d068 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -332,6 +332,8 @@
SMTP-poort
SMTP-beveiliging
Autorisatiemethode
+
+ Bezig met controleren van %1$s
Wil je doorgaan met vereenvoudigd instellen?
Het ingevoerde e-mailadres ondersteunt vereenvoudigd instellen (OAuth2).\n\nTijdens de volgende stap moet je Delta Chat toestaan te fungeren als je e-mailapp.\n\nDelta Chat heeft geen eigen servers; jóuw gegevens blijven op jóuw apparaat!
Certificaatcontrole
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index b11b2dbb2..b1389a81b 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -332,6 +332,8 @@
Portë SMTP
Siguri SMTP
Metodë autorizimi
+
+ Po kontrollohet %1$s
Të vazhdohet me rregullimin e thjeshtuar?
Adresa email e dhënë mbulon një ujdisje të thjeshtuar (OAuth2).\n\nNë hapin pasues, ju lutemi, lejojeni Delta Chat-in të veprojë si aplikacioni juaj për Fjalosje Përmes Email-i.\n\nS\’ka shërbyes Delta Chat, të dhënat tuaja rrinë në pajisjen tuaj!
Kontrolle dëshmish
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index bbd4a0b7c..8b33aba91 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -332,6 +332,8 @@
SMTP port
SMTP säkerhet
Auktoriseringsmetod
+
+ Kontrollerar %1$s
Fortsätta med förenklad installation?
Den angivna e-postadressen stödjer förenklad inställning (OAuth 2.0).\n\nLåt Delta Chat agera som ditt chatt-över-epost-program, i nästa steg.\n\nDet finns ingen Delta Chat-server, din data stannar på din enhet.
Certifikatkontroller
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a2fa21c49..2085a65d4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -332,6 +332,8 @@
SMTP bağlantı noktası
SMTP güvenliği
Yetkilendirme yöntemi
+
+ %1$s denetleniyor
Basitleştirilen ayarlamayla sürdürülsün mü?
Girilen e-posta adresi basitleştirilen bir ayarlamayı (OAuth 2.0) destekliyor.\n\nSonraki adımda, lütfen Delta Chat\'in E-posta ile Sohbet uygulamanız olarak davranmasına izin verin.\n\nDelta Chat sunucuları yoktur; verileriniz aygıtınızda kalır.
Sertifika denetimleri
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index edb610a6a..5f68f6694 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -321,6 +321,8 @@
SMTP 端口
SMTP 安全类型
认证方法
+
+ 检查 %1$s 中
使用简化设置继续？
输入的电子邮件地址支持简化设置（OAuth 2.0）。\n\n在下一步中，请允许 Delta Chat 充当您的“通过电子邮件聊天”应用程序。\n\n不存在 Delta Chat 服务器，您的数据保留于您的设备！
证书检查
diff --git a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
index 14bf3fe8c..7e32d651f 100644
--- a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
@@ -101,15 +101,19 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
private boolean handleImapCheck(Preference preference, Object newValue, String dc_config_name) {
final boolean newEnabled = (Boolean) newValue;
if(newEnabled) {
+ dcContext.stopIo();
dcContext.setConfigInt(dc_config_name, 1);
+ dcContext.maybeStartIo();
return true;
}
else {
new AlertDialog.Builder(getContext())
.setMessage(R.string.pref_imap_folder_warn_disable_defaults)
.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
+ dcContext.stopIo();
dcContext.setConfigInt(dc_config_name, 0);
((CheckBoxPreference)preference).setChecked(false);
+ dcContext.maybeStartIo();
})
.setNegativeButton(R.string.cancel, null)
.show();