Changeset 14671 in josm for trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

Timestamp:

2019-01-10T08:24:43+01:00 (5 years ago)

Author:

simon04

Message:

Status report: exclude file history, Overpass queries

File:

• trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -16 +16 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -40 +37 @@
 import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.spi.preferences.Setting;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.PlatformHookUnixoid;
@@ -277 +273 @@
         String reportHeader = getReportHeader();
         text.append(reportHeader);
-        Map<String, Setting<?>> settings = Preferences.main().getAllSettings();
-        Set<String> keys = new HashSet<>(settings.keySet());
-        for (String key : keys) {
-            // Remove sensitive information from status report
-            if (key.startsWith("marker.show") || key.contains("username") || key.contains("password") || key.contains("access-token")) {
-                settings.remove(key);
-            }
-        }
-        for (Entry<String, Setting<?>> entry : settings.entrySet()) {
-            text.append(paramCleanup(entry.getKey()))
-                .append('=')
-                .append(paramCleanup(entry.getValue().getValue().toString())).append('\n');
-        }
+
+        Preferences.main().getAllSettings().forEach((key, setting) -> {
+            if (key.startsWith("marker.show")
+                    || key.equals("file-open.history")
+                    || key.equals("download.overpass.query")
+                    || key.equals("download.overpass.queries")
+                    || key.contains("username")
+                    || key.contains("password")
+                    || key.contains("access-token")) {
+                // Remove sensitive information from status report
+                return;
+            }
+            text.append(paramCleanup(key))
+                    .append('=')
+                    .append(paramCleanup(setting.getValue().toString()))
+                    .append('\n');
+        });
 
         DebugTextDisplay ta = new DebugTextDisplay(text.toString());