Refactoring

pull/201/head
M66B 4 years ago
parent ec35b51ef5
commit 134fbaf2f0

@ -57,7 +57,7 @@ public class ActivityAnswer extends ActivityBase {
public void onItemClick(AdapterView<?> adapterView, View view, int pos, long id) { public void onItemClick(AdapterView<?> adapterView, View view, int pos, long id) {
EntityAnswer answer = (EntityAnswer) adapterView.getAdapter().getItem(pos); EntityAnswer answer = (EntityAnswer) adapterView.getAdapter().getItem(pos);
String html = answer.getText(null); String html = answer.getHtml(null);
String text = HtmlHelper.getText(ActivityAnswer.this, html); String text = HtmlHelper.getText(ActivityAnswer.this, html);
ClipboardManager cbm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE); ClipboardManager cbm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);

@ -67,7 +67,7 @@ public class EntityAnswer implements Serializable {
public Integer applied = 0; public Integer applied = 0;
public Long last_applied; public Long last_applied;
String getText(Address[] address) { String getHtml(Address[] address) {
return replacePlaceholders(text, address); return replacePlaceholders(text, address);
} }

@ -637,7 +637,7 @@ public class EntityRule {
reply.id = db.message().insertMessage(reply); reply.id = db.message().insertMessage(reply);
String body = answer.getText(message.from); String body = answer.getHtml(message.from);
Document msg = JsoupEx.parse(body); Document msg = JsoupEx.parse(body);
Element div = msg.createElement("div"); Element div = msg.createElement("div");

@ -129,7 +129,6 @@ import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.bottomnavigation.LabelVisibilityMode; import com.google.android.material.bottomnavigation.LabelVisibilityMode;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar; import com.google.android.material.snackbar.Snackbar;
import org.bouncycastle.cert.jcajce.JcaCertStore; import org.bouncycastle.cert.jcajce.JcaCertStore;
@ -4148,7 +4147,7 @@ public class FragmentCompose extends FragmentBase {
if (a != null) { if (a != null) {
db.answer().applyAnswer(a.id, new Date().getTime()); db.answer().applyAnswer(a.id, new Date().getTime());
data.draft.subject = a.name; data.draft.subject = a.name;
Document d = JsoupEx.parse(a.getText(null)); Document d = JsoupEx.parse(a.getHtml(null));
document.body().append(d.body().html()); document.body().append(d.body().html());
} }
@ -4327,7 +4326,7 @@ public class FragmentCompose extends FragmentBase {
else { else {
db.answer().applyAnswer(receipt.id, new Date().getTime()); db.answer().applyAnswer(receipt.id, new Date().getTime());
texts = new String[0]; texts = new String[0];
Document d = JsoupEx.parse(receipt.getText(null)); Document d = JsoupEx.parse(receipt.getHtml(null));
document.body().append(d.body().html()); document.body().append(d.body().html());
} }
} }
@ -4372,7 +4371,7 @@ public class FragmentCompose extends FragmentBase {
if (a != null) { if (a != null) {
db.answer().applyAnswer(a.id, new Date().getTime()); db.answer().applyAnswer(a.id, new Date().getTime());
Document d = JsoupEx.parse(a.getText(data.draft.to)); Document d = JsoupEx.parse(a.getHtml(data.draft.to));
document.body().append(d.body().html()); document.body().append(d.body().html());
} }

Loading…
Cancel
Save