Show operation account

pull/147/head
M66B 6 years ago
parent eed6f8010b
commit 8398e23d78

@ -93,7 +93,10 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
sb.append(' ').append(ex.toString());
}
tvFolder.setText(operation.accountName + "/" + operation.folderName);
String folderName =
(operation.accountName == null ? "" : operation.accountName + "/") + operation.folderName;
tvFolder.setText(folderName);
tvMessage.setText(operation.message == null ? null : Long.toString(operation.message));
tvOperation.setText(sb.toString());
tvTime.setText(DateUtils.getRelativeTimeSpanString(context, operation.created));

@ -34,7 +34,7 @@ public interface DaoOperation {
" FROM operation" +
" JOIN folder ON folder.id = operation.folder" +
" LEFT JOIN message ON message.id = operation.message" +
" LEFT JOIN account ON account.id = message.account" +
" LEFT JOIN account ON account.id = message.account OR account.id = folder.account" +
" LEFT JOIN identity ON identity.id = message.identity" +
" ORDER BY" +
" CASE WHEN operation.name = '" + EntityOperation.SYNC + "' THEN" +

Loading…
Cancel
Save