From e7a709b944449d07af989c6aa7706f3514866164 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 6 Aug 2018 20:20:05 +0000
Subject: [PATCH] Sync trash / archive by default

Fixes #21
---
 app/src/main/java/eu/faircode/email/EntityFolder.java     | 7 ++++---
 app/src/main/java/eu/faircode/email/FragmentIdentity.java | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java
index b4ac6d8c..e755928d 100644
--- a/app/src/main/java/eu/faircode/email/EntityFolder.java
+++ b/app/src/main/java/eu/faircode/email/EntityFolder.java
@@ -84,9 +84,10 @@ public class EntityFolder {
     static final int DEFAULT_STANDARD_SYNC = 7;
 
     static final List<String> SYSTEM_FOLDER_SYNC = Arrays.asList(
-            EntityFolder.TYPE_ARCHIVE,
-            EntityFolder.TYPE_DRAFTS,
-            EntityFolder.TYPE_SENT
+            TYPE_ARCHIVE,
+            TYPE_DRAFTS,
+            TYPE_TRASH,
+            TYPE_SENT
     );
 
     static boolean isOutgoing(String type) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 490287f9..c0d3ce00 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -175,6 +175,7 @@ public class FragmentIdentity extends FragmentEx {
         });
 
         // Initialize
+        etName.requestFocus();
         tilPassword.setPasswordVisibilityToggleEnabled(id < 0);
         pbCheck.setVisibility(View.GONE);