Changeset 6897 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-03-05T18:37:26+01:00 (11 years ago)

Author:

stoecker

Message:

see #9778 - use TLS for JOSM website access

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• BugReportExceptionHandler.java (modified) (4 diffs)
• OsmUrlToBounds.java (modified) (1 diff)
• WikiReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

@@ -162 +162 @@
                     tr("You have encountered an error in JOSM. Before you file a bug report " +
                             "make sure you have updated to the latest version of JOSM here:")), GBC.eol());
-            p.add(new UrlLabel(Main.JOSM_WEBSITE,2), GBC.eop().insets(8,0,0,0));
+            p.add(new UrlLabel(Main.getJOSMWebsite(),2), GBC.eop().insets(8,0,0,0));
             p.add(new JMultilineLabel(
                     tr("You should also update your plugins. If neither of those help please " +
@@ -174 +174 @@
                     tr("Alternatively, if that does not work you can manually fill in the information " +
                             "below at this URL:")), GBC.eol());
-            p.add(new UrlLabel(Main.JOSM_WEBSITE+"/newticket",2), GBC.eop().insets(8,0,0,0));
+            p.add(new UrlLabel(Main.getJOSMWebsite()+"/newticket",2), GBC.eop().insets(8,0,0,0));
             if (Utils.copyToClipboard(text)) {
                 p.add(new JLabel(tr("(The text has already been copied to your clipboard.)")), GBC.eop());
@@ -217 +217 @@
             Utils.close(gzip);
 
-            return new URL(Main.JOSM_WEBSITE+"/josmticket?" +
+            return new URL(Main.getJOSMWebsite()+"/josmticket?" +
                     "gdata="+Base64.encode(ByteBuffer.wrap(out.toByteArray()), true));
         } catch (IOException e) {
@@ -234 +234 @@
         URL url = getBugReportUrl(debugText);
         if (url != null) {
-            return new UrlLabel(url.toString(), Main.JOSM_WEBSITE+"/josmticket?...", 2);
+            return new UrlLabel(url.toString(), Main.getJOSMWebsite()+"/josmticket?...", 2);
         }
         return null;

trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

@@ -304 +304 @@
         double lon = (Math.round(dlon * decimals));
         lon /= decimals;
-        return Main.OSM_WEBSITE + "/#map="+zoom+"/"+lat+"/"+lon;
+        return Main.getOSMWebsite() + "/#map="+zoom+"/"+lat+"/"+lon;
     }
 }

trunk/src/org/openstreetmap/josm/tools/WikiReader.java

@@ -30 +30 @@
      */
     public WikiReader() {
-        this.baseurl = Main.pref.get("help.baseurl", Main.JOSM_WEBSITE);
+        this.baseurl = Main.pref.get("help.baseurl", Main.getJOSMWebsite());
     }
 
@@ -114 +114 @@
         String b = "";
         String full = "";
+        String baseurlus = baseurl.replace("https:","http:");
+        String baseurlse = baseurlus.replace("http:","https:");
         for (String line = in.readLine(); line != null; line = in.readLine()) {
             full += line;
@@ -136 +138 @@
                 b += line.replaceAll("<img ", "<img border=\"0\" ")
                          .replaceAll("<span class=\"icon\">.</span>", "")
-                         .replaceAll("href=\"/", "href=\"" + baseurl + "/")
+                         .replaceAll("href=\"/", "href=\"" + baseurlus + "/")
+                         .replaceAll("href=\"/", "href=\"" + baseurlse + "/")
                          .replaceAll(" />", ">")
                          + "\n";