Version bump to 0.6.1; show exceptions from resource detection (see #284, see #286)

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="at.bitfire.davdroid"
-    android:versionCode="38"
-    android:versionName="0.6" android:installLocation="internalOnly">
+    android:versionCode="39"
+    android:versionName="0.6.1" android:installLocation="internalOnly">
 
     <uses-sdk
         android:minSdkVersion="14"

src/at/bitfire/davdroid/Constants.java

@@ -9,7 +9,7 @@ package at.bitfire.davdroid;
 
 public class Constants {
 	public static final String
-		APP_VERSION = "0.6",
+		APP_VERSION = "0.6.1",
 		ACCOUNT_TYPE = "bitfire.at.davdroid",
 		WEB_URL_HELP = "http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app",
 		

src/at/bitfire/davdroid/syncadapter/QueryServerDialogFragment.java

@@ -220,7 +220,7 @@ public class QueryServerDialogFragment extends DialogFragment implements LoaderC
 		 * @param davCapability	DAV capability to check for ("addressbook", "calendar-access")
 		 * @return	WebDavResource of current-user-principal for the given service, or null if it can't be found or it is incapable
 		 */
-		private WebDavResource getCurrentUserPrincipal(WebDavResource resource, String serviceName, String davCapability) throws IOException {
+		private WebDavResource getCurrentUserPrincipal(WebDavResource resource, String serviceName, String davCapability) throws IOException, HttpException, DavException {
 			// look for well-known service (RFC 5785)
 			try {
 				WebDavResource wellKnown = new WebDavResource(resource, "/.well-known/" + serviceName);
@@ -238,20 +238,14 @@ public class QueryServerDialogFragment extends DialogFragment implements LoaderC
 				Log.d(TAG, "Well-known service detection failed at DAV level", e);
 			}
 
-			try {
-				// fall back to user-given initial context path 
-				resource.propfind(Mode.CURRENT_USER_PRINCIPAL);
-				if (resource.getCurrentUserPrincipal() != null) {
-					WebDavResource principal = new WebDavResource(resource, resource.getCurrentUserPrincipal());
-					if (checkCapabilities(principal, davCapability))
-						return principal;
-					else
-						Log.w(TAG, "Current-user-principal " + resource.getLocation() + " found at user-given location, but it doesn't support required DAV facilities");
-				}
-			} catch (HttpException e) {
-				Log.d(TAG, "Service detection failed with HTTP error", e);
-			} catch (DavException e) {
-				Log.d(TAG, "Service detection failed at DAV level", e);
+			// fall back to user-given initial context path 
+			resource.propfind(Mode.CURRENT_USER_PRINCIPAL);
+			if (resource.getCurrentUserPrincipal() != null) {
+				WebDavResource principal = new WebDavResource(resource, resource.getCurrentUserPrincipal());
+				if (checkCapabilities(principal, davCapability))
+					return principal;
+				else
+					Log.w(TAG, "Current-user-principal " + resource.getLocation() + " found at user-given location, but it doesn't support required DAV facilities");
 			}
 			return null;
 		}