mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Revert "Link to message thread"" 

This reverts commit 45b567562b.
This commit is contained in:
M66B 2021-04-12 10:50:28 +02:00
parent 45b567562b
commit ee8dc05b22
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,12 +66,18 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
if (path == null)
return null;
String[] parts = path.split("/");
if (parts.length < 1)
if (parts.length < 3)
return null;
long id = Long.parseLong(parts[1]);
long account = Long.parseLong(parts[1]);
String msgid = parts[2];
DB db = DB.getInstance(context);
return db.message().getMessage(id);
List<EntityMessage> messages = db.message().getMessagesByMsgId(account, msgid);
if (messages == null || messages.size() == 0)
return null;
return messages.get(0);
}
@Override

4
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -4825,13 +4825,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (!TextUtils.isEmpty(message.subject))
result.put("subject", message.subject);
String link = "message://" + BuildConfig.APPLICATION_ID + "/" + message.id;
Document document = JsoupEx.parse(file);
Element a = document.createElement("a");
a.text(context.getString(R.string.app_name));
a.attr("href", link);
a.attr("href", message.getLink());
document.body().appendElement("p").appendChild(a);

5
app/src/main/java/eu/faircode/email/EntityMessage.java
View File

@ -24,6 +24,7 @@ import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.text.TextUtils;
import androidx.annotation.NonNull;
@ -239,6 +240,10 @@ public class EntityMessage implements Serializable {
return "<" + UUID.randomUUID() + "@" + domain + '>';
}
String getLink() {
return "message://" + BuildConfig.APPLICATION_ID + "/" + this.account + "/" + Uri.encode(this.msgid);
}
boolean replySelf(List<TupleIdentityEx> identities, long account) {
Address[] senders = (reply == null || reply.length == 0 ? from : reply);
if (identities != null && senders != null)