msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Check if answers defined

Browse Source
pull/146/head
M66B 7 years ago
parent 8ef7c2346b
commit 7ea9379e59
2 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File

79
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -63,6 +63,7 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.snackbar.Snackbar;
import org.xml.sax.XMLReader; import org.xml.sax.XMLReader;
@ -90,6 +91,8 @@ import androidx.annotation.Nullable;
import androidx.appcompat.widget.PopupMenu; import androidx.appcompat.widget.PopupMenu;
import androidx.constraintlayout.widget.Group; import androidx.constraintlayout.widget.Group;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.Observer; import androidx.lifecycle.Observer;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@ -103,6 +106,7 @@ import androidx.recyclerview.widget.RecyclerView;
public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMessage.ViewHolder> { public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMessage.ViewHolder> {
private Context context; private Context context;
private LifecycleOwner owner; private LifecycleOwner owner;
private FragmentManager fragmentManager;
private ViewType viewType; private ViewType viewType;
private IProperties properties; private IProperties properties;
@ -906,40 +910,56 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
db.answer().liveAnswers().observe(owner, new Observer<List<EntityAnswer>>() { db.answer().liveAnswers().observe(owner, new Observer<List<EntityAnswer>>() {
@Override @Override
public void onChanged(List<EntityAnswer> answers) { public void onChanged(List<EntityAnswer> answers) {
final Collator collator = Collator.getInstance(Locale.getDefault()); if (answers == null || answers.size() == 0) {
collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc Snackbar snackbar = Snackbar.make(
itemView,
context.getString(R.string.title_no_answers),
Snackbar.LENGTH_LONG);
snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override
public void onClick(View v) {
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
fragmentTransaction.replace(R.id.content_frame, new FragmentAnswers()).addToBackStack("answers");
fragmentTransaction.commit();
}
});
snackbar.show();
} else {
final Collator collator = Collator.getInstance(Locale.getDefault());
collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
Collections.sort(answers, new Comparator<EntityAnswer>() { Collections.sort(answers, new Comparator<EntityAnswer>() {
@Override @Override
public int compare(EntityAnswer a1, EntityAnswer a2) { public int compare(EntityAnswer a1, EntityAnswer a2) {
return collator.compare(a1.name, a2.name); return collator.compare(a1.name, a2.name);
} }
}); });
View anchor = bnvActions.findViewById(R.id.action_more); View anchor = bnvActions.findViewById(R.id.action_more);
PopupMenu popupMenu = new PopupMenu(context, anchor); PopupMenu popupMenu = new PopupMenu(context, anchor);
int order = 0; int order = 0;
for (EntityAnswer answer : answers) for (EntityAnswer answer : answers)
popupMenu.getMenu().add(Menu.NONE, answer.id.intValue(), order++, answer.name); popupMenu.getMenu().add(Menu.NONE, answer.id.intValue(), order++, answer.name);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override @Override
public boolean onMenuItemClick(MenuItem target) { public boolean onMenuItemClick(MenuItem target) {
if (Helper.isPro(context)) if (Helper.isPro(context))
context.startActivity(new Intent(context, ActivityCompose.class) context.startActivity(new Intent(context, ActivityCompose.class)
.putExtra("action", "reply") .putExtra("action", "reply")
.putExtra("reference", data.message.id) .putExtra("reference", data.message.id)
.putExtra("answer", (long) target.getItemId())); .putExtra("answer", (long) target.getItemId()));
else { else {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context); LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(new Intent(ActivityView.ACTION_SHOW_PRO)); lbm.sendBroadcast(new Intent(ActivityView.ACTION_SHOW_PRO));
}
return true;
} }
return true; });
}
});
popupMenu.show(); popupMenu.show();
}
db.answer().liveAnswers().removeObservers(owner); db.answer().liveAnswers().removeObservers(owner);
} }
@ -1345,10 +1365,11 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
} }
} }
AdapterMessage(Context context, LifecycleOwner owner, ViewType viewType, IProperties properties) { AdapterMessage(Context context, LifecycleOwner owner, FragmentManager fragmentManager, ViewType viewType, IProperties properties) {
super(DIFF_CALLBACK); super(DIFF_CALLBACK);
this.context = context; this.context = context;
this.owner = owner; this.owner = owner;
this.fragmentManager = fragmentManager;
this.viewType = viewType; this.viewType = viewType;
this.properties = properties; this.properties = properties;

2
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -190,7 +190,7 @@ public class FragmentMessages extends FragmentEx {
LinearLayoutManager llm = new LinearLayoutManager(getContext()); LinearLayoutManager llm = new LinearLayoutManager(getContext());
rvMessage.setLayoutManager(llm); rvMessage.setLayoutManager(llm);
adapter = new AdapterMessage(getContext(), getViewLifecycleOwner(), viewType, new AdapterMessage.IProperties() { adapter = new AdapterMessage(getContext(), getViewLifecycleOwner(), getFragmentManager(), viewType, new AdapterMessage.IProperties() {
@Override @Override
public void setExpanded(long id, boolean expand) { public void setExpanded(long id, boolean expand) {
if (expand) { if (expand) {

Write Preview
Loading…
Cancel
Save