Merge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4
authorBen Soares <b.soares@dundee.ac.uk>
Thu, 8 Jun 2023 16:21:28 +0000 (17:21 +0100)
committerBen Soares <b.soares@dundee.ac.uk>
Thu, 8 Jun 2023 16:21:28 +0000 (17:21 +0100)
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/analytics/GoogleAnalytics4.java [new file with mode: 0644]
src/jalview/bin/Cache.java
src/jalview/bin/Console.java
src/jalview/bin/Jalview.java
src/jalview/gui/Desktop.java
src/jalview/gui/SplashScreen.java

index 4200a46..7f5746e 100644 (file)
@@ -1452,6 +1452,8 @@ label.choose_tempfac_type = Choose Temperature Factor type
 label.interpret_tempfac_as = Interpret Temperature Factor as
 label.add_pae_matrix_file = Add PAE matrix file
 label.nothing_selected = Nothing selected
+prompt.google_analytics_title = Jalview Usage Statistics
+prompt.google_analytics = Do you want to help make Jalview better by enabling the collection of usage statistics with Google Analytics?\nYou can enable or disable usage tracking in the preferences.
 label.working_ellipsis = Working ... 
 action.show_groups_on_matrix = Show groups on matrix
 action.show_groups_on_matrix_tooltip = When enabled, clusters defined on the matrix's associated tree or below the assigned threshold are shown as different colours on the matrix annotation row
index b3c6988..a4594dc 100644 (file)
@@ -1434,3 +1434,5 @@ label.tftype_default = Default
 label.tftype_plddt = pLDDT
 label.add_pae_matrix_file = Añadir un fichero de matriz PAE
 label.nothing_selected = Nada seleccionado
