X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalytics%2FGoogleAnalytics4.java;fp=src%2Fjalview%2Fanalytics%2FGoogleAnalytics4.java;h=ba8a9209ead89218338fb254cd7231d75d902454;hb=d27e73b6519abfe5922ae716efe9a8dcc58c7751;hp=d2476627a702a7fa003aa035b61d9b924f9e5bd8;hpb=6d7f8d4aa0233a07520fe7c21645df8ae27e63ba;p=jalview.git diff --git a/src/jalview/analytics/GoogleAnalytics4.java b/src/jalview/analytics/GoogleAnalytics4.java index d247662..ba8a920 100644 --- a/src/jalview/analytics/GoogleAnalytics4.java +++ b/src/jalview/analytics/GoogleAnalytics4.java @@ -2,6 +2,7 @@ package jalview.analytics; import java.io.IOException; import java.io.OutputStream; +import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; @@ -10,6 +11,7 @@ import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.AbstractMap; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -294,10 +296,21 @@ public class GoogleAnalytics4 { sb.append('&'); } - sb.append(URLEncoder.encode(entry.getKey(), StandardCharsets.UTF_8)); + try + { + sb.append(URLEncoder.encode(entry.getKey(), "UTF-8")); + } catch (UnsupportedEncodingException e) + { + sb.append(entry.getKey()); + } sb.append('='); - sb.append( - URLEncoder.encode(entry.getValue(), StandardCharsets.UTF_8)); + try + { + sb.append(URLEncoder.encode(entry.getValue(), "UTF-8")); + } catch (UnsupportedEncodingException e) + { + sb.append(entry.getValue()); + } } return sb.toString(); } @@ -433,7 +446,9 @@ public class GoogleAnalytics4 } if (repeat >= 0 && whitespace != null) { - sb.append(whitespace.repeat(repeat)); + // sb.append(whitespace.repeat(repeat)); + sb.append(String.join("", Collections.nCopies(repeat, whitespace))); + } else {