1.310 release

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "eu.faircode.email"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 309
-        versionName "1.309"
+        versionCode 310
+        versionName "1.310"
         archivesBaseName = "FairEmail-v$versionName"
 
         javaCompileOptions {

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

@@ -510,7 +510,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     protected void onExecuted(Bundle args, ContactInfo info) {
                         long id = args.getLong("id");
                         TupleMessageEx amessage = getMessage();
-                        if (amessage == null || !amessage.equals(id))
+                        if (amessage == null || !amessage.id.equals(id))
                             return;
 
                         showContactInfo(info, message);

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

@@ -3221,7 +3221,7 @@ public class ServiceSynchronize extends LifecycleService {
             yield();
         }
 
-        void yield() {
+        private void yield() {
             try {
                 // Give interrupted thread some time to acquire wake lock
                 Thread.sleep(YIELD_DURATION);

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

@@ -15,6 +15,9 @@ public class SwipeListener implements View.OnTouchListener {
 
             @Override
             public boolean onFling(MotionEvent me1, MotionEvent me2, float vx, float vy) {
+                if (me1 == null || me2 == null)
+                    return false;
+
                 boolean consumed = false;
                 float dx = me2.getX() - me1.getX();
                 float dy = me2.getY() - me1.getY();

app/src/main/res/values-de-rDE/strings.xml

@@ -383,6 +383,7 @@
     <string name="title_legend_browsed">Gesehen oder gesucht</string>
     <string name="title_legend_answered">Beantwortet</string>
     <string name="title_legend_attachment">Anhang</string>
+    <string name="title_legend_flagged">Markierte</string>
     <string name="title_legend_contacts">Kontakte</string>
     <string name="title_legend_view">Inhalt anzeigen</string>
     <string name="title_legend_download">Inhalt herunterladen</string>
@@ -393,6 +394,7 @@
     <string name="title_legend_download_on">Nachrichteninhalt automatisch herunterladen</string>
     <string name="title_legend_synchronize_on">Synchronisierung an</string>
     <string name="title_legend_synchronize_off">Synchronisierung aus</string>
+    <string name="title_legend_primary">Hauptkonto</string>
     <string name="title_legend_disconnected">Keine Verbindung</string>
     <string name="title_legend_connecting">Verbinde</string>
     <string name="title_legend_connected">Verbunden</string>

app/src/main/res/values-es-rES/strings.xml

@@ -359,6 +359,7 @@
     <string name="title_rule_regex">Expresión regular</string>
     <string name="title_rule_and">Y</string>
     <string name="title_rule_action">Acción</string>
+    <string name="title_rule_action_remark">Esta acción se aplicará a nuevos mensajes que lleguen a la carpeta %1$s</string>
     <string name="title_rule_folder">Carpeta</string>
     <string name="title_rule_identity">Identidad</string>
     <string name="title_rule_answer">Plantilla de respuesta</string>
@@ -382,6 +383,7 @@
     <string name="title_legend_browsed">Explorados o buscados</string>
     <string name="title_legend_answered">Respondido</string>
     <string name="title_legend_attachment">Adjunto</string>
+    <string name="title_legend_flagged">Destacado</string>
     <string name="title_legend_contacts">Contactos</string>
     <string name="title_legend_view">Ver contenido</string>
     <string name="title_legend_download">Descargar contenido</string>
@@ -392,6 +394,7 @@
     <string name="title_legend_download_on">Descargar el contenido de mensajes automáticamente</string>
     <string name="title_legend_synchronize_on">Sincronización activada</string>
     <string name="title_legend_synchronize_off">Sincronización desactivada</string>
+    <string name="title_legend_primary">Primaria</string>
     <string name="title_legend_disconnected">Desconectado</string>
     <string name="title_legend_connecting">Conectando</string>
     <string name="title_legend_connected">Conectado</string>

app/src/main/res/values-ru-rRU/strings.xml

@@ -375,6 +375,7 @@
     <string name="title_rule_regex">Регулярное выражение</string>
     <string name="title_rule_and">И</string>
     <string name="title_rule_action">Действие</string>
+    <string name="title_rule_action_remark">Это действие будет применяться к новым сообщениям в папке %1$s</string>
     <string name="title_rule_folder">Папка</string>
     <string name="title_rule_identity">Идентификатор</string>
     <string name="title_rule_answer">Шаблон ответа</string>