+prompt.google_analytics_title = Jalview Estadísticas de Uso
+prompt.google_analytics = ¿Quiere ayudar a mejorar Jalview habilitando la recopilación de estadísticas de uso con Google Analytics?\nPuede habilitar o deshabilitar el seguimiento de uso en las preferencias.
diff --git a/src/jalview/analytics/GoogleAnalytics4.java b/src/jalview/analytics/GoogleAnalytics4.java
new file mode 100644 (file)
index 0000000..f7dd779
--- /dev/null
@@ -0,0 +1,501 @@
+package jalview.analytics;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
+
+import jalview.bin.Cache;
+import jalview.bin.Console;
+import jalview.util.ChannelProperties;
+
+public class GoogleAnalytics4
+{
+  private static final String JALVIEW_ID = "Jalview Desktop";
+
+  private static final String SESSION_ID = new Random().toString();
+
+  private static final String MEASUREMENT_ID = "G-6TMPHMXEQ0";
+
+  private static final String API_SECRET = "Qb9NSbqkRDqizG6j2BBJ2g";
+
+  // This will generate a different CLIENT_ID each time the application is
+  // launched. Do we want to store it in .jalview_properties?
+  private static final String CLIENT_ID = UUID.randomUUID().toString();
+
+  private static final String BASE_URL = "https://www.google-analytics.com/mp/collect";
+
+  private List<Map.Entry<String, String>> queryStringValues;
+
+  private List<Map.Entry<String, Object>> jsonObject;
+
+  private List<Event> events;
+
+  private List<Map.Entry<String, String>> cookieValues;
+
+  private static boolean ENABLED = false;
+
+  private static GoogleAnalytics4 instance = null;
+
+  private static final Map<String, String> defaultParams;
+
+  static
+  {
+    defaultParams = new HashMap<>();
+    defaultParams.put("app_name",
+            ChannelProperties.getProperty("app_name") + " Desktop");
+    defaultParams.put("version", Cache.getProperty("VERSION"));
+    defaultParams.put("build_date",
+            Cache.getDefault("BUILD_DATE", "unknown"));
+    defaultParams.put("java_version", System.getProperty("java.version"));
+    String val = System.getProperty("sys.install4jVersion");
+    if (val != null)
+    {
+      defaultParams.put("install4j_version", val);
+    }
+    val = System.getProperty("installer_template_version");
+    if (val != null)
+    {
+      defaultParams.put("install4j_template_version", val);
+    }
+    val = System.getProperty("launcher_version");
+    if (val != null)
+    {
+      defaultParams.put("launcher_version", val);
+    }
+    defaultParams.put("java_arch",
+            System.getProperty("os.arch") + " "
+                    + System.getProperty("os.name") + " "
+                    + System.getProperty("os.version"));
+  }
+
+  private GoogleAnalytics4()
+  {
+    this.resetLists();
+  }
+
+  public static void setEnabled(boolean b)
+  {
+    ENABLED = b;
+  }
+
+  /**
+   * The simplest way to send an analytic event.
+   * 
+   * @param eventName
+   *          The event name. To emulate a webpage view use "page_view" and set
+   *          a "page_location" parameter. See
+   *          https://developers.google.com/analytics/devguides/collection/ga4/events?client_type=gtag
+   * @param paramsStrings
+   *          Optional multiple Strings in key, value pairs (there should be an
+   *          even number of paramsStrings) to be set as parameters of the
+   *          event. To emulate a webpage view use "page_location" as the URL in
+   *          a "page_view" event.
+   */
+  public void sendAnalytics(String eventName, String... paramsStrings)
+  {
+    // clear out old lists
+    this.resetLists();
+
+    if (!ENABLED)
+    {
+      Console.debug("GoogleAnalytics4 not enabled.");
+      return;
+    }
+    Map<String, String> params = new HashMap<>();
+
+    // add these to all events from this application instance
+    params.putAll(defaultParams);
+
+    // add (and overwrite with) the passed in params
+    if (paramsStrings != null && paramsStrings.length > 0)
+    {
+      if (paramsStrings.length % 2 != 0)
+      {
+        Console.warn(
+                "Cannot addEvent with odd number of paramsStrings.  Ignoring the last one.");
+      }
+      for (int i = 0; i < paramsStrings.length - 1; i += 2)
+      {
+        String key = paramsStrings[i];
+        String value = paramsStrings[i + 1];
+        params.put(key, value);
+      }
+    }
+
+    addEvent(eventName, params);
+    addQueryStringValue("measurement_id", MEASUREMENT_ID);
+    addQueryStringValue("api_secret", API_SECRET);
+    addJsonValue("client_id", CLIENT_ID);
+    addJsonValues("events", Event.toObjectList(events));
+    StringBuilder urlSb = new StringBuilder();
+    urlSb.append(BASE_URL);
+    urlSb.append('?');
+    urlSb.append(buildQueryString());
+    try
+    {
+      URL url = new URL(urlSb.toString());
+      URLConnection urlConnection = url.openConnection();
+      HttpURLConnection httpURLConnection = (HttpURLConnection) urlConnection;
+      httpURLConnection.setRequestMethod("POST");
+      httpURLConnection.setDoOutput(true);
+
+      String jsonString = buildJson();
+
+      Console.debug("GA4: HTTP Request is: '" + urlSb.toString() + "'");
+      Console.debug("GA4: POSTed JSON is:\n" + jsonString);
+
+      byte[] jsonBytes = jsonString.getBytes(StandardCharsets.UTF_8);
+      int jsonLength = jsonBytes.length;
+
+      httpURLConnection.setFixedLengthStreamingMode(jsonLength);
+      httpURLConnection.setRequestProperty("Content-Type",
+              "application/json; charset=UTF-8");
+      httpURLConnection.connect();
+      try (OutputStream os = httpURLConnection.getOutputStream())
+      {
+        os.write(jsonBytes);
+      }
+      int responseCode = httpURLConnection.getResponseCode();
+      String responseMessage = httpURLConnection.getResponseMessage();
+      if (responseCode < 200 || responseCode > 299)
+      {
+        Console.warn("GoogleAnalytics4 connection failed: '" + responseCode
+                + " " + responseMessage + "'");
+      }
+      else
+      {
+        Console.debug("GoogleAnalytics4 connection succeeded: '"
+                + responseCode + " " + responseMessage + "'");
+      }
+    } catch (MalformedURLException e)
+    {
+      Console.debug(
+              "Somehow the GoogleAnalytics4 BASE_URL and queryString is malformed.",
+              e);
+      return;
+    } catch (IOException e)
+    {
+      Console.debug("Connection to GoogleAnalytics4 BASE_URL '" + BASE_URL
+              + "' failed.", e);
+    } catch (ClassCastException e)
+    {
+      Console.debug(
+              "Couldn't cast URLConnection to HttpURLConnection in GoogleAnalytics4.",
+              e);
+    }
+  }
+
+  public void addEvent(String name, Map<String, String> params)
+  {
+    Event event = new Event(name);
+    if (params != null && params.size() > 0)
+    {
+      for (String key : params.keySet())
+      {
+        String value = params.get(key);
+        event.addParam(key, value);
+      }
+    }
+    events.add(event);
+  }
+
+  private void addJsonObject(String key,
+          List<Map.Entry<String, Object>> object)
+  {
+    jsonObject.add(objectEntry(key, object));
+  }
+
+  private void addJsonValues(String key, List<Object> values)
+  {
+    jsonObject.add(objectEntry(key, values));
+  }
+
+  private void addJsonValue(String key, String value)
+  {
+    jsonObject.add(objectEntry(key, value));
+  }
+
+  private void addJsonValue(String key, int value)
+  {
+    jsonObject.add(objectEntry(key, Integer.valueOf(value)));
+  }
+
+  private void addJsonValue(String key, boolean value)
+  {
+    jsonObject.add(objectEntry(key, Boolean.valueOf(value)));
+  }
+
+  private void addQueryStringValue(String key, String value)
+  {
+    queryStringValues.add(stringEntry(key, value));
+  }
+
+  private void addCookieValue(String key, String value)
+  {
+    cookieValues.add(stringEntry(key, value));
+  }
+
+  private void resetLists()
+  {
+    jsonObject = new ArrayList<>();
+    events = new ArrayList<Event>();
+    queryStringValues = new ArrayList<>();
+    cookieValues = new ArrayList<>();
+  }
+
+  public static GoogleAnalytics4 getInstance()
+  {
+    if (instance == null)
+    {
+      instance = new GoogleAnalytics4();
+    }
+    return instance;
+  }
+
+  public static void reset()
+  {
+    getInstance().resetLists();
+  }
+
+  private String buildQueryString()
+  {
+    StringBuilder sb = new StringBuilder();
+    for (Map.Entry<String, String> entry : queryStringValues)
+    {
+      if (sb.length() > 0)
+      {
+        sb.append('&');
+      }
+      sb.append(URLEncoder.encode(entry.getKey(), StandardCharsets.UTF_8));
+      sb.append('=');
+      sb.append(
+              URLEncoder.encode(entry.getValue(), StandardCharsets.UTF_8));
+    }
+    return sb.toString();
+  }
+
+  private void buildCookieHeaders()
+  {
+    // TODO not needed yet
+  }
+
+  private String buildJson()
+  {
+    StringBuilder sb = new StringBuilder();
+    addJsonObject(sb, 0, jsonObject);
+    return sb.toString();
+  }
+
+  private void addJsonObject(StringBuilder sb, int indent,
+          List<Map.Entry<String, Object>> entries)
+  {
+    indent(sb, indent);
+    sb.append('{');
+    newline(sb);
+    Iterator<Map.Entry<String, Object>> entriesI = entries.iterator();
+    while (entriesI.hasNext())
+    {
+      Map.Entry<String, Object> entry = entriesI.next();
+      String key = entry.getKey();
+      // TODO sensibly escape " characters in key
+      Object value = entry.getValue();
+      indent(sb, indent + 1);
+      sb.append('"').append(quoteEscape(key)).append('"').append(':');
+      space(sb);
+      if (value != null && value instanceof List)
+      {
+        newline(sb);
+      }
+      addJsonValue(sb, indent + 2, value);
+      if (entriesI.hasNext())
+      {
+        sb.append(',');
+      }
+      newline(sb);
+    }
+    indent(sb, indent);
+    sb.append('}');
+  }
+
+  private void addJsonValue(StringBuilder sb, int indent, Object value)
+  {
+    if (value == null)
+    {
+      return;
+    }
+    try
+    {
+      if (value instanceof Map.Entry)
+      {
+        Map.Entry<String, Object> entry = (Map.Entry<String, Object>) value;
+        List<Map.Entry<String, Object>> object = new ArrayList<>();
+        object.add(entry);
+        addJsonObject(sb, indent, object);
+      }
+      else if (value instanceof List)
+      {
+        // list of Map.Entries or list of values?
+        List<Object> valueList = (List<Object>) value;
+        if (valueList.size() > 0 && valueList.get(0) instanceof Map.Entry)
+        {
+          // entries
+          // indent(sb, indent);
+          List<Map.Entry<String, Object>> entryList = (List<Map.Entry<String, Object>>) value;
+          addJsonObject(sb, indent, entryList);
+        }
+        else
+        {
+          // values
+          indent(sb, indent);
+          sb.append('[');
+          newline(sb);
+          Iterator<Object> valueListI = valueList.iterator();
+          while (valueListI.hasNext())
+          {
+            Object v = valueListI.next();
+            addJsonValue(sb, indent + 1, v);
+            if (valueListI.hasNext())
+            {
+              sb.append(',');
+            }
+            newline(sb);
+          }
+          indent(sb, indent);
+          sb.append("]");
+        }
+      }
+      else if (value instanceof String)
+      {
+        sb.append('"').append(quoteEscape((String) value)).append('"');
+      }
+      else if (value instanceof Integer)
+      {
+        sb.append(((Integer) value).toString());
+      }
+      else if (value instanceof Boolean)
+      {
+        sb.append('"').append(((Boolean) value).toString()).append('"');
+      }
+    } catch (ClassCastException e)
+    {
+      Console.debug(
+              "Could not deal with type of json Object " + value.toString(),
+              e);
+    }
+  }
+
+  private static String quoteEscape(String s)
+  {
+    if (s == null)
+    {
+      return null;
+    }
+    // this escapes quotation marks (") that aren't already escaped (in the
+    // string) ready to go into a quoted JSON string value
+    return s.replaceAll("((?<!\\\\)(?:\\\\{2})*)\"", "$1\\\\\"");
+  }
+
+  private static void prettyWhitespace(StringBuilder sb, String whitespace,
+          int repeat)
+  {
+    // only add whitespace if we're in DEBUG mode
+    if (!Console.getLogger().isDebugEnabled())
+    {
+      return;
+    }
+    if (repeat >= 0 && whitespace != null)
+    {
+      sb.append(whitespace.repeat(repeat));
+    }
+    else
+    {
+      sb.append(whitespace);
+    }
+  }
+
+  private static void indent(StringBuilder sb, int indent)
+  {
+    prettyWhitespace(sb, "  ", indent);
+  }
+
+  private static void newline(StringBuilder sb)
+  {
+    prettyWhitespace(sb, "\n", -1);
+  }
+
+  private static void space(StringBuilder sb)
+  {
+    prettyWhitespace(sb, " ", -1);
+  }
+
+  protected static Map.Entry<String, Object> objectEntry(String s, Object o)
+  {
+    return new AbstractMap.SimpleEntry<String, Object>(s, o);
+  }
+
+  protected static Map.Entry<String, String> stringEntry(String s, String v)
+  {
+    return new AbstractMap.SimpleEntry<String, String>(s, v);
+  }
+}
+
+class Event
+{
+  private String name;
+
+  private List<Map.Entry<String, String>> params;
+
+  @SafeVarargs
+  public Event(String name, Map.Entry<String, String>... paramEntries)
+  {
+    this.name = name;
+    this.params = new ArrayList<Map.Entry<String, String>>();
+    for (Map.Entry<String, String> paramEntry : paramEntries)
+    {
+      if (paramEntry == null)
+      {
+        continue;
+      }
+      params.add(paramEntry);
+    }
+  }
+
+  public void addParam(String param, String value)
+  {
+    params.add(GoogleAnalytics4.stringEntry(param, value));
+  }
+
+  protected List<Map.Entry<String, Object>> toObject()
+  {
+    List<Map.Entry<String, Object>> object = new ArrayList<>();
+    object.add(GoogleAnalytics4.objectEntry("name", (Object) name));
+    if (params.size() > 0)
+    {
+      object.add(GoogleAnalytics4.objectEntry("params", (Object) params));
+    }
+    return object;
+  }
+
+  protected static List<Object> toObjectList(List<Event> events)
+  {
+    List<Object> eventObjectList = new ArrayList<>();
+    for (Event event : events)
+    {
+      eventObjectList.add((Object) event.toObject());
+    }
+    return eventObjectList;
+  }
+}
index 5aab0ec..75166da 100755 (executable)
@@ -52,6 +52,7 @@ import java.util.TreeSet;
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
 
