1.417 release

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "eu.faircode.email"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 416
-        versionName "1.416"
+        versionCode 417
+        versionName "1.417"
         archivesBaseName = "FairEmail-v$versionName"
 
         javaCompileOptions {

app/src/main/java/eu/faircode/email/ActivityView.java

@@ -404,8 +404,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
 
         checkFirst();
         checkCrash();
-        if (!Helper.isPlayStoreInstall(this))
-            checkUpdate(false);
 
         pgpService = new OpenPgpServiceConnection(this, "org.sufficientlysecure.keychain");
         pgpService.bindToService();
@@ -582,6 +580,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
 
         if (!pgpService.isBound())
             pgpService.bindToService();
+
+        checkUpdate(false);
     }
 
     @Override
@@ -708,6 +708,9 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
     }
 
     private void checkUpdate(boolean always) {
+        if (Helper.isPlayStoreInstall(this))
+            return;
+
         long now = new Date().getTime();
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         if (!always && !prefs.getBoolean("updates", true))

app/src/main/java/eu/faircode/email/FragmentCompose.java

@@ -1718,16 +1718,17 @@ public class FragmentCompose extends FragmentBase {
                             draft.thread = ref.thread;
 
                             // Prevent replying to self
-                            String from = null;
+                            String to = null;
                             String via = null;
-                            if (ref.from != null && ref.from.length > 0)
-                                from = Helper.canonicalAddress(((InternetAddress) ref.from[0]).getAddress());
+                            Address[] recipient = (ref.reply == null || ref.reply.length == 0 ? ref.from : ref.reply);
+                            if (recipient != null && recipient.length > 0)
+                                to = Helper.canonicalAddress(((InternetAddress) recipient[0]).getAddress());
                             if (ref.identity != null) {
                                 EntityIdentity v = db.identity().getIdentity(ref.identity);
                                 via = Helper.canonicalAddress(v.email);
                             }
 
-                            if (from != null && from.equals(via)) {
+                            if (to != null && to.equals(via)) {
                                 draft.to = ref.to;
                                 draft.from = ref.from;
                             } else {

app/src/main/res/values-zh-rCN/strings.xml

@@ -145,11 +145,13 @@
     <string name="title_advanced_autoresize">自动调整屏幕显示的图像大小</string>
     <string name="title_advanced_sender">允许编辑发件人地址</string>
     <string name="title_advanced_autosend">确认发送邮件</string>
+    <string name="title_advanced_badge">在启动器图标上显示新消息数目</string>
     <string name="title_advanced_notify_preview">通知中显示消息预览</string>
     <string name="title_advanced_search_local">外部搜索</string>
     <string name="title_advanced_light">使用指示灯</string>
     <string name="title_advanced_sound">选择通知提示音</string>
     <string name="title_advanced_english">强制使用英语</string>
+    <string name="title_advanced_paranoid">额外隐私功能</string>
     <string name="title_advanced_updates">检查更新</string>
     <string name="title_advanced_debug">调试模式</string>
     <string name="title_advanced_enabled_hint">全局禁用或启用邮件的接收和发送</string>
@@ -162,6 +164,7 @@
     <string name="title_advanced_autocollapse_hint">App将在您按下“返回”键时关闭多条展开的消息</string>
     <string name="title_advanced_autoclose_hint">在所有邮件存档、发送或丢弃时自动关闭对话线程</string>
     <string name="title_advanced_sender_hint">大多数提供商不允许修改发件人地址</string>
+    <string name="title_advanced_badge_hint">仅在受支持的设备中可用</string>
     <string name="title_advanced_preview_hint">只有当消息文本下载时才可用</string>
     <string name="title_advanced_search_local_hint">不在服务器上的主存档文件夹中搜索</string>
     <string name="title_advanced_english_hint">这将重新启动应用程序</string>