Fixed creation of store URIs when a "path" was used.

thunderbird · Nov 30, 2011 · 07caf62 · 07caf62
1 parent e6d98bc
commit 07caf62
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/com/fsck/k9/mail/store/ImapStore.java b/src/com/fsck/k9/mail/store/ImapStore.java
@@ -280,9 +280,9 @@ public static String createUri(ServerSettings server) {
         String userInfo = authType.toString() + ":" + userEnc + ":" + passwordEnc;
         try {
             Map<String, String> extra = server.getExtra();
-            String prefix = (extra != null) ? extra.get(ImapStoreSettings.PATH_PREFIX_KEY) : null;
+            String path = (extra != null) ? "/" + extra.get(ImapStoreSettings.PATH_PREFIX_KEY) : null;
             return new URI(scheme, userInfo, server.host, server.port,
-                prefix,
+                path,
                 null, null).toString();
         } catch (URISyntaxException e) {
             throw new IllegalArgumentException("Can't create ImapStore URI", e);

diff --git a/src/com/fsck/k9/mail/store/WebDavStore.java b/src/com/fsck/k9/mail/store/WebDavStore.java
@@ -242,9 +242,9 @@ public static String createUri(ServerSettings server) {
             authPath = (authPath != null) ? authPath : "";
             String mailboxPath = extra.get(WebDavStoreSettings.MAILBOX_PATH_KEY);
             mailboxPath = (mailboxPath != null) ? mailboxPath : "";
-            uriPath = path + "|" + authPath + "|" + mailboxPath;
+            uriPath = "/" + path + "|" + authPath + "|" + mailboxPath;
         } else {
-            uriPath = "||";
+            uriPath = "/||";
         }
 
         try {