mirror of https://github.com/M66B/FairEmail.git
Hide reply answer if no answers
This commit is contained in:
parent
2b53398926
commit
bc42de39ed
|
@ -141,6 +141,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
private String sort;
|
||||
private boolean filter_duplicates;
|
||||
private boolean suitable;
|
||||
private int answers = -1;
|
||||
private IProperties properties;
|
||||
|
||||
private int colorPrimary;
|
||||
|
@ -3204,6 +3205,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
popupMenu.getMenu().findItem(R.id.menu_reply_to_all).setVisible(recipients > 1);
|
||||
popupMenu.getMenu().findItem(R.id.menu_reply_list).setVisible(data.message.list_post != null);
|
||||
popupMenu.getMenu().findItem(R.id.menu_reply_receipt).setVisible(data.message.receipt_to != null);
|
||||
popupMenu.getMenu().findItem(R.id.menu_reply_answer).setVisible(answers != 0 || !Helper.isPro(context));
|
||||
|
||||
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
|
||||
@Override
|
||||
|
@ -3433,6 +3435,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
}
|
||||
}
|
||||
|
||||
void setAnswerCount(int answers) {
|
||||
this.answers = answers;
|
||||
Log.i("Answer count=" + answers);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemViewType(int position) {
|
||||
return (compact ? R.layout.item_message_compact : R.layout.item_message_normal);
|
||||
|
|
|
@ -41,6 +41,10 @@ public interface DaoAnswer {
|
|||
" ORDER BY name COLLATE NOCASE")
|
||||
LiveData<List<EntityAnswer>> liveAnswers();
|
||||
|
||||
@Query("SELECT COUNT(*) FROM answer" +
|
||||
" WHERE NOT hide")
|
||||
LiveData<Integer> liveAnswerCount();
|
||||
|
||||
@Insert
|
||||
long insertAnswer(EntityAnswer answer);
|
||||
|
||||
|
|
|
@ -1955,6 +1955,13 @@ public class FragmentMessages extends FragmentBase {
|
|||
}
|
||||
});
|
||||
|
||||
db.answer().liveAnswerCount().observe(getViewLifecycleOwner(), new Observer<Integer>() {
|
||||
@Override
|
||||
public void onChanged(Integer count) {
|
||||
adapter.setAnswerCount(count == null ? -1 : count);
|
||||
}
|
||||
});
|
||||
|
||||
// Folder
|
||||
switch (viewType) {
|
||||
case UNIFIED:
|
||||
|
|
Loading…
Reference in New Issue