Merge branch 'master' into deltalab

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

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

res/values-it/strings.xml

@@ -332,6 +332,8 @@
     <string name="login_smtp_port">Porta SMTP</string>
     <string name="login_smtp_security">Sicurezza SMTP</string>
     <string name="login_auth_method">Metodo di autorizzazione</string>
+    <!-- Translators: %1$s will be replaced by an email address -->
+    <string name="login_oauth2_checking_addr">Verifica %1$s</string>
     <string name="login_info_oauth2_title">Usare il setup semplificato?</string>
     <string name="login_info_oauth2_text">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!</string>
     <string name="login_certificate_checks">Controlli certificato</string>

res/values-nl/strings.xml

@@ -332,6 +332,8 @@
     <string name="login_smtp_port">SMTP-poort</string>
     <string name="login_smtp_security">SMTP-beveiliging</string>
     <string name="login_auth_method">Autorisatiemethode</string>
+    <!-- Translators: %1$s will be replaced by an email address -->
+    <string name="login_oauth2_checking_addr">Bezig met controleren van %1$s</string>
     <string name="login_info_oauth2_title">Wil je doorgaan met vereenvoudigd instellen?</string>
     <string name="login_info_oauth2_text">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!</string>
     <string name="login_certificate_checks">Certificaatcontrole</string>

res/values-sq/strings.xml

@@ -332,6 +332,8 @@
     <string name="login_smtp_port">Portë SMTP</string>
     <string name="login_smtp_security">Siguri SMTP</string>
     <string name="login_auth_method">Metodë autorizimi</string>
+    <!-- Translators: %1$s will be replaced by an email address -->
+    <string name="login_oauth2_checking_addr">Po kontrollohet %1$s</string>
     <string name="login_info_oauth2_title">Të vazhdohet me rregullimin e thjeshtuar?</string>
     <string name="login_info_oauth2_text">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!</string>
     <string name="login_certificate_checks">Kontrolle dëshmish</string>

res/values-sv/strings.xml

@@ -332,6 +332,8 @@
     <string name="login_smtp_port">SMTP port</string>
     <string name="login_smtp_security">SMTP säkerhet</string>
     <string name="login_auth_method">Auktoriseringsmetod</string>
+    <!-- Translators: %1$s will be replaced by an email address -->
+    <string name="login_oauth2_checking_addr">Kontrollerar %1$s</string>
     <string name="login_info_oauth2_title">Fortsätta med förenklad installation?</string>
     <string name="login_info_oauth2_text">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.</string>
     <string name="login_certificate_checks">Certifikatkontroller</string>

res/values-tr/strings.xml

@@ -332,6 +332,8 @@
     <string name="login_smtp_port">SMTP bağlantı noktası</string>
     <string name="login_smtp_security">SMTP güvenliği</string>
     <string name="login_auth_method">Yetkilendirme yöntemi</string>
+    <!-- Translators: %1$s will be replaced by an email address -->
+    <string name="login_oauth2_checking_addr">%1$s denetleniyor</string>
     <string name="login_info_oauth2_title">Basitleştirilen ayarlamayla sürdürülsün mü?</string>
     <string name="login_info_oauth2_text">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.</string>
     <string name="login_certificate_checks">Sertifika denetimleri</string>

res/values-zh-rCN/strings.xml

@@ -321,6 +321,8 @@
     <string name="login_smtp_port">SMTP 端口</string>
     <string name="login_smtp_security">SMTP 安全类型</string>
     <string name="login_auth_method">认证方法</string>
+    <!-- Translators: %1$s will be replaced by an email address -->
+    <string name="login_oauth2_checking_addr">检查 %1$s 中</string>
     <string name="login_info_oauth2_title">使用简化设置继续？</string>
     <string name="login_info_oauth2_text">输入的电子邮件地址支持简化设置（OAuth 2.0）。\n\n在下一步中，请允许 Delta Chat 充当您的“通过电子邮件聊天”应用程序。\n\n不存在 Delta Chat 服务器，您的数据保留于您的设备！</string>
     <string name="login_certificate_checks">证书检查</string>

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();