Merge pull request #2785 from PhilippC/bugfix/webdav-fileselect-not-working-always

PhilippC · web-flow · commit ae35d5873adf · 2025-03-04T12:25:26.000+01:00
Bugfix: Webdav username and password could got lost during file selection
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
@@ -304,6 +304,11 @@ public List<FileEntry> listFiles(String parentPath, int depth) throws Exception
                         //relative path:
                         e.path = buildPathFromHref(parentPath, r.href);
                     }
+                    if ( (parentPath.indexOf("@") != -1) && (e.path.indexOf("@") == -1))
+                    {
+                        //username/password not contained in .href response. Add it back from parentPath:
+                        e.path = parentPath.substring(0, parentPath.indexOf("@")+1) + e.path.substring(e.path.indexOf("://")+3);
+                    }
 
                     if ((depth == 1) && e.isDirectory)
                     {

Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,11 @@ public List<FileEntry> listFiles(String parentPath, int depth) throws Exception`
`304`	`304`	`//relative path:`
`305`	`305`	`e.path = buildPathFromHref(parentPath, r.href);`
`306`	`306`	`}`
	`307`	`+ if ( (parentPath.indexOf("@") != -1) && (e.path.indexOf("@") == -1))`
	`308`	`+ {`
	`309`	`+ //username/password not contained in .href response. Add it back from parentPath:`
	`310`	`+ e.path = parentPath.substring(0, parentPath.indexOf("@")+1) + e.path.substring(e.path.indexOf("://")+3);`
	`311`	`+ }`
`307`	`312`
`308`	`313`	`if ((depth == 1) && e.isDirectory)`
`309`	`314`	`{`