Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-28 11:55:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed extra newlines

Browse Source
This commit is contained in:
M66B
2020-08-04 15:20:41 +02:00
parent 6515a50c0c
commit 3e43688be2
3 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/eu/faircode/email/ActivitySignature.java
View File

@@ -48,6 +48,8 @@ import androidx.appcompat.app.AlertDialog;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.snackbar.Snackbar;
import org.jsoup.nodes.Document;
public class ActivitySignature extends ActivityBase {
private ViewGroup view;
private EditTextCompose etText;
@@ -205,26 +207,18 @@ public class ActivitySignature extends ActivityBase {
}
private void save() {
etText.clearComposingText();
String html = (etText.getRaw()
? etText.getText().toString()
: HtmlHelper.toHtml(etText.getText(), this));
Intent result = new Intent();
result.putExtra("html", html);
result.putExtra("html", getHtml());
setResult(RESULT_OK, result);
finish();
}
private void html(boolean raw) {
String html = getHtml();
etText.setRaw(raw);
if (!raw || dirty) {
etText.clearComposingText();
String html = (raw
? HtmlHelper.toHtml(etText.getText(), this)
: etText.getText().toString());
if (!raw || dirty)
getIntent().putExtra("html", html);
}
if (raw)
style_bar.setVisibility(View.GONE);
@@ -232,6 +226,18 @@ public class ActivitySignature extends ActivityBase {
load();
}
private String getHtml() {
etText.clearComposingText();
if (etText.getRaw())
return etText.getText().toString();
else {
String html = HtmlHelper.toHtml(etText.getText(), this);
Document d = HtmlHelper.fixEdit(JsoupEx.parse(html));
return d.body().html();
}
}
private void insertImage() {
Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
intent.addCategory(Intent.CATEGORY_OPENABLE);