+import jalview.analytics.GoogleAnalytics4;
 import jalview.datamodel.PDBEntry;
 import jalview.gui.Preferences;
 import jalview.gui.UserDefinedColours;
@@ -962,93 +963,125 @@ public class Cache
 
   protected static Class jgoogleanalyticstracker = null;
 
+  private static boolean useGA4 = true;
+
   /**
    * Initialise the google tracker if it is not done already.
    */
   public static void initGoogleTracker()
   {
-    if (tracker == null)
+    if (useGA4)
+    {
+      GoogleAnalytics4.setEnabled(true);
+
+      String appName = ChannelProperties.getProperty("app_name")
+              + " Desktop";
+      String version = Cache.getProperty("VERSION") + "_"
+              + Cache.getDefault("BUILD_DATE", "unknown");
+      String path = "/"
+              + String.join("/", appName, version, APPLICATION_STARTED);
+      GoogleAnalytics4 ga4 = GoogleAnalytics4.getInstance();
+
+      // This will add a page_view similar to the old UA analytics.
+      // We probably want to get rid of this once the application_launch event
+      // is being processed properly.
+      ga4.sendAnalytics("page_view", "page_location", path, "page_title",
+              APPLICATION_STARTED);
+
+      // This will send a new "application_launch" event with parameters
+      // including the old-style "path", the channel name and version
+      ga4.sendAnalytics("application_launch", "page_location", path);
+    }
+    else
     {
-      if (jgoogleanalyticstracker == null)
+      if (tracker == null)
       {
-        // try to get the tracker class
+        if (jgoogleanalyticstracker == null)
+        {
+          // try to get the tracker class
+          try
+          {
+            jgoogleanalyticstracker = Cache.class.getClassLoader()
+                    .loadClass(
+                            "com.boxysystems.jgoogleanalytics.JGoogleAnalyticsTracker");
+            trackerfocus = Cache.class.getClassLoader().loadClass(
+                    "com.boxysystems.jgoogleanalytics.FocusPoint");
+          } catch (Exception e)
+          {
+            Console.debug(
+                    "com.boxysystems.jgoogleanalytics package is not present - tracking not enabled.");
+            tracker = null;
+            jgoogleanalyticstracker = null;
+            trackerfocus = null;
+            return;
+          }
+        }
+        // now initialise tracker
+        Exception re = null, ex = null;
+        Error err = null;
+        String vrs = "No Version Accessible";
         try
         {
-          jgoogleanalyticstracker = Cache.class.getClassLoader().loadClass(
-                  "com.boxysystems.jgoogleanalytics.JGoogleAnalyticsTracker");
-          trackerfocus = Cache.class.getClassLoader()
-                  .loadClass("com.boxysystems.jgoogleanalytics.FocusPoint");
+          // Google analytics tracking code for Library Finder
+          tracker = jgoogleanalyticstracker
+                  .getConstructor(new Class[]
+                  { String.class, String.class, String.class })
+                  .newInstance(new Object[]
+                  { ChannelProperties.getProperty("app_name") + " Desktop",
+                      (vrs = Cache.getProperty("VERSION") + "_"
+                              + Cache.getDefault("BUILD_DATE", "unknown")),
+                      "UA-9060947-1" });
+          jgoogleanalyticstracker
+                  .getMethod("trackAsynchronously", new Class[]
+                  { trackerfocus })
+                  .invoke(tracker, new Object[]
+                  { trackerfocus
+                          .getConstructor(new Class[]
+                          { String.class })
+                          .newInstance(new Object[]
+                          { APPLICATION_STARTED }) });
+        } catch (RuntimeException e)
+        {
+          re = e;
         } catch (Exception e)
         {
-          Console.debug(
-                  "com.boxysystems.jgoogleanalytics package is not present - tracking not enabled.");
-          tracker = null;
-          jgoogleanalyticstracker = null;
-          trackerfocus = null;
-          return;
-        }
-      }
-      // now initialise tracker
-      Exception re = null, ex = null;
-      Error err = null;
-      String vrs = "No Version Accessible";
-      try
-      {
-        // Google analytics tracking code for Library Finder
-        tracker = jgoogleanalyticstracker
-                .getConstructor(new Class[]
-                { String.class, String.class, String.class })
-                .newInstance(new Object[]
-                { ChannelProperties.getProperty("app_name") + " Desktop",
-                    (vrs = Cache.getProperty("VERSION") + "_"
-                            + Cache.getDefault("BUILD_DATE", "unknown")),
-                    "UA-9060947-1" });
-        jgoogleanalyticstracker
-                .getMethod("trackAsynchronously", new Class[]
-                { trackerfocus })
-                .invoke(tracker, new Object[]
-                { trackerfocus.getConstructor(new Class[] { String.class })
-                        .newInstance(new Object[]
-                        { "Application Started." }) });
-      } catch (RuntimeException e)
-      {
-        re = e;
-      } catch (Exception e)
-      {
-        ex = e;
-      } catch (Error e)
-      {
-        err = e;
-      }
-      if (re != null || ex != null || err != null)
-      {
-        if (re != null)
+          ex = e;
+        } catch (Error e)
         {
-          Console.debug("Caught runtime exception in googletracker init:",
-                  re);
+          err = e;
         }
-        if (ex != null)
+        if (re != null || ex != null || err != null)
         {
-          Console.warn(
-                  "Failed to initialise GoogleTracker for Jalview Desktop with version "
-                          + vrs,
-                  ex);
+          if (re != null)
+          {
+            Console.debug("Caught runtime exception in googletracker init:",
+                    re);
+          }
+          if (ex != null)
+          {
+            Console.warn(
+                    "Failed to initialise GoogleTracker for Jalview Desktop with version "
+                            + vrs,
+                    ex);
+          }
+          if (err != null)
+          {
+            Console.error(
+                    "Whilst initing GoogleTracker for Jalview Desktop version "
+                            + vrs,
+                    err);
+          }
         }
-        if (err != null)
+        else
         {
-          Console.error(
-                  "Whilst initing GoogleTracker for Jalview Desktop version "
-                          + vrs,
-                  err);
+          Console.debug("Successfully initialised tracker.");
         }
       }
-      else
-      {
-        Console.debug("Successfully initialised tracker.");
-      }
     }
   }
 
