better contrib type specifier; a few more notes about update checks

Author: benfry

app/src/processing/app/UpdateCheck.java

@@ -3,7 +3,7 @@
 /*
   Part of the Processing project - http://processing.org
 
-  Copyright (c) 2005-15 Ben Fry and Casey Reas
+  Copyright (c) 2005-23 Ben Fry and Casey Reas
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -36,25 +36,28 @@
 
 /**
  * Threaded class to check for updates in the background.
- * <P>
+ * <p/>
  * This is the class that handles the mind control and stuff for
  * spying on our users and stealing their personal information.
  * A random ID number is generated for each user, and hits the server
  * to check for updates. Also included is the operating system and
  * its version and the version of Java being used to run Processing.
- * <P>
+ * <p/>
+ * You can read more about this code
+ * <a href="https://github.com/processing/processing4/wiki/FAQ#checking-for-updates">here</a>.
+ * <p/>
  * Aside from the privacy invasion of knowing that an anonymous Processing
  * user opened the software at one time during a 24-hour period somewhere
  * in the world, we use the ID number to give us a general idea of how many
  * people are using Processing, which helps us when writing grant proposals
  * and that kind of thing so that we can keep Processing free. The numbers
- * are also sometimes used in ugly charts when Ben and Casey present.
+ * are also sometimes shown in ugly charts presented by Ben and Casey.
  */
 public class UpdateCheck {
   private final Base base;
 
-  static private final String DOWNLOAD_URL = "http://processing.org/download/";
-  static private final String LATEST_URL = "http://processing.org/download/latest.txt";
+  static private final String DOWNLOAD_URL = "https://processing.org/download/";
+  static private final String LATEST_URL = "https://processing.org/download/latest.txt";
 
   static private final long ONE_DAY = 24 * 60 * 60 * 1000;
 

app/src/processing/app/contrib/AvailableContribution.java

@@ -85,17 +85,6 @@ public AvailableContribution(ContributionType type, StringDict params) {
   }
 
 
-  static ContributionType matchContribType(String path) {
-    String filename = path.substring(path.lastIndexOf('/') + 1);
-    for (ContributionType type : ContributionType.values()) {
-      if (filename.equals(type.getPropertiesName())) {
-        return type;
-      }
-    }
-    return null;
-  }
-
-
   /**
    * Create an AvailableContribution object from the .properties file
    * found in the specified zip file. Or return null if no match.
@@ -107,7 +96,7 @@ static private AvailableContribution findContrib(File contribArchive) throws IOE
         ZipEntry entry = entries.nextElement();
         String entryPath = entry.getName();
         if (entryPath.endsWith(".properties")) {
-          ContributionType type = matchContribType(entryPath);
+          ContributionType type = ContributionType.fromFilePath(entryPath);
           if (type != null) {
             String[] lines = PApplet.loadStrings(zf.getInputStream(entry));
             if (lines != null) {

app/src/processing/app/contrib/ContributionListing.java

@@ -280,11 +280,6 @@ public void downloadAvailableList(final Base base,
   }
 
 
-  protected boolean isDownloaded() {
-    return listDownloaded;
-  }
-
-
   // Thread: EDT
   private void loadAvailableList(File file) {
     listingFile = file;
@@ -317,7 +312,7 @@ private void loadAvailableList(File file) {
    * Bundles information about what contribs are installed, so that they can
    * be reported at the <a href="https://download.processing.org/stats/">stats</a> link.
    * (Eventually this may also be used to show relative popularity of contribs.)
-   * Read more about it <a href="https://github.com/processing/processing4/wiki/FAQ#checking-for-updates-or-why-is-processing-connecting-to-the-network">in the FAQ</a>.</a>
+   * Read more about it <a href="<a href="https://github.com/processing/processing4/wiki/FAQ#checking-for-updates">here</a>.">in the FAQ</a>.
    */
   private byte[] makeContribsBlob(Base base) {
     Set<Contribution> contribs = base.getInstalledContribs();

app/src/processing/app/contrib/ContributionType.java

@@ -105,6 +105,21 @@ static public ContributionType fromName(String s) {
   }
 
 
+  /**
+   * Identify a ContributionType from a .properties file name or path.
+   * If passed 'blah/potato/library.properties' returns LIBRARY, etc.
+   */
+  static public ContributionType fromFilePath(String path) {
+    String filename = path.substring(path.lastIndexOf('/') + 1);
+    for (ContributionType type : ContributionType.values()) {
+      if (filename.equals(type.getPropertiesName())) {
+        return type;
+      }
+    }
+    return null;
+  }
+
+
   public File getSketchbookFolder() {
     return switch (this) {
       case LIBRARY -> Base.getSketchbookLibrariesFolder();