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

Virtual messages

Browse Source
pull/72/head
M66B 7 years ago
parent 6b9a83cb32
commit 17c894b3d1
6 changed files with 308 additions and 321 deletions
Show Stats Download Patch File Download Diff File

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

@ -647,14 +647,12 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
new SimpleTask<Void>() {
@Override
protected Void onLoad(Context context, Bundle args) {
long id = args.getLong("id");
TupleMessageEx message = (TupleMessageEx) args.getSerializable("message");
DB db = DB.getInstance(context);
try {
db.beginTransaction();
EntityMessage message = db.message().getMessage(id);
if (message != null) // Searched messages are not stored in the database
for (EntityMessage tmessage : db.message().getMessageByThread(message.account, message.thread)) {
db.message().setMessageUiSeen(tmessage.id, true);
EntityOperation.queue(db, tmessage, EntityOperation.SEEN, true);

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

@ -190,7 +190,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(
new Intent(ActivityView.ACTION_VIEW_MESSAGE)
.putExtra("id", message.id));
.putExtra("message", message));
}
}
@ -205,7 +205,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(
new Intent(ActivityView.ACTION_VIEW_MESSAGE)
.putExtra("id", message.id));
.putExtra("message", message));
return true;
}

20
app/src/main/java/eu/faircode/email/AdapterOperation.java
Unescape View File

