mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-23 14:41:08 +00:00
Code Issues Releases Wiki Activity

Small improvements

Browse source
This commit is contained in:
M66B 2018-12-06 15:41:54 +01:00
parent 9fe22c7609
commit f6199ef010
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/eu/faircode/email/ActivityView.java
View file

@ -67,7 +67,6 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.URL; import java.net.URL;
import java.text.Collator; import java.text.Collator;
import java.text.DateFormat; import java.text.DateFormat;
@ -310,7 +309,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
} }
}); });
if (getSupportFragmentManager().getFragments().size() == 0) { if (getSupportFragmentManager().getFragments().size() == 0 &&
!getIntent().hasExtra(Intent.EXTRA_PROCESS_TEXT)) {
FragmentEx fragment = (unified ? new FragmentMessages() : new FragmentFolders()); FragmentEx fragment = (unified ? new FragmentMessages() : new FragmentFolders());
fragment.setArguments(new Bundle()); fragment.setArguments(new Bundle());
@ -737,7 +737,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
new SimpleTask<Long>() { new SimpleTask<Long>() {
@Override @Override
protected Long onLoad(Context context, Bundle args) throws Throwable { protected Long onLoad(Context context, Bundle args) {
long account = args.getLong("account"); long account = args.getLong("account");
return DB.getInstance(context).folder().getFolderByType(account, EntityFolder.INBOX).id; return DB.getInstance(context).folder().getFolderByType(account, EntityFolder.INBOX).id;
} }
@ -842,9 +842,9 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
private void onDebugInfo() { private void onDebugInfo() {
new SimpleTask<Long>() { new SimpleTask<Long>() {
@Override @Override
protected Long onLoad(Context context, Bundle args) throws UnsupportedEncodingException { protected Long onLoad(Context context, Bundle args) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append(context.getString(R.string.title_debug_info_remark) + "\n\n\n\n"); sb.append(context.getString(R.string.title_debug_info_remark)).append("\n\n\n\n");
sb.append(Helper.getAppInfo(context)); sb.append(Helper.getAppInfo(context));
String body = "<pre>" + sb.toString().replaceAll("\\r?\\n", "<br />") + "</pre>"; String body = "<pre>" + sb.toString().replaceAll("\\r?\\n", "<br />") + "</pre>";
@ -1026,7 +1026,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
private void onCleanup() { private void onCleanup() {
new SimpleTask<Void>() { new SimpleTask<Void>() {
@Override @Override
protected Void onLoad(Context context, Bundle args) throws Throwable { protected Void onLoad(Context context, Bundle args) {
JobDaily.cleanup(ActivityView.this); JobDaily.cleanup(ActivityView.this);
return null; return null;
} }

19
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -1198,10 +1198,12 @@ public class FragmentMessages extends FragmentEx {
db.folder().liveUnified().observe(getViewLifecycleOwner(), new Observer<List<TupleFolderEx>>() { db.folder().liveUnified().observe(getViewLifecycleOwner(), new Observer<List<TupleFolderEx>>() {
@Override @Override
public void onChanged(List<TupleFolderEx> folders) { public void onChanged(List<TupleFolderEx> folders) {
if (folders == null)
folders = new ArrayList<>();
int unseen = 0; int unseen = 0;
if (folders != null) for (TupleFolderEx folder : folders)
for (TupleFolderEx folder : folders) unseen += folder.unseen;
unseen += folder.unseen;
String name = getString(R.string.title_folder_unified); String name = getString(R.string.title_folder_unified);
if (unseen > 0) if (unseen > 0)
setSubtitle(getString(R.string.title_folder_unseen, name, unseen)); setSubtitle(getString(R.string.title_folder_unseen, name, unseen));
@ -1275,12 +1277,11 @@ public class FragmentMessages extends FragmentEx {
if (actionbar && viewType == AdapterMessage.ViewType.THREAD) { if (actionbar && viewType == AdapterMessage.ViewType.THREAD) {
boolean hasTrash = false; boolean hasTrash = false;
boolean hasArchive = false; boolean hasArchive = false;
if (folders != null) for (EntityFolder folder : folders)
for (EntityFolder folder : folders) if (EntityFolder.TRASH.equals(folder.type))
if (EntityFolder.TRASH.equals(folder.type)) hasTrash = true;
hasTrash = true; else if (EntityFolder.ARCHIVE.equals(folder.type))
else if (EntityFolder.ARCHIVE.equals(folder.type)) hasArchive = true;
hasArchive = true;
ViewModelMessages model = ViewModelProviders.of(getActivity()).get(ViewModelMessages.class); ViewModelMessages model = ViewModelProviders.of(getActivity()).get(ViewModelMessages.class);
ViewModelMessages.Target[] pn = model.getPrevNext(thread); ViewModelMessages.Target[] pn = model.getPrevNext(thread);