Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-05 16:43:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevent deleting inbox

Browse Source
This commit is contained in:
M66B
2020-10-20 14:17:09 +02:00
parent 392d28a2f6
commit e97fb55969
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/CharsetHelper.java
View File

@@ -82,7 +82,7 @@ class CharsetHelper {
"UTF-8".equals(detected))
Log.w("compact_enc_det result=" + detected);
else
// ISO-2022-JP, ISO-8859-2, windows-1250, windows-1257
// ISO-2022-JP, ISO-8859-2, windows-1250, windows-1252, windows-1257
Log.e("compact_enc_det result=" + detected);
return Charset.forName(detected);

2
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@@ -1088,6 +1088,8 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
throw ex1;
}
} catch (FolderNotFoundException ex) {
if ("INBOX".equalsIgnoreCase(folder.name))
throw ex;
Log.w(folder.name, ex);
db.folder().deleteFolder(folder.id);
continue;