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

Set focus after sharing image

Browse Source
pull/211/head
M66B 2 years ago
parent 2cb59be977
commit a5a830f3b1
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File

32
app/src/main/java/eu/faircode/email/FragmentCompose.java
Unescape View File

@ -610,7 +610,7 @@ public class FragmentCompose extends FragmentBase {
@Override @Override
public void onInputContent(Uri uri) { public void onInputContent(Uri uri) {
Log.i("Received input uri=" + uri); Log.i("Received input uri=" + uri);
onAddAttachment(Arrays.asList(uri), true, 0, false); onAddAttachment(Arrays.asList(uri), true, 0, false, false);
} }
}); });
@ -2801,7 +2801,7 @@ public class FragmentCompose extends FragmentBase {
case REQUEST_SHARED: case REQUEST_SHARED:
if (resultCode == RESULT_OK && data != null) { if (resultCode == RESULT_OK && data != null) {
Bundle args = data.getBundleExtra("args"); Bundle args = data.getBundleExtra("args");
onAddImageFile(args.getParcelableArrayList("images")); onAddImageFile(args.getParcelableArrayList("images"), true);
} }
break; break;
case REQUEST_IMAGE: case REQUEST_IMAGE:
@ -2812,18 +2812,18 @@ public class FragmentCompose extends FragmentBase {
break; break;
case REQUEST_IMAGE_FILE: case REQUEST_IMAGE_FILE:
if (resultCode == RESULT_OK && data != null) if (resultCode == RESULT_OK && data != null)
onAddImageFile(getUris(data)); onAddImageFile(getUris(data), false);
break; break;
case REQUEST_TAKE_PHOTO: case REQUEST_TAKE_PHOTO:
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
if (photoURI != null) if (photoURI != null)
onAddImageFile(Arrays.asList(photoURI)); onAddImageFile(Arrays.asList(photoURI), false);
} }
break; break;
case REQUEST_ATTACHMENT: case REQUEST_ATTACHMENT:
case REQUEST_RECORD_AUDIO: case REQUEST_RECORD_AUDIO:
if (resultCode == RESULT_OK && data != null) if (resultCode == RESULT_OK && data != null)
onAddAttachment(getUris(data), false, 0, false); onAddAttachment(getUris(data), false, 0, false, false);
break; break;
case REQUEST_OPENPGP: case REQUEST_OPENPGP:
if (resultCode == RESULT_OK && data != null) if (resultCode == RESULT_OK && data != null)
@ -3075,16 +3075,16 @@ public class FragmentCompose extends FragmentBase {
} }
} }
private void onAddImageFile(List<Uri> uri) { private void onAddImageFile(List<Uri> uri, boolean focus) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean add_inline = prefs.getBoolean("add_inline", true); boolean add_inline = prefs.getBoolean("add_inline", true);
boolean resize_images = prefs.getBoolean("resize_images", true); boolean resize_images = prefs.getBoolean("resize_images", true);
boolean privacy_images = prefs.getBoolean("privacy_images", false); boolean privacy_images = prefs.getBoolean("privacy_images", false);
int resize = prefs.getInt("resize", FragmentCompose.REDUCED_IMAGE_SIZE); int resize = prefs.getInt("resize", FragmentCompose.REDUCED_IMAGE_SIZE);
onAddAttachment(uri, add_inline, resize_images ? resize : 0, privacy_images); onAddAttachment(uri, add_inline, resize_images ? resize : 0, privacy_images, focus);
} }
private void onAddAttachment(List<Uri> uris, boolean image, int resize, boolean privacy) { private void onAddAttachment(List<Uri> uris, boolean image, int resize, boolean privacy, boolean focus) {
etBody.clearComposingText(); etBody.clearComposingText();
Bundle args = new Bundle(); Bundle args = new Bundle();
@ -3096,6 +3096,7 @@ public class FragmentCompose extends FragmentBase {
args.putBoolean("privacy", privacy); args.putBoolean("privacy", privacy);
args.putCharSequence("body", etBody.getText()); args.putCharSequence("body", etBody.getText());
args.putInt("start", etBody.getSelectionStart()); args.putInt("start", etBody.getSelectionStart());
args.putBoolean("focus", focus);
new SimpleTask<Spanned>() { new SimpleTask<Spanned>() {
@Override @Override
@ -3194,15 +3195,20 @@ public class FragmentCompose extends FragmentBase {
@Override @Override
protected void onExecuted(Bundle args, final Spanned body) { protected void onExecuted(Bundle args, final Spanned body) {
if (body == null) // Update text
return; if (body != null)
etBody.setText(body); etBody.setText(body);
// Restore cursor/keyboard
int start = args.getInt("start"); int start = args.getInt("start");
boolean focus = args.getBoolean("focus");
if (focus)
setFocus(null, start, start, true);
else if (body != null) {
if (start <= body.length()) if (start <= body.length())
etBody.setSelection(start); etBody.setSelection(start);
} }
}
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
@ -3257,7 +3263,7 @@ public class FragmentCompose extends FragmentBase {
fragment.setTargetFragment(FragmentCompose.this, REQUEST_SHARED); fragment.setTargetFragment(FragmentCompose.this, REQUEST_SHARED);
fragment.show(getParentFragmentManager(), "compose:shared"); fragment.show(getParentFragmentManager(), "compose:shared");
} else } else
onAddImageFile(images); onAddImageFile(images, false);
} }
@Override @Override
@ -5691,7 +5697,7 @@ public class FragmentCompose extends FragmentBase {
fragment.setTargetFragment(FragmentCompose.this, REQUEST_SHARED); fragment.setTargetFragment(FragmentCompose.this, REQUEST_SHARED);
fragment.show(getParentFragmentManager(), "compose:shared"); fragment.show(getParentFragmentManager(), "compose:shared");
} else } else
onAddImageFile(images); onAddImageFile(images, true);
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); Log.e(ex);
} }

Write Preview
Loading…
Cancel
Save