+  private static final String APPLICATION_STARTED = "Application Started.";
+
   /**
    * get the user's default colour if available
    * 
@@ -1478,10 +1511,11 @@ public class Cache
                 if (customProxySet &&
                 // we have a username but no password for the scheme being
                 // requested
-                (protocol.equalsIgnoreCase("http")
-                        && (httpUser != null && httpUser.length() > 0
-                                && (httpPassword == null
-                                        || httpPassword.length == 0)))
+                        (protocol.equalsIgnoreCase("http")
+                                && (httpUser != null
+                                        && httpUser.length() > 0
+                                        && (httpPassword == null
+                                                || httpPassword.length == 0)))
                         || (protocol.equalsIgnoreCase("https")
                                 && (httpsUser != null
                                         && httpsUser.length() > 0
index 4b18484..30fd530 100644 (file)
@@ -220,6 +220,11 @@ public class Console
     return JLogger.toLevel(level);
   }
 
+  public static JLogger getLogger()
+  {
+    return log;
+  }
+
   public static boolean initLogger()
   {
     return initLogger(null);
@@ -236,9 +241,13 @@ public class Console
       JLogger.LogLevel logLevel = JLogger.LogLevel.INFO;
 
       if (JLogger.isLevel(providedLogLevel))
+      {
         logLevel = Console.getLogLevel(providedLogLevel);
+      }
       else
+      {
         logLevel = getCachedLogLevel();
+      }
 
       if (!Platform.isJS())
       {
index 6d2866a..3a733f3 100755 (executable)
@@ -1595,10 +1595,9 @@ public class Jalview
      * start a User Config prompt asking if we can log usage statistics.
      */
     PromptUserConfig prompter = new PromptUserConfig(Desktop.desktop,
-            "USAGESTATS", "Jalview Usage Statistics",
-            "Do you want to help make Jalview better by enabling "
-                    + "the collection of usage statistics with Google Analytics ?"
-                    + "\n\n(you can enable or disable usage tracking in the preferences)",
+            "USAGESTATS",
+            MessageManager.getString("prompt.google_analytics_title"),
+            MessageManager.getString("prompt.google_analytics"),
             new Runnable()
             {
               @Override
index bfd700f..cfc56b2 100644 (file)
@@ -536,6 +536,9 @@ public class Desktop extends jalview.jbgui.GDesktop
       setBounds(xPos, yPos, 900, 650);
     }
 
+    // start dialogue queue for single dialogues
+    startDialogQueue();
+
     if (!Platform.isJS())
     /**
      * Java only
@@ -3051,7 +3054,7 @@ public class Desktop extends jalview.jbgui.GDesktop
   /**
    * pause the queue
    */
-  private java.util.concurrent.Semaphore block = new Semaphore(0);
+  private Semaphore block = new Semaphore(0);
 
   private static groovy.ui.Console groovyConsole;
 
@@ -3069,12 +3072,7 @@ public class Desktop extends jalview.jbgui.GDesktop
       {
         if (dialogPause)
         {
-          try
-          {
-            block.acquire();
-          } catch (InterruptedException x)
-          {
-          }
+          acquireDialogQueue();
         }
         if (instance == null)
         {
@@ -3092,12 +3090,41 @@ public class Desktop extends jalview.jbgui.GDesktop
     });
   }
 
