Merge pull request #3682 from k9mail/fix_text_quote_creator (6e92370f) · Commits · e / os / Mail

app/core/src/main/java/com/fsck/k9/Core.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ import com.fsck.k9.mail.ssl.LocalKeyStore
		import com.fsck.k9.mailstore.mailStoreModule
		import com.fsck.k9.message.extractors.extractorModule
		import com.fsck.k9.message.html.htmlModule
		import com.fsck.k9.message.quote.quoteModule
		import com.fsck.k9.notification.coreNotificationModule
		import com.fsck.k9.power.DeviceIdleManager
		import com.fsck.k9.service.BootReceiver
		@@ -40,6 +41,7 @@ object Core : KoinComponent {
		mailStoreModule,
		extractorModule,
		htmlModule,
		quoteModule,
		coreNotificationModule,
		controllerModule
		)

app/core/src/main/java/com/fsck/k9/helper/Utility.java

+0 −140

Original line number	Diff line number	Diff line
		@@ -134,146 +134,6 @@ public class Utility {
		// }
		}

		/**
		* <p>Wraps a multiline string of text, identifying words by <code>' '</code>.</p>
		*
		* <p>New lines will be separated by the system property line separator.
		* Very long words, such as URLs will <i>not</i> be wrapped.</p>
		*
		* <p>Leading spaces on a new line are stripped.
		* Trailing spaces are not stripped.</p>
		*
		* <pre>
		* WordUtils.wrap(null, *) = null
		* WordUtils.wrap("", *) = ""
		* </pre>
		*
		* Adapted from the Apache Commons Lang library.
		* http://svn.apache.org/viewvc/commons/proper/lang
		* /trunk/src/main/java/org/apache/commons/lang3/text/WordUtils.java
		* SVN Revision 925967, Mon Mar 22 06:16:49 2010 UTC
		*
		* Licensed to the Apache Software Foundation (ASF) under one or more
		* contributor license agreements. See the NOTICE file distributed with
		* this work for additional information regarding copyright ownership.
		* The ASF licenses this file to You under the Apache License, Version 2.0
		* (the "License"); you may not use this file except in compliance with
		* the License. You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*
		* @param str the String to be word wrapped, may be null
		* @param wrapLength the column to wrap the words at, less than 1 is treated as 1
		* @return a line with newlines inserted, <code>null</code> if null input
		*/
		private static final String NEWLINE_REGEX = "(?:\\r?\\n)";
		public static String wrap(String str, int wrapLength) {
		StringBuilder result = new StringBuilder();
		for (String piece : str.split(NEWLINE_REGEX)) {
		result.append(wrap(piece, wrapLength, null, false));
		result.append("\r\n");
		}
		return result.toString();
		}

		/**
		* <p>Wraps a single line of text, identifying words by <code>' '</code>.</p>
		*
		* <p>Leading spaces on a new line are stripped.
		* Trailing spaces are not stripped.</p>
		*
		* <pre>
		* WordUtils.wrap(null, , , *) = null
		* WordUtils.wrap("", , , *) = ""
		* </pre>
		*
		* This is from the Apache Commons Lang library.
		* http://svn.apache.org/viewvc/commons/proper/lang
		* /trunk/src/main/java/org/apache/commons/lang3/text/WordUtils.java
		* SVN Revision 925967, Mon Mar 22 06:16:49 2010 UTC
		*
		* Licensed to the Apache Software Foundation (ASF) under one or more
		* contributor license agreements. See the NOTICE file distributed with
		* this work for additional information regarding copyright ownership.
		* The ASF licenses this file to You under the Apache License, Version 2.0
		* (the "License"); you may not use this file except in compliance with
		* the License. You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*
		* @param str the String to be word wrapped, may be null
		* @param wrapLength the column to wrap the words at, less than 1 is treated as 1
		* @param newLineStr the string to insert for a new line,
		* <code>null</code> uses the system property line separator
		* @param wrapLongWords true if long words (such as URLs) should be wrapped
		* @return a line with newlines inserted, <code>null</code> if null input
		*/
		public static String wrap(String str, int wrapLength, String newLineStr, boolean wrapLongWords) {
		if (str == null) {
		return null;
		}
		if (newLineStr == null) {
		newLineStr = "\r\n";
		}
		if (wrapLength < 1) {
		wrapLength = 1;
		}
		int inputLineLength = str.length();
		int offset = 0;
		StringBuilder wrappedLine = new StringBuilder(inputLineLength + 32);

		while ((inputLineLength - offset) > wrapLength) {
		if (str.charAt(offset) == ' ') {
		offset++;
		continue;
		}
		int spaceToWrapAt = str.lastIndexOf(' ', wrapLength + offset);

		if (spaceToWrapAt >= offset) {
		// normal case
		wrappedLine.append(str.substring(offset, spaceToWrapAt));
		wrappedLine.append(newLineStr);
		offset = spaceToWrapAt + 1;
		} else {
		// really long word or URL
		if (wrapLongWords) {
		// wrap really long word one line at a time
		wrappedLine.append(str.substring(offset, wrapLength + offset));
		wrappedLine.append(newLineStr);
		offset += wrapLength;
		} else {
		// do not wrap really long word, just extend beyond limit
		spaceToWrapAt = str.indexOf(' ', wrapLength + offset);
		if (spaceToWrapAt >= 0) {
		wrappedLine.append(str.substring(offset, spaceToWrapAt));
		wrappedLine.append(newLineStr);
		offset = spaceToWrapAt + 1;
		} else {
		wrappedLine.append(str.substring(offset));
		offset = inputLineLength;
		}
		}
		}
		}

		// Whatever is left in line is short enough to just pass through
		wrappedLine.append(str.substring(offset));

		return wrappedLine.toString();
		}

		/**
		* Extract the 'original' subject value, by ignoring leading
		* response/forward marker and '[XX]' formatted tags (as many mailing-list

app/core/src/main/java/com/fsck/k9/message/quote/HtmlQuoteCreator.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ public class HtmlQuoteCreator {
		CoreResourceProvider resourceProvider = DI.get(CoreResourceProvider.class);
		InsertableHtmlContent insertable = findInsertionPoints(messageBody);

		String sentDate = QuoteHelper.getSentDateText(resources, originalMessage);
		String sentDate = new QuoteHelper(resources).getSentDateText(originalMessage);
		String fromAddress = Address.toString(originalMessage.getFrom());
		if (quoteStyle == QuoteStyle.PREFIX) {
		StringBuilder header = new StringBuilder(QuoteHelper.QUOTE_BUFFER_LENGTH);

app/core/src/main/java/com/fsck/k9/message/quote/KoinModule.kt

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		package com.fsck.k9.message.quote

		import org.koin.dsl.module.applicationContext

		val quoteModule = applicationContext {
		factory { QuoteHelper(get()) }
		factory { TextQuoteCreator(get(), get()) }
		}

app/core/src/main/java/com/fsck/k9/message/quote/QuoteHelper.java

deleted100644 → 0

+0 −45

Original line number	Diff line number	Diff line
		package com.fsck.k9.message.quote;


		import java.text.DateFormat;
		import java.util.Date;
		import java.util.Locale;
		import java.util.TimeZone;

		import android.content.res.Resources;

		import com.fsck.k9.K9;
		import com.fsck.k9.mail.Message;


		class QuoteHelper {
		// amount of extra buffer to allocate to accommodate quoting headers or prefixes
		static final int QUOTE_BUFFER_LENGTH = 512;


		/**
		* Extract the date from a message and convert it into a locale-specific
		* date string suitable for use in a header for a quoted message.
		*
		* @return A string with the formatted date/time
		*/
		static String getSentDateText(Resources resources, Message message) {
		try {
		final int dateStyle = DateFormat.LONG;
		final int timeStyle = DateFormat.LONG;
		Date date = message.getSentDate();

		DateFormat dateFormat;
		if (K9.hideTimeZone()) {
		dateFormat = DateFormat.getDateTimeInstance(dateStyle, timeStyle, Locale.ROOT);
		dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
		} else {
		Locale locale = resources.getConfiguration().locale;
		dateFormat = DateFormat.getDateTimeInstance(dateStyle, timeStyle, locale);
		}
		return dateFormat.format(date);
		} catch (Exception e) {
		return "";
		}
		}
		}