Find collections when they're identical with their home set

app/src/main/java/at/bitfire/davdroid/DavService.java

@@ -228,7 +228,9 @@ public class DavService extends Service {
                     DavResource dav = new DavResource(httpClient, homeSet);
                     try {
                         dav.propfind(1, CollectionInfo.DAV_PROPERTIES);
-                        for (DavResource member : dav.members) {
+                        Set<DavResource> selfAndMembers = new HashSet<>(dav.members);
+                        selfAndMembers.add(dav);
+                        for (DavResource member : selfAndMembers) {
                             CollectionInfo info = CollectionInfo.fromDavResource(member);
                             info.confirmed = true;
                             App.log.log(Level.FINE, "Found collection", info);

app/src/main/java/at/bitfire/davdroid/ui/setup/DavResourceFinder.java

@@ -209,8 +209,11 @@ public class DavResourceFinder {
         // Does the collection refer to address book homesets?
         AddressbookHomeSet homeSets = (AddressbookHomeSet)dav.properties.get(AddressbookHomeSet.NAME);
         if (homeSets != null)
-            for (String href : homeSets.hrefs)
-                config.homeSets.add(UrlUtils.withTrailingSlash(dav.location.resolve(href)).uri());
+            for (String href : homeSets.hrefs) {
+                HttpUrl location = UrlUtils.withTrailingSlash(dav.location.resolve(href));
+                log.info("Found addressbook home-set at " + location);
+                config.homeSets.add(location.uri());
+            }
     }
 
     protected void rememberIfCalendarOrHomeset(@NonNull DavResource dav, @NonNull Configuration.ServiceInfo config) {