+  private boolean dialogQueueStarted = false;
+
   public void startDialogQueue()
   {
+    if (dialogQueueStarted)
+    {
+      return;
+    }
     // set the flag so we don't pause waiting for another permit and semaphore
     // the current task to begin
-    dialogPause = false;
+    releaseDialogQueue();
+    dialogQueueStarted = true;
+  }
+
+  public void acquireDialogQueue()
+  {
+    try
+    {
+      block.acquire();
+      dialogPause = true;
+    } catch (InterruptedException e)
+    {
+      jalview.bin.Console.debug("Interruption when acquiring DialogueQueue",
+              e);
+    }
+  }
+
+  public void releaseDialogQueue()
+  {
+    if (!dialogPause)
+    {
+      return;
+    }
     block.release();
+    dialogPause = false;
   }
 
   /**
index 61273c7..0b7af0d 100755 (executable)
@@ -113,6 +113,7 @@ public class SplashScreen extends JPanel
    */
   public SplashScreen(boolean isTransient)
   {
+    Desktop.instance.acquireDialogQueue();
     this.transientDialog = isTransient;
 
     if (Platform.isJS()) // BH 2019
@@ -323,7 +324,7 @@ public class SplashScreen extends JPanel
     }
 
     closeSplash();
-    Desktop.instance.startDialogQueue();
+    Desktop.instance.releaseDialogQueue();
   }
 
   /**