0.73 release

This reverts commit 2b807d5253.

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "eu.faircode.email"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 72
-        versionName "0.72"
+        versionCode 73
+        versionName "0.73"
         archivesBaseName = "FairEmail-v$versionName"
 
         javaCompileOptions {

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

@@ -194,6 +194,8 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             } else {
                 tvCount.setText(Integer.toString(message.count));
                 ivThread.setVisibility(View.VISIBLE);
+                tvCount.setAlpha(message.threaded ? 1.0f : 0.5f);
+                ivThread.setAlpha(message.threaded ? 1.0f : 0.5f);
             }
 
             if (debug) {
@@ -263,7 +265,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             final TupleMessageEx message = getItem(pos);
 
             PopupMenu popupMenu = new PopupMenu(context, itemView);
-            if (!EntityFolder.OUTBOX.equals(message.folderType)) {
+            if (!message.threaded && !EntityFolder.OUTBOX.equals(message.folderType)) {
                 popupMenu.getMenu().add(Menu.NONE, action_flag, 1, message.ui_flagged ? R.string.title_unflag : R.string.title_flag);
                 popupMenu.getMenu().add(Menu.NONE, action_seen, 2, message.ui_seen ? R.string.title_unseen : R.string.title_seen);
             }

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

@@ -37,7 +37,7 @@ public interface DaoMessage {
 
     @Query("SELECT message.*" +
             ", account.name AS accountName, account.color AS accountColor" +
-            ", folder.name as folderName, folder.display as folderDisplay, folder.type as folderType" +
+            ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
             ", SUM(CASE WHEN folder.type = '" + EntityFolder.ARCHIVE + "' THEN 0 ELSE 1 END) > 1 AS threaded" +
             ", COUNT(message.id) AS count" +
             ", SUM(CASE WHEN message.ui_seen" +
@@ -49,7 +49,7 @@ public interface DaoMessage {
             "    AND NOT folder.type = '" + EntityFolder.OUTBOX + "'" +
             "    AND NOT folder.type = '" + EntityFolder.DRAFTS + "' THEN 0 ELSE 1 END) AS unflagged" +
             ", (SELECT COUNT(a.id) FROM attachment a WHERE a.message = message.id) AS attachments" +
-            ", MAX(CASE WHEN folder.unified THEN message.id ELSE 0 END) as dummy" +
+            ", MAX(CASE WHEN folder.unified THEN message.id ELSE 0 END) AS dummy" +
             " FROM message" +
             " JOIN account ON account.id = message.account" +
             " JOIN folder ON folder.id = message.folder" +
@@ -66,7 +66,7 @@ public interface DaoMessage {
 
     @Query("SELECT message.*" +
             ", account.name AS accountName, account.color AS accountColor" +
-            ", folder.name as folderName, folder.display as folderDisplay, folder.type as folderType" +
+            ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
             ", SUM(CASE WHEN folder.type = '" + EntityFolder.ARCHIVE + "' THEN 0 ELSE 1 END) > 1 AS threaded" +
             ", COUNT(message.id) AS count" +
             ", SUM(CASE WHEN message.ui_seen" +
@@ -78,7 +78,7 @@ public interface DaoMessage {
             "    AND NOT (folder.id <> :folder AND folder.type = '" + EntityFolder.OUTBOX + "')" +
             "    AND NOT (folder.id <> :folder AND folder.type = '" + EntityFolder.DRAFTS + "') THEN 0 ELSE 1 END) AS unflagged" +
             ", (SELECT COUNT(a.id) FROM attachment a WHERE a.message = message.id) AS attachments" +
-            ", MAX(CASE WHEN folder.id = :folder THEN message.id ELSE 0 END) as dummy" +
+            ", MAX(CASE WHEN folder.id = :folder THEN message.id ELSE 0 END) AS dummy" +
             " FROM message" +
             " JOIN account ON account.id = message.account" +
             " JOIN folder ON folder.id = message.folder" +
@@ -97,11 +97,11 @@ public interface DaoMessage {
 
     @Query("SELECT message.*" +
             ", account.name AS accountName, account.color AS accountColor" +
-            ", folder.name as folderName, folder.display as folderDisplay, folder.type as folderType" +
+            ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
             ", 0 AS threaded" +
-            ", 1 AS count" +
-            ", CASE WHEN message.ui_seen THEN 0 ELSE 1 END as unseen" +
-            ", CASE WHEN  message.ui_flagged THEN 0 ELSE 1 END as unflagged" +
+            ", (SELECT COUNT(m1.id) FROM message m1 WHERE m1.account = message.account AND m1.thread = message.thread AND NOT m1.ui_hide) AS count" +
+            ", CASE WHEN message.ui_seen THEN 0 ELSE 1 END AS unseen" +
+            ", CASE WHEN message.ui_flagged THEN 0 ELSE 1 END AS unflagged" +
             ", (SELECT COUNT(a.id) FROM attachment a WHERE a.message = message.id) AS attachments" +
             " FROM message" +
             " JOIN account ON account.id = message.account" +
@@ -159,14 +159,14 @@ public interface DaoMessage {
 
     @Query("SELECT message.*" +
             ", account.name AS accountName, account.color AS accountColor" +
-            ", folder.name as folderName, folder.display as folderDisplay, folder.type as folderType" +
+            ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
             ", 0 AS threaded" +
             ", (SELECT COUNT(m1.id) FROM message m1 WHERE m1.account = message.account AND m1.thread = message.thread AND NOT m1.ui_hide) AS count" +
-            ", (SELECT COUNT(m2.id) FROM message m2 WHERE m2.account = message.account AND m2.thread = message.thread AND NOT m2.ui_hide AND NOT m2.ui_seen) AS unseen" +
-            ", (SELECT COUNT(m3.id) FROM message m3 WHERE m3.account = message.account AND m3.thread = message.thread AND NOT m3.ui_hide AND NOT m3.ui_flagged) AS unflagged" +
+            ", CASE WHEN message.ui_seen THEN 0 ELSE 1 END AS unseen" +
+            ", CASE WHEN message.ui_flagged THEN 0 ELSE 1 END AS unflagged" +
             ", (SELECT COUNT(a.id) FROM attachment a WHERE a.message = message.id) AS attachments" +
             " FROM message" +
-            " LEFT JOIN account ON account.id = message.account" +
+            " JOIN account ON account.id = message.account" +
             " JOIN folder ON folder.id = message.folder" +
             " WHERE message.id = :id")
     LiveData<TupleMessageEx> liveMessage(long id);

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

@@ -181,7 +181,7 @@ public class FragmentMessages extends FragmentEx {
                     return 0;
 
                 TupleMessageEx message = ((AdapterMessage) rvMessage.getAdapter()).getCurrentList().get(pos);
-                if (EntityFolder.OUTBOX.equals(message.folderType))
+                if (message.threaded || EntityFolder.OUTBOX.equals(message.folderType))
                     return 0;
 
                 return makeMovementFlags(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT);

app/src/main/res/values-fr/strings.xml

@@ -65,7 +65,7 @@
   <string name="title_advanced">Options avancées</string>
   <string name="title_advanced_avatars">Afficher les photos des contacts</string>
   <string name="title_advanced_light">Utiliser le voyant de notification</string>
-  <string name="title_advanced_browse">Lire directement les msges sur le serveur</string>
+  <string name="title_advanced_browse">Lire directement les messages sur le serveur</string>
   <string name="title_advanced_debug">Débogage</string>
   <string name="title_select">Sélectionner &#8230;</string>
   <string name="title_identity_name">Votre nom</string>