Merge pull request #3248 from PhilippC/bugfix/urldecode-on-older-android-versions

PhilippC · web-flow · commit cf3bd9a8c145 · 2026-05-29T16:17:33.000+02:00
change URL-Decode to an overload which works on older Android versions
diff --git a/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/WebDavStorage.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/WebDavStorage.java
@@ -740,11 +740,12 @@ public String getDisplayName(String path) {
             ConnectionInfo ci = splitStringToConnectionInfo(path);
             try
             {
-                return java.net.URLDecoder.decode(ci.URL, StandardCharsets.UTF_8);
+                // don't use StandardCharsets.UTF_8, this is not compatible with older Android versions.
+                return java.net.URLDecoder.decode(ci.URL, "UTF-8");
             }
             catch (Exception e)
             {
-                return  ci.URL;
+                return ci.URL;
             }
         }
         catch (Exception e)

Original file line number	Diff line number	Diff line change
`@@ -740,11 +740,12 @@ public String getDisplayName(String path) {`
`740`	`740`	`ConnectionInfo ci = splitStringToConnectionInfo(path);`
`741`	`741`	`try`
`742`	`742`	`{`
`743`		`- return java.net.URLDecoder.decode(ci.URL, StandardCharsets.UTF_8);`
	`743`	`+ // don't use StandardCharsets.UTF_8, this is not compatible with older Android versions.`
	`744`	`+ return java.net.URLDecoder.decode(ci.URL, "UTF-8");`
`744`	`745`	`}`
`745`	`746`	`catch (Exception e)`
`746`	`747`	`{`
`747`		`- return ci.URL;`
	`748`	`+ return ci.URL;`
`748`	`749`	`}`
`749`	`750`	`}`
`750`	`751`	`catch (Exception e)`