Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-31 06:08:31 +02: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

12
app/src/main/java/eu/faircode/email/FragmentAnswer.java
View File

@@ -49,6 +49,8 @@ import androidx.constraintlayout.widget.Group;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.snackbar.Snackbar;
import org.jsoup.nodes.Document;
import static android.app.Activity.RESULT_OK;
public class FragmentAnswer extends FragmentBase {
@@ -246,7 +248,7 @@ public class FragmentAnswer extends FragmentBase {
args.putString("name", etName.getText().toString().trim());
args.putBoolean("favorite", cbFavorite.isChecked());
args.putBoolean("hide", cbHide.isChecked());
args.putString("text", HtmlHelper.toHtml(etText.getText(), getContext()));
args.putString("html", HtmlHelper.toHtml(etText.getText(), getContext()));
new SimpleTask<Void>() {
@Override
@@ -265,25 +267,27 @@ public class FragmentAnswer extends FragmentBase {
String name = args.getString("name");
boolean favorite = args.getBoolean("favorite");
boolean hide = args.getBoolean("hide");
String text = args.getString("text");
String html = args.getString("html");
if (TextUtils.isEmpty(name))
throw new IllegalArgumentException(context.getString(R.string.title_no_name));
Document document = HtmlHelper.fixEdit(JsoupEx.parse(html));
DB db = DB.getInstance(context);
if (id < 0) {
EntityAnswer answer = new EntityAnswer();
answer.name = name;
answer.favorite = favorite;
answer.hide = hide;
answer.text = text;
answer.text = document.body().html();
answer.id = db.answer().insertAnswer(answer);
} else {
EntityAnswer answer = db.answer().getAnswer(id);
answer.name = name;
answer.favorite = favorite;
answer.hide = hide;
answer.text = text;
answer.text = document.body().html();
db.answer().updateAnswer(answer);
}