mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-24 15:11:03 +00:00
Code Issues Releases Wiki Activity

Revert "Added long press to force image dialog"

Browse source 
This reverts commit c1d2ef0197.
This commit is contained in:
M66B 2021-11-02 09:19:12 +01:00
parent c1d2ef0197
commit 5832ab8b20
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/FragmentCompose.java
View file

@ -881,10 +881,10 @@ public class FragmentCompose extends FragmentBase {
onActionRecordAudio(); onActionRecordAudio();
return true; return true;
} else if (action == R.id.menu_take_photo) { } else if (action == R.id.menu_take_photo) {
onActionImage(true, false); onActionImage(true);
return true; return true;
} else if (action == R.id.menu_image) { } else if (action == R.id.menu_image) {
onActionImage(false, false); onActionImage(false);
return true; return true;
} else if (action == R.id.menu_attachment) { } else if (action == R.id.menu_attachment) {
onActionAttachment(); onActionAttachment();
@ -1657,14 +1657,6 @@ public class FragmentCompose extends FragmentBase {
else else
bottom_navigation.getMenu().findItem(R.id.action_send).setTitle(R.string.title_send); bottom_navigation.getMenu().findItem(R.id.action_send).setTitle(R.string.title_send);
media_bar.findViewById(R.id.menu_image).setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
onActionImage(false, true);
return true;
}
});
bottom_navigation.findViewById(R.id.action_send).setOnLongClickListener(new View.OnLongClickListener() { bottom_navigation.findViewById(R.id.action_send).setOnLongClickListener(new View.OnLongClickListener() {
@Override @Override
public boolean onLongClick(View v) { public boolean onLongClick(View v) {
@ -2323,10 +2315,10 @@ public class FragmentCompose extends FragmentBase {
} }
} }
private void onActionImage(boolean photo, boolean force) { private void onActionImage(boolean photo) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean image_dialog = prefs.getBoolean("image_dialog", true); boolean image_dialog = prefs.getBoolean("image_dialog", true);
if (image_dialog || force) { if (image_dialog) {
Helper.hideKeyboard(view); Helper.hideKeyboard(view);
Bundle args = new Bundle(); Bundle args = new Bundle();