@ -20,7 +20,6 @@ package eu.faircode.email;
*/
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
@ -36,7 +35,6 @@ import java.util.List;
import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleOwner;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.ListUpdateCallback;
import androidx.recyclerview.widget.RecyclerView;
@ -50,7 +48,7 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
private DateFormat df = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.SHORT, SimpleDateFormat.LONG);
public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
public class ViewHolder extends RecyclerView.ViewHolder implements View.OnLongClickListener {
View itemView;
TextView tvMessage;
TextView tvName;
@ -66,12 +64,10 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
}
private void wire() {
itemView.setOnClickListener(this);
itemView.setOnLongClickListener(this);
}
private void unwire() {
itemView.setOnClickListener(null);
itemView.setOnLongClickListener(null);
}
@ -81,20 +77,6 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
tvTime.setText(df.format(new Date(operation.created)));
}
@Override
public void onClick(View view) {
int pos = getAdapterPosition();
if (pos == RecyclerView.NO_POSITION)
return;
EntityOperation operation = filtered.get(pos);
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(
new Intent(ActivityView.ACTION_VIEW_MESSAGE)
.putExtra("id", operation.message));
}
@Override
public boolean onLongClick(View view) {
int pos = getAdapterPosition();

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

@ -28,6 +28,7 @@ import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.Serializable;
import java.util.Date;
import java.util.Random;
@ -36,6 +37,7 @@ import javax.mail.Address;
import androidx.annotation.NonNull;
import androidx.room.Entity;
import androidx.room.ForeignKey;
import androidx.room.Ignore;
import androidx.room.Index;
import androidx.room.PrimaryKey;
@ -64,7 +66,7 @@ import static androidx.room.ForeignKey.CASCADE;
@Index(value = {"ui_hide"})
}
)
public class EntityMessage {
public class EntityMessage implements Serializable {
static final String TABLE_NAME = "message";
@PrimaryKey(autoGenerate = true)
@ -98,6 +100,11 @@ public class EntityMessage {
public Boolean ui_hide;
public String error;
@Ignore
String body = null;
@Ignore
boolean virtual = false;
static String generateMessageId() {
StringBuffer sb = new StringBuffer();
sb.append('<')
@ -131,7 +138,9 @@ public class EntityMessage {
}
String read(Context context) throws IOException {
return read(context, this.id);
if (body == null)
body = read(context, this.id);
return body;
}
static String read(Context context, Long id) throws IOException {

139
app/src/main/java/eu/faircode/email/FragmentMessage.java
Unescape View File

@ -138,6 +138,12 @@ public class FragmentMessage extends FragmentEx {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (savedInstanceState == null)
message = (TupleMessageEx) getArguments().getSerializable("message");
else
message = (TupleMessageEx) savedInstanceState.getSerializable("message");
openPgpConnection = new OpenPgpServiceConnection(getContext(), "org.sufficientlysecure.keychain");
openPgpConnection.bindToService();
}
@ -156,10 +162,6 @@ public class FragmentMessage extends FragmentEx {
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
view = (ViewGroup) inflater.inflate(R.layout.fragment_message, container, false);
// Get arguments
Bundle args = getArguments();
final long id = (args == null ? -1 : args.getLong("id"));
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
debug = prefs.getBoolean("debug", false);
@ -193,7 +195,7 @@ public class FragmentMessage extends FragmentEx {
tvCount.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
onMenuThread(message.id);
onMenuThread();
}
});
@ -301,19 +303,19 @@ public class FragmentMessage extends FragmentEx {
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.action_spam:
onActionSpam(id);
onActionSpam();
return true;
case R.id.action_trash:
onActionDelete(id);
onActionDelete();
return true;
case R.id.action_move:
onActionMove(id);
onActionMove();
return true;
case R.id.action_archive:
onActionArchive(id);
onActionArchive();
return true;
case R.id.action_reply:
onActionReply(id);
onActionReply();
return true;
}
return false;
@ -348,6 +350,7 @@ public class FragmentMessage extends FragmentEx {
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putSerializable("message", message);
outState.putBoolean("free", free);
if (free) {
outState.putInt("tag_count", (int) tvCount.getTag());
@ -361,31 +364,7 @@ public class FragmentMessage extends FragmentEx {
public void onActivityCreated(@Nullable final Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
// Get arguments
Bundle args = getArguments();
final long id = (args == null ? -1 : args.getLong("id"));
final DB db = DB.getInstance(getContext());
// Observe message
db.message().liveMessage(id).observe(getViewLifecycleOwner(), new Observer<TupleMessageEx>() {
private boolean once = false;
@Override
public void onChanged(@Nullable final TupleMessageEx message) {
if (message == null || (!(debug && BuildConfig.DEBUG) && message.ui_hide)) {
// Message gone (moved, deleted)
finish();
return;
}
FragmentMessage.this.message = message;
if (savedInstanceState == null) {
if (once)
return;
once = true;
setSubtitle(Helper.localizeFolderName(getContext(), message.folderName));
tvFrom.setText(message.from == null ? null : MessageHelper.getFormattedAddresses(message.from, true));
@ -400,7 +379,6 @@ public class FragmentMessage extends FragmentEx {
tvBcc.setText(message.bcc == null ? null : MessageHelper.getFormattedAddresses(message.bcc, true));
tvError.setText(message.error);
} else {
free = savedInstanceState.getBoolean("free");
if (free) {
@ -412,8 +390,6 @@ public class FragmentMessage extends FragmentEx {
decrypted = savedInstanceState.getString("decrypted");
}
getActivity().invalidateOptionsMenu();
if (tvBody.getTag() == null) {
// Spanned text needs to be loaded after recreation too
final Bundle args = new Bundle();
@ -427,7 +403,7 @@ public class FragmentMessage extends FragmentEx {
protected Spanned onLoad(final Context context, final Bundle args) throws Throwable {
final long id = args.getLong("id");
final boolean show_images = args.getBoolean("show_images");
String body = (decrypted == null ? EntityMessage.read(context, id) : decrypted);
String body = (decrypted == null ? message.read(context) : decrypted);
args.putInt("size", body.length());
return Html.fromHtml(HtmlHelper.sanitize(getContext(), body, false), new Html.ImageGetter() {
@ -568,9 +544,24 @@ public class FragmentMessage extends FragmentEx {
grpError.setVisibility(free || message.error == null ? View.GONE : View.VISIBLE);
}
DB db = DB.getInstance(getContext());
if (!message.virtual) {
// Observe message
db.message().liveMessage(message.id).observe(getViewLifecycleOwner(), new Observer<TupleMessageEx>() {
@Override
public void onChanged(@Nullable final TupleMessageEx message) {
if (message == null || (!(debug && BuildConfig.DEBUG) && message.ui_hide)) {
// Message gone (moved, deleted)
finish();
return;
}
}
});
// Observe attachments
db.attachment().liveAttachments(id).removeObservers(getViewLifecycleOwner());
db.attachment().liveAttachments(id).observe(getViewLifecycleOwner(),
db.attachment().liveAttachments(message.id).observe(getViewLifecycleOwner(),
new Observer<List<EntityAttachment>>() {
@Override
public void onChanged(@Nullable List<EntityAttachment> attachments) {
@ -583,7 +574,6 @@ public class FragmentMessage extends FragmentEx {
});
// Observe folders
db.folder().liveFolders(message.account).removeObservers(getViewLifecycleOwner());
db.folder().liveFolders(message.account).observe(getViewLifecycleOwner(), new Observer<List<TupleFolderEx>>() {
@Override
public void onChanged(@Nullable List<TupleFolderEx> folders) {
@ -623,7 +613,6 @@ public class FragmentMessage extends FragmentEx {
}
});
}
});
}
@Override
@ -636,23 +625,21 @@ public class FragmentMessage extends FragmentEx {
public void onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
boolean inOutbox = (message != null && EntityFolder.OUTBOX.equals(message.folderType));
boolean inOutbox = EntityFolder.OUTBOX.equals(message.folderType);
menu.findItem(R.id.menu_addresses).setVisible(!free);
menu.findItem(R.id.menu_thread).setVisible(!free && message != null && message.count > 1);
menu.findItem(R.id.menu_seen).setVisible(!free && message != null && !inOutbox);
menu.findItem(R.id.menu_forward).setVisible(!free && message != null && !inOutbox);
menu.findItem(R.id.menu_reply_all).setVisible(!free && message != null && message.cc != null && !inOutbox);
menu.findItem(R.id.menu_thread).setVisible(!free && !message.virtual && message.count > 1);
menu.findItem(R.id.menu_seen).setVisible(!free && !message.virtual && !inOutbox);
menu.findItem(R.id.menu_forward).setVisible(!free && !message.virtual && !inOutbox);
menu.findItem(R.id.menu_reply_all).setVisible(!free && !message.virtual && message.cc != null && !inOutbox);
menu.findItem(R.id.menu_decrypt).setVisible(decrypted == null);
if (message != null) {
MenuItem menuSeen = menu.findItem(R.id.menu_seen);
menuSeen.setIcon(message.ui_seen
? R.drawable.baseline_visibility_off_24
: R.drawable.baseline_visibility_24);
menuSeen.setTitle(message.ui_seen ? R.string.title_unseen : R.string.title_seen);
}
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
@ -661,19 +648,19 @@ public class FragmentMessage extends FragmentEx {
onMenuAddresses();
return true;
case R.id.menu_thread:
onMenuThread(message.id);
onMenuThread();
return true;
case R.id.menu_seen:
onMenuSeen(message.id);
onMenuSeen();
return true;
case R.id.menu_forward:
onMenuForward(message.id);
onMenuForward();
return true;
case R.id.menu_reply_all:
onMenuReplyAll(message.id);
onMenuReplyAll();
return true;
case R.id.menu_decrypt:
onMenuDecrypt(message);
onMenuDecrypt();
return true;
default:
return super.onOptionsItemSelected(item);
@ -684,11 +671,11 @@ public class FragmentMessage extends FragmentEx {
grpAddresses.setVisibility(grpAddresses.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
}
private void onMenuThread(long id) {
private void onMenuThread() {
getFragmentManager().popBackStack("thread", FragmentManager.POP_BACK_STACK_INCLUSIVE);
Bundle args = new Bundle();
args.putLong("thread", id); // message ID
args.putLong("thread", message.id);
FragmentMessages fragment = new FragmentMessages();
fragment.setArguments(args);
@ -698,11 +685,11 @@ public class FragmentMessage extends FragmentEx {
fragmentTransaction.commit();
}
private void onMenuSeen(long id) {
private void onMenuSeen() {
Helper.setViewsEnabled(view, false);
Bundle args = new Bundle();
args.putLong("id", id);
args.putLong("id", message.id);
new SimpleTask<Void>() {
@Override
@ -741,19 +728,19 @@ public class FragmentMessage extends FragmentEx {
}.load(this, args);
}
private void onMenuForward(long id) {
private void onMenuForward() {
startActivity(new Intent(getContext(), ActivityCompose.class)
.putExtra("action", "forward")
.putExtra("reference", id));
.putExtra("reference", message.id));
}
private void onMenuReplyAll(long id) {
private void onMenuReplyAll() {
startActivity(new Intent(getContext(), ActivityCompose.class)
.putExtra("action", "reply_all")
.putExtra("reference", id));
.putExtra("reference", message.id));
}
private void onMenuDecrypt(EntityMessage message) {
private void onMenuDecrypt() {
Log.i(Helper.TAG, "On decrypt");
try {
if (!PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("pro", false))
@ -826,14 +813,14 @@ public class FragmentMessage extends FragmentEx {
public void onActivityResult(int requestCode, int resultCode, Intent data) {
Log.i(Helper.TAG, "Message onActivityResult request=" + requestCode + " result=" + resultCode + " data=" + data);
if (resultCode == RESULT_OK) {
if (requestCode == ActivityView.REQUEST_OPENPGP && message != null) {
if (requestCode == ActivityView.REQUEST_OPENPGP) {
Log.i(Helper.TAG, "User interacted");
onMenuDecrypt(message);
onMenuDecrypt();
}
}
}
private void onActionSpam(final long id) {
private void onActionSpam() {
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
builder
.setMessage(R.string.title_ask_spam)
@ -843,7 +830,7 @@ public class FragmentMessage extends FragmentEx {
Helper.setViewsEnabled(view, false);
Bundle args = new Bundle();
args.putLong("id", id);
args.putLong("id", message.id);
new SimpleTask<Void>() {
@Override
@ -886,7 +873,7 @@ public class FragmentMessage extends FragmentEx {
.setNegativeButton(android.R.string.cancel, null).show();
}
private void onActionDelete(final long id) {
private void onActionDelete() {
boolean delete = (Boolean) bottom_navigation.getTag();
if (delete) {
// No trash or is trash
@ -899,7 +886,7 @@ public class FragmentMessage extends FragmentEx {
Helper.setViewsEnabled(view, false);
Bundle args = new Bundle();
args.putLong("id", id);
args.putLong("id", message.id);
new SimpleTask<Void>() {
@Override
@ -946,7 +933,7 @@ public class FragmentMessage extends FragmentEx {
Helper.setViewsEnabled(view, false);
Bundle args = new Bundle();
args.putLong("id", id);
args.putLong("id", message.id);
new SimpleTask<Void>() {
@Override
@ -986,9 +973,9 @@ public class FragmentMessage extends FragmentEx {
}
}
private void onActionMove(long id) {
private void onActionMove() {
Bundle args = new Bundle();
args.putLong("id", id);
args.putLong("id", message.id);
new SimpleTask<List<EntityFolder>>() {
@Override
@ -1102,11 +1089,11 @@ public class FragmentMessage extends FragmentEx {
}.load(FragmentMessage.this, args);
}
private void onActionArchive(long id) {
private void onActionArchive() {
Helper.setViewsEnabled(view, false);
Bundle args = new Bundle();
args.putLong("id", id);
args.putLong("id", message.id);
new SimpleTask<Void>() {
@Override
@ -1147,9 +1134,9 @@ public class FragmentMessage extends FragmentEx {
}.load(FragmentMessage.this, args);
}
private void onActionReply(long id) {
private void onActionReply() {
startActivity(new Intent(getContext(), ActivityCompose.class)
.putExtra("action", "reply")
.putExtra("reference", id));
.putExtra("reference", message.id));
}
}

31
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -218,17 +218,25 @@ public class FragmentMessages extends FragmentEx {
@Override
public void loadInitial(LoadInitialParams params, LoadInitialCallback<TupleMessageEx> callback) {
Log.i(Helper.TAG, "loadInitial(" + params.requestedStartPosition + ", " + params.requestedLoadSize + ")");
callback.onResult(search(search, params.requestedStartPosition, params.requestedLoadSize), params.requestedStartPosition);
SearchResult result = search(search, params.requestedStartPosition, params.requestedLoadSize);
callback.onResult(result.messages, params.requestedStartPosition, result.total);
}
@Override
public void loadRange(LoadRangeParams params, LoadRangeCallback<TupleMessageEx> callback) {
Log.i(Helper.TAG, "loadRange(" + params.startPosition + ", " + params.loadSize + ")");
callback.onResult(search(search, params.startPosition, params.loadSize));
SearchResult result = search(search, params.startPosition, params.loadSize);
callback.onResult(result.messages);
}
private List<TupleMessageEx> search(String term, int from, int count) {
List<TupleMessageEx> list = new ArrayList<>();
class SearchResult {
int total;
List<TupleMessageEx> messages;
}
private SearchResult search(String term, int from, int count) {
SearchResult result = new SearchResult();
result.messages = new ArrayList<>();
IMAPStore istore = null;
try {
DB db = DB.getInstance(getContext());
@ -251,11 +259,12 @@ public class FragmentMessages extends FragmentEx {
new OrTerm(
new SubjectTerm(term),
new BodyTerm(term)));
result.total = imessages.length;
Log.i(Helper.TAG, "Found messages=" + imessages.length);
List<Message> selected = new ArrayList<>();
int base = imessages.length - 1 - from;
for (int i = base; i >= 0 && i >= base - count - 1; i--)
for (int i = base; i >= 0 && i >= base - count + 1; i--)
selected.add(imessages[i]);
Log.i(Helper.TAG, "Selected messages=" + selected.size());
@ -303,7 +312,10 @@ public class FragmentMessages extends FragmentEx {
message.unseen = (seen ? 0 : 1);
message.attachments = 0;
list.add(message);
message.body = helper.getHtml();
message.virtual = true;
result.messages.add(message);
}
} catch (Throwable ex) {
Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
@ -316,17 +328,16 @@ public class FragmentMessages extends FragmentEx {
}
}
return list;
return result;
}
};
}
};
PagedList.Config.Builder plcb = new PagedList.Config.Builder()
.setEnablePlaceholders(false)
.setEnablePlaceholders(true)
.setInitialLoadSizeHint(10)
.setPageSize(PAGE_SIZE);
.setPageSize(10);
messages = new LivePagedListBuilder<>(dsf, plcb.build()).build();
}

Write Preview
Loading…
Cancel
Save