mirror of https://github.com/M66B/FairEmail.git
Refactoring
This commit is contained in:
parent
81dbe10c95
commit
25a17f11a6
|
@ -2898,7 +2898,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
case R.id.menu_reply_receipt:
|
case R.id.menu_reply_receipt:
|
||||||
onMenuReply(data, "receipt");
|
onMenuReply(data, "receipt");
|
||||||
return true;
|
return true;
|
||||||
case R.id.menu_reply_template:
|
case R.id.menu_reply_answer:
|
||||||
onMenuAnswer(data);
|
onMenuAnswer(data);
|
||||||
return true;
|
return true;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -755,7 +755,7 @@ public class FragmentCompose extends FragmentBase {
|
||||||
menu.findItem(R.id.menu_attachment).setVisible(state == State.LOADED && !style);
|
menu.findItem(R.id.menu_attachment).setVisible(state == State.LOADED && !style);
|
||||||
menu.findItem(R.id.menu_clear).setVisible(state == State.LOADED);
|
menu.findItem(R.id.menu_clear).setVisible(state == State.LOADED);
|
||||||
menu.findItem(R.id.menu_contact_group).setVisible(state == State.LOADED);
|
menu.findItem(R.id.menu_contact_group).setVisible(state == State.LOADED);
|
||||||
menu.findItem(R.id.menu_template).setVisible(state == State.LOADED);
|
menu.findItem(R.id.menu_answer).setVisible(state == State.LOADED);
|
||||||
menu.findItem(R.id.menu_encrypt).setVisible(state == State.LOADED);
|
menu.findItem(R.id.menu_encrypt).setVisible(state == State.LOADED);
|
||||||
menu.findItem(R.id.menu_send_after).setVisible(state == State.LOADED);
|
menu.findItem(R.id.menu_send_after).setVisible(state == State.LOADED);
|
||||||
|
|
||||||
|
@ -764,7 +764,7 @@ public class FragmentCompose extends FragmentBase {
|
||||||
menu.findItem(R.id.menu_attachment).setEnabled(!busy);
|
menu.findItem(R.id.menu_attachment).setEnabled(!busy);
|
||||||
menu.findItem(R.id.menu_clear).setEnabled(!busy);
|
menu.findItem(R.id.menu_clear).setEnabled(!busy);
|
||||||
menu.findItem(R.id.menu_contact_group).setEnabled(!busy);
|
menu.findItem(R.id.menu_contact_group).setEnabled(!busy);
|
||||||
menu.findItem(R.id.menu_template).setEnabled(!busy && Helper.isPro(getContext()));
|
menu.findItem(R.id.menu_answer).setEnabled(!busy && Helper.isPro(getContext()));
|
||||||
menu.findItem(R.id.menu_encrypt).setEnabled(!busy);
|
menu.findItem(R.id.menu_encrypt).setEnabled(!busy);
|
||||||
menu.findItem(R.id.menu_send_after).setEnabled(!busy);
|
menu.findItem(R.id.menu_send_after).setEnabled(!busy);
|
||||||
|
|
||||||
|
@ -803,8 +803,8 @@ public class FragmentCompose extends FragmentBase {
|
||||||
case R.id.menu_contact_group:
|
case R.id.menu_contact_group:
|
||||||
onMenuContactGroup();
|
onMenuContactGroup();
|
||||||
return true;
|
return true;
|
||||||
case R.id.menu_template:
|
case R.id.menu_answer:
|
||||||
onMenuTemplate();
|
onMenuAnswer();
|
||||||
return true;
|
return true;
|
||||||
case R.id.menu_encrypt:
|
case R.id.menu_encrypt:
|
||||||
onMenuEncrypt();
|
onMenuEncrypt();
|
||||||
|
@ -1097,7 +1097,7 @@ public class FragmentCompose extends FragmentBase {
|
||||||
dialog.show();
|
dialog.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onMenuTemplate() {
|
private void onMenuAnswer() {
|
||||||
new SimpleTask<Cursor>() {
|
new SimpleTask<Cursor>() {
|
||||||
@Override
|
@Override
|
||||||
protected Cursor onExecute(Context context, Bundle args) {
|
protected Cursor onExecute(Context context, Bundle args) {
|
||||||
|
@ -1143,7 +1143,7 @@ public class FragmentCompose extends FragmentBase {
|
||||||
protected void onException(Bundle args, Throwable ex) {
|
protected void onException(Bundle args, Throwable ex) {
|
||||||
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
|
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
|
||||||
}
|
}
|
||||||
}.execute(this, new Bundle(), "compose:template");
|
}.execute(this, new Bundle(), "compose:answer");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onMenuEncrypt() {
|
private void onMenuEncrypt() {
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
app:showAsAction="never" />
|
app:showAsAction="never" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/menu_template"
|
android:id="@+id/menu_answer"
|
||||||
android:title="@string/title_insert_template"
|
android:title="@string/title_insert_template"
|
||||||
app:showAsAction="never" />
|
app:showAsAction="never" />
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,6 @@
|
||||||
android:title="@string/title_reply_receipt" />
|
android:title="@string/title_reply_receipt" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/menu_reply_template"
|
android:id="@+id/menu_reply_answer"
|
||||||
android:title="@string/title_reply_template" />
|
android:title="@string/title_reply_template" />
|
||||||
</menu>
|
</menu>
|
Loading…
Reference in New Issue