Merge branch 'subtree'
authorNiki Roo <niki@nikiroo.be>
Tue, 5 May 2020 20:40:52 +0000 (22:40 +0200)
committerNiki Roo <niki@nikiroo.be>
Tue, 5 May 2020 20:40:52 +0000 (22:40 +0200)
1  2 
src/be/nikiroo/fanfix/Main.java
src/be/nikiroo/fanfix/VersionCheck.java
src/be/nikiroo/fanfix/bundles/Config.java

index b49cf0fb13e38338c293166027882e3df3876e67,2e8b6d17cdc7dc99b17353df55aefd469ef4a0a8..2e8b6d17cdc7dc99b17353df55aefd469ef4a0a8
@@@ -687,10 -687,13 +687,13 @@@ public class Main 
        }
  
        /**
-        * Will check if updates are available.
+        * Will check if updates are available, synchronously.
         * <p>
         * For this, it will simply forward the call to
         * {@link Main#checkUpdates(String)} with a value of "nikiroo/fanfix".
+        * <p>
+        * You may want to override it so you call the forward method with the right
+        * parameters (or also if you want it to be asynchronous).
         * 
         * @return the newer version information or NULL if nothing new
         */
index fc631b0a6d1f9d8326457606ff38e9884b5357b3,8b2a343f3cef331a2dbc059306586d6c2eaa83b7..8b2a343f3cef331a2dbc059306586d6c2eaa83b7
@@@ -127,7 -127,8 +127,8 @@@ public class VersionCheck 
                                InputStream in = null;
                                for (String url : new String[] { urlFrBE, urlFr, urlDefault }) {
                                        try {
-                                               in = Instance.getInstance().getCache().open(new URL(url), null, false);
+                                               in = Instance.getInstance().getCache().openNoCache(
+                                                               new URL(url), null, null, null, null);
                                                break;
                                        } catch (IOException e) {
                                        }
index 587851a2a00c6163cf5a8ff1eb93500bc09db03d,3af83c1d0ff995ecff9140723fd749f8c51449d4..3af83c1d0ff995ecff9140723fd749f8c51449d4
@@@ -16,7 -16,6 +16,6 @@@ public enum Config 
        @Meta(description = "The language to use for in the program (example: en-GB, fr-BE...) or nothing for default system language (can be overwritten with the variable $LANG)",//
        format = Format.LOCALE, list = { "en-GB", "fr-BE" })
        LANG, //
        @Meta(description = "File format options",//
        group = true)
        FILE_FORMAT, //