arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-01-11 08:10:58 +00:00
Code Issues Releases Wiki Activity

Version 0.9.1.1

Browse Source 
* resource detection: ignore 404 errors when trying context paths
* work around crash when edit field is changed while there is no acitivity (???!)
* dav4android: fix calendar-multiget request
This commit is contained in:
Ricki Hirner 2015-11-16 13:15:57 +01:00
parent 0f0acd62a3
commit e5ebf10dc0
No known key found for this signature in database
GPG Key ID: C4A212CF0B2B4566
4 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -18,7 +18,7 @@ android {
targetSdkVersion 22
versionCode 84
versionName "0.9.1"
versionName "0.9.1.1"
buildConfigField "java.util.Date", "buildTime", "new java.util.Date()"
}

28
app/src/main/java/at/bitfire/davdroid/resource/DavResourceFinder.java
View File

@ -35,6 +35,7 @@ import at.bitfire.dav4android.DavResource;
import at.bitfire.dav4android.UrlUtils;
import at.bitfire.dav4android.exception.DavException;
import at.bitfire.dav4android.exception.HttpException;
import at.bitfire.dav4android.exception.NotFoundException;
import at.bitfire.dav4android.property.AddressbookDescription;
import at.bitfire.dav4android.property.AddressbookHomeSet;
import at.bitfire.dav4android.property.CalendarColor;
@ -413,20 +414,23 @@ public class DavResourceFinder {
paths.add("/");
}
for (String path : paths) {
if (!TextUtils.isEmpty(scheme) && !TextUtils.isEmpty(fqdn) && port != null && paths != null) {
HttpUrl initialContextPath = new HttpUrl.Builder()
.scheme(scheme)
.host(fqdn).port(port)
.encodedPath(path)
.build();
for (String path : paths)
try {
if (!TextUtils.isEmpty(scheme) && !TextUtils.isEmpty(fqdn) && port != null && paths != null) {
HttpUrl initialContextPath = new HttpUrl.Builder()
.scheme(scheme)
.host(fqdn).port(port)
.encodedPath(path)
.build();
log.info("Trying to determine principal from initial context path=" + initialContextPath);
HttpUrl principal = getCurrentUserPrincipal(initialContextPath);
if (principal != null)
return principal;
log.info("Trying to determine principal from initial context path=" + initialContextPath);
HttpUrl principal = getCurrentUserPrincipal(initialContextPath);
if (principal != null)
return principal;
}
} catch(NotFoundException e) {
log.warn("No resource found", e);
}
}
return null;
}

5
app/src/main/java/at/bitfire/davdroid/ui/setup/LoginURLFragment.java
View File

@ -7,6 +7,7 @@
*/
package at.bitfire.davdroid.ui.setup;
import android.app.Activity;
import android.app.DialogFragment;
import android.app.Fragment;
import android.content.Context;
@ -156,7 +157,9 @@ public class LoginURLFragment extends Fragment implements TextWatcher {
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
getActivity().invalidateOptionsMenu();
Activity activity = getActivity();
if (activity != null)
activity.invalidateOptionsMenu();
}
@Override

2
dav4android

@ -1 +1 @@
Subproject commit 6a83ed5a370f92fb8d8440a6e4a06d9e2fa3dfcd
Subproject commit b77404b82c6bae193754344ecb00b7e4be88797f