From cb0b5ef7ffbf7395c98d80bffc7802d7c0cea00c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 21 Oct 2020 21:09:23 +0200
Subject: [PATCH] Revert "Show number unread inbox for accounts"

This reverts commit d21f9e6edb4cb0d14f59af0d053647fc821b1bf2.
---
 .../java/eu/faircode/email/AdapterAccount.java   | 16 ++--------------
 .../main/java/eu/faircode/email/DaoAccount.java  |  7 -------
 .../java/eu/faircode/email/TupleAccountEx.java   |  2 --
 app/src/main/res/layout/item_account.xml         | 14 +-------------
 4 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index 74061c8467..221428a43c 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -88,7 +88,6 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
         private ImageView ivNotify;
         private TextView tvName;
         private ImageView ivSync;
-        private TextView tvInbox;
         private ImageButton ibInbox;
         private TextView tvUser;
         private ImageView ivState;
@@ -111,7 +110,6 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
             view = itemView.findViewById(R.id.clItem);
             vwColor = itemView.findViewById(R.id.vwColor);
             ivSync = itemView.findViewById(R.id.ivSync);
-            tvInbox = itemView.findViewById(R.id.tvInbox);
             ibInbox = itemView.findViewById(R.id.ibInbox);
             ivOAuth = itemView.findViewById(R.id.ivOAuth);
             ivPrimary = itemView.findViewById(R.id.ivPrimary);
@@ -134,7 +132,6 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
         private void wire() {
             view.setOnClickListener(this);
             view.setOnLongClickListener(this);
-            tvInbox.setOnClickListener(this);
             ibInbox.setOnClickListener(this);
             btnHelp.setOnClickListener(this);
         }
@@ -142,7 +139,6 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
         private void unwire() {
             view.setOnClickListener(null);
             view.setOnLongClickListener(null);
-            tvInbox.setOnClickListener(null);
             ibInbox.setOnClickListener(null);
             btnHelp.setOnClickListener(null);
         }
@@ -170,10 +166,6 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
 
                 tvName.setTypeface(account.unseen > 0 ? Typeface.DEFAULT_BOLD : Typeface.DEFAULT);
                 tvName.setTextColor(account.unseen > 0 ? colorUnread : textColorSecondary);
-
-                tvInbox.setText(NF.format(account.inbox));
-                tvInbox.setTypeface(account.inbox > 0 ? Typeface.DEFAULT_BOLD : Typeface.DEFAULT);
-                tvInbox.setTextColor(account.inbox > 0 ? colorUnread : textColorSecondary);
             }
 
             tvUser.setText(account.user);
@@ -219,7 +211,6 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
             tvError.setVisibility(account.error == null ? View.GONE : View.VISIBLE);
             btnHelp.setVisibility(account.error == null ? View.GONE : View.VISIBLE);
 
-            tvInbox.setVisibility(settings ? View.GONE : View.VISIBLE);
             ibInbox.setVisibility(settings ? View.GONE : View.VISIBLE);
             grpSettings.setVisibility(settings ? View.VISIBLE : View.GONE);
         }
@@ -237,8 +228,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                 if (account.tbd != null)
                     return;
 
-                int id = view.getId();
-                if (id == R.id.tvInbox || id == R.id.ibInbox) {
+                if (view.getId() == R.id.ibInbox) {
                     Bundle args = new Bundle();
                     args.putLong("id", account.id);
 
@@ -273,9 +263,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                 } else {
                     LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
                     lbm.sendBroadcast(
-                            new Intent(settings
-                                    ? ActivitySetup.ACTION_EDIT_ACCOUNT
-                                    : ActivityView.ACTION_VIEW_FOLDERS)
+                            new Intent(settings ? ActivitySetup.ACTION_EDIT_ACCOUNT : ActivityView.ACTION_VIEW_FOLDERS)
                                     .putExtra("id", account.id)
                                     .putExtra("protocol", account.protocol));
                 }
diff --git a/app/src/main/java/eu/faircode/email/DaoAccount.java b/app/src/main/java/eu/faircode/email/DaoAccount.java
index d3a2a19e4b..f1963c8f0b 100644
--- a/app/src/main/java/eu/faircode/email/DaoAccount.java
+++ b/app/src/main/java/eu/faircode/email/DaoAccount.java
@@ -62,13 +62,6 @@ public interface DaoAccount {
             "    AND folder.type <> '" + EntityFolder.OUTBOX + "'" +
             "    AND NOT ui_seen" +
             "    AND NOT ui_hide) AS unseen" +
-            ", (SELECT COUNT(DISTINCT message.id)" +
-            "    FROM message" +
-            "    JOIN folder ON folder.id = message.folder" +
-            "    WHERE message.account = account.id" +
-            "    AND folder.type = '" + EntityFolder.INBOX + "'" +
-            "    AND NOT ui_seen" +
-            "    AND NOT ui_hide) AS inbox" +
             ", (SELECT COUNT(identity.id)" +
             "    FROM identity" +
             "    WHERE identity.account = account.id" +
diff --git a/app/src/main/java/eu/faircode/email/TupleAccountEx.java b/app/src/main/java/eu/faircode/email/TupleAccountEx.java
index be7d007792..7708fa9747 100644
--- a/app/src/main/java/eu/faircode/email/TupleAccountEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleAccountEx.java
@@ -23,7 +23,6 @@ import java.util.Objects;
 
 public class TupleAccountEx extends EntityAccount {
     public int unseen;
-    public int inbox;
     public int identities; // synchronizing
     public Long drafts;
 
@@ -33,7 +32,6 @@ public class TupleAccountEx extends EntityAccount {
             TupleAccountEx other = (TupleAccountEx) obj;
             return (super.equals(obj) &&
                     this.unseen == other.unseen &&
-                    this.inbox == other.inbox &&
                     this.identities == other.identities &&
                     Objects.equals(this.drafts, other.drafts));
         } else
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index 5d68413303..a9d4f0f6c6 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -100,22 +100,10 @@
                 android:layout_marginEnd="6dp"
                 android:contentDescription="@string/title_legend_synchronize_on"
                 app:layout_constraintBottom_toBottomOf="@+id/tvName"
-                app:layout_constraintEnd_toStartOf="@+id/tvInbox"
+                app:layout_constraintEnd_toStartOf="@+id/ibInbox"
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_sync_24" />
 
-            <eu.faircode.email.FixedTextView
-                android:id="@+id/tvInbox"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="start"
-                android:singleLine="true"
-                android:text="123"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                app:layout_constraintBottom_toBottomOf="@+id/tvName"
-                app:layout_constraintEnd_toStartOf="@id/ibInbox"
-                app:layout_constraintTop_toTopOf="@+id/tvName" />
-
             <ImageButton
                 android:id="@+id/ibInbox"
                 android:layout_width="36dp"