From 65cd93a34031f4d55b3538f85b30b6ff14e3a4d4 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 23 Aug 2018 06:44:59 +0000 Subject: [PATCH] Make unsuported charsets explicit, add freeutils charsets --- .idea/caches/build_file_checksums.ser | Bin 535 -> 535 bytes README.md | 1 + app/build.gradle | 2 ++ .../java/eu/faircode/email/MessageHelper.java | 7 ++++--- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 551ff1530f1af56b258dfb9dea5ac1998c9ef984..cfc40c59494aad505d057ab586e0639c0bda3ffc 100644 GIT binary patch delta 33 pcmbQvGM#0@43^a9zT%B@vKR%AdVLNN)XP7+`r@v-!=|!%6#(n64wV1^ delta 33 pcmbQvGM#0@43;Fbz04cuWHAb!>5y^>X3o1bweIR0lPH--6#&%|4Ws}7 diff --git a/README.md b/README.md index 1dab691a..ca6bcfea 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,7 @@ FairEmail uses: * [JavaMail](https://javaee.github.io/javamail/). Copyright (c) 1997-2018 Oracle® and/or its affiliates. All rights reserved. [GPLv2+CE license](https://javaee.github.io/javamail/JavaMail-License). * [jsoup](https://jsoup.org/). Copyright © 2009 - 2017 Jonathan Hedley. [MIT license](https://jsoup.org/license). +* [JCharset](http://www.freeutils.net/source/jcharset/). Copyright © 2005-2015 Amichai Rothman. [GNU General Public License](http://www.freeutils.net/source/jcharset/#license) * [Android Support Library](https://developer.android.com/tools/support-library/). Copyright (C) 2011 The Android Open Source Project. [Apache license](https://android.googlesource.com/platform/frameworks/support/+/master/LICENSE.txt). * [Android Architecture Components](https://developer.android.com/topic/libraries/architecture/). Copyright 2018 The Android Open Source Project, Inc. [Apache license](https://github.com/googlesamples/android-architecture-components/blob/master/LICENSE). diff --git a/app/build.gradle b/app/build.gradle index c375dc41..06a49597 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -74,4 +74,6 @@ dependencies { // https://jsoup.org/ implementation "org.jsoup:jsoup:$jsoup_version" + // http://www.freeutils.net/source/jcharset/ + implementation "net.freeutils:jcharset:2.0" } diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 057450c3..aa3697ab 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -253,9 +253,9 @@ public class MessageHelper { try { s = part.getContent().toString(); } catch (UnsupportedEncodingException ex) { - Log.w(Helper.TAG, part.getContentType() + "\n" + ex + "\n" + Log.getStackTraceString(ex)); - s = "Unsupported encoding: " + part.getContentType() + "\n\n"; - + throw new UnsupportedEncodingException(part.getContentType()); +/* + // https://javaee.github.io/javamail/FAQ#unsupen InputStream is = part.getInputStream(); ByteArrayOutputStream os = new ByteArrayOutputStream(); @@ -269,6 +269,7 @@ public class MessageHelper { } catch (UnsupportedEncodingException uex) { Log.w(Helper.TAG, uex + "\n" + Log.getStackTraceString(uex)); } +*/ } if (part.isMimeType("text/plain"))