From 0974b32ae667fcabd2ec4a16b3c155be4573cfae Mon Sep 17 00:00:00 2001 From: Sam Steele Date: Sat, 2 Mar 2013 23:39:07 -0800 Subject: [PATCH] Change the default file encoding to UTF-8 --- .settings/org.eclipse.core.resources.prefs | 6 ++---- src/com/irccloud/android/ColorFormatter.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 5fd04fbc8..0fca4a567 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,5 +1,3 @@ -#Fri Mar 01 12:50:54 PST 2013 +#Sat Mar 02 23:38:34 PST 2013 eclipse.preferences.version=1 -encoding//src/com/irccloud/android/CollapsedEventsList.java=UTF-8 -encoding//src/com/irccloud/android/EventsDataSource.java=UTF-8 -encoding//src/com/irccloud/android/MessageViewFragment.java=UTF-8 +encoding/=UTF-8 diff --git a/src/com/irccloud/android/ColorFormatter.java b/src/com/irccloud/android/ColorFormatter.java index 5015965de..da8d7b534 100644 --- a/src/com/irccloud/android/ColorFormatter.java +++ b/src/com/irccloud/android/ColorFormatter.java @@ -111,7 +111,7 @@ public final boolean acceptMatch(CharSequence s, int start, int end) { } }, null); //based on http://daringfireball.net/2010/07/improved_regex_for_matching_urls - Linkify.addLinks(output, Pattern.compile("https?://((?:|www\\d{0,3}[.]|[a-z0-9.\\-]+[.][a-z]{2,4}/)(?:[^\\s()<>]+|\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\))+(?:\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\)|[^\\s`!()\\[\\]{};:'\".,<>?]))"), null, null, null); + Linkify.addLinks(output, Pattern.compile("https?://((?:|www\\d{0,3}[.]|[a-z0-9.\\-]+[.][a-z]{2,4}/)(?:[^\\s()<>]+|\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\))+(?:\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\)|[^\\s`!()\\[\\]{};:'\".,<>?«»“”‘’]))"), null, null, null); Linkify.addLinks(output, Patterns.EMAIL_ADDRESS, "mailto:"); Linkify.addLinks(output, Pattern.compile("ircs?://[^<>\"()\\[\\],\\s]+"), null, null, new TransformFilter() { public final String transformUrl(final Matcher match, String url) {