use debug.txt instead of debug; add pref to disable system proxy

benfry · benfry · commit 0c363ae7857c · 2016-12-01T07:38:19.000-05:00
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -141,11 +141,13 @@ static private void createAndShowGUI(String[] args) {
     Platform.init();
 
     // Set the debug flag based on a file being present in the settings folder
-    File debugFile = getSettingsFile("debug");
+    File debugFile = getSettingsFile("debug.txt");
+    /*
     if (debugFile.isDirectory()) {
       // if it's a directory, it's a leftover from older releases, clear it
       Util.removeDir(debugFile);
-    } else if (debugFile.exists()) {
+    } else*/
+    if (debugFile.exists()) {
       DEBUG = true;
     }
 
diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java
@@ -68,7 +68,7 @@ static public void init() {
       load(Base.getLibStream(DEFAULTS_FILE));
     } catch (Exception e) {
       Messages.showError(null, "Could not read default settings.\n" +
-                           "You'll need to reinstall Processing.", e);
+                         "You'll need to reinstall Processing.", e);
     }
 
     // Clone the defaults, then override any them with the user's preferences.
@@ -109,9 +109,12 @@ static public void init() {
     PApplet.useNativeSelect =
       Preferences.getBoolean("chooser.files.native"); //$NON-NLS-1$
 
-    // Use the system proxy settings by default
-    // https://github.com/processing/processing/issues/2643
-    System.setProperty("java.net.useSystemProxies", "true");
+    // Adding option to disable this in case it's getting in the way
+    if (get("proxy.system").equals("true")) {
+      // Use the system proxy settings by default
+      // https://github.com/processing/processing/issues/2643
+      System.setProperty("java.net.useSystemProxies", "true");
+    }
 
     // Set HTTP, HTTPS, and SOCKS proxies for individuals
     // who want/need to override the system setting
diff --git a/build/shared/lib/defaults.txt b/build/shared/lib/defaults.txt
@@ -347,6 +347,8 @@ proxy.socks.port=
 # Example of usage (replace 'http' with 'https' or 'socks' as needed)
 #proxy.http.host=proxy.example.com
 #proxy.http.port=8080
+# Whether to use the system proxy by default
+proxy.system=true
 
 # PDE X
 pdex.autoSave.autoSaveByDefault=true
diff --git a/todo.txt b/todo.txt
@@ -9,6 +9,7 @@ X   https://github.com/processing/processing/issues/3123
 X   https://github.com/processing/processing/issues/4735
 X move the DEBUG flag into an external file or preferences.txt
 X   will help us with debugging w/ others as well
+X   change to debug.txt; too confusing with the folder thing
 X replace java.util.logging code with built-in logging
 _ blank window on startup where the "welcome" screen should be
 _   https://github.com/processing/processing/issues/3933
