Fixed displaying folders of all accounts

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

@@ -45,11 +45,9 @@ public interface DaoFolder {
             " FROM folder" +
             " LEFT JOIN account ON account.id = folder.account" +
             " LEFT JOIN message ON message.folder = folder.id AND NOT message.ui_hide" +
+            " WHERE folder.account = :account" +
             " GROUP BY folder.id")
-    LiveData<List<TupleFolderEx>> liveFolders();
+    LiveData<List<TupleFolderEx>> liveFolders(long account);
-
-    @Query("SELECT * FROM folder WHERE account = :account")
-    LiveData<List<EntityFolder>> liveFolders(long account);
 
     @Query("SELECT folder.* FROM folder WHERE folder.id = :id")
     LiveData<EntityFolder> liveFolder(long id);

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

@@ -46,10 +46,12 @@ public class FragmentFolders extends FragmentEx {
     @Override
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        setSubtitle(R.string.title_list_folders);
-
         View view = inflater.inflate(R.layout.fragment_folders, container, false);
 
+        // Get arguments
+        Bundle args = getArguments();
+        long account = (args == null ? -1 : args.getLong("account"));
+
         // Get controls
         rvFolder = view.findViewById(R.id.rvFolder);
         pbWait = view.findViewById(R.id.pbWait);
@@ -76,8 +78,18 @@ public class FragmentFolders extends FragmentEx {
         grpReady.setVisibility(View.GONE);
         pbWait.setVisibility(View.VISIBLE);
 
+        DB db = DB.getInstance(getContext());
+
+        // Observe account
+        db.account().liveAccount(account).observe(this, new Observer<EntityAccount>() {
+            @Override
+            public void onChanged(@Nullable EntityAccount account) {
+                setSubtitle(account.name);
+            }
+        });
+
         // Observe folders
-        DB.getInstance(getContext()).folder().liveFolders().observe(this, new Observer<List<TupleFolderEx>>() {
+        db.folder().liveFolders(account).observe(this, new Observer<List<TupleFolderEx>>() {
             @Override
             public void onChanged(@Nullable List<TupleFolderEx> folders) {
                 adapter.set(folders);

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

@@ -266,9 +266,9 @@ public class FragmentMessage extends FragmentEx {
                     bottom_navigation.setTag(message.folderType);
 
                     db.folder().liveFolders(message.account).removeObservers(FragmentMessage.this);
-                    db.folder().liveFolders(message.account).observe(FragmentMessage.this, new Observer<List<EntityFolder>>() {
+                    db.folder().liveFolders(message.account).observe(FragmentMessage.this, new Observer<List<TupleFolderEx>>() {
                         @Override
-                        public void onChanged(@Nullable final List<EntityFolder> folders) {
+                        public void onChanged(@Nullable final List<TupleFolderEx> folders) {
                             boolean hasTrash = false;
                             boolean hasJunk = false;
                             boolean hasArchive = false;

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

app/src/main/res/values-ar-rBH/strings.xml

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

app/src/main/res/values-ar-rEG/strings.xml

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

app/src/main/res/values-ar-rSA/strings.xml

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

app/src/main/res/values-ar-rYE/strings.xml

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Konten</string>
   <string name="title_list_identities">Identitäten</string>
-  <string name="title_list_folders">Ordner</string>
   <string name="title_edit_account">Konto bearbeiten</string>
   <string name="title_edit_identity">Identität bearbeiten</string>
   <string name="title_edit_folder">Ordner bearbeiten</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -17,7 +17,6 @@
   <string name="title_version">Versão %1$s</string>
   <string name="title_list_accounts">Contas</string>
   <string name="title_list_identities">Identidades</string>
-  <string name="title_list_folders">Pastas</string>
   <string name="title_edit_account">Editar conta</string>
   <string name="title_edit_identity">Editar identidade</string>
   <string name="title_edit_folder">Editar pasta</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Versiunea %1$s</string>
   <string name="title_list_accounts">Conturi</string>
   <string name="title_list_identities">Identități</string>
-  <string name="title_list_folders">Dosare</string>
   <string name="title_edit_account">Editare cont</string>
   <string name="title_edit_identity">Editare identitate</string>
   <string name="title_edit_folder">Editare dosar</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

app/src/main/res/values-sv-rSE/strings.xml

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -17,7 +17,6 @@
   <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
   <string name="title_edit_account">Edit account</string>
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>

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

@@ -23,7 +23,6 @@
 
     <string name="title_list_accounts">Accounts</string>
     <string name="title_list_identities">Identities</string>
-    <string name="title_list_folders">Folders</string>
 
     <string name="title_edit_account">Edit account</string>
     <string name="title_edit_identity">Edit identity</string>