From 2c5b93ce43f2056abaf78ce582bbdd6f948e2391 Mon Sep 17 00:00:00 2001
From: Ricki Hirner <hirner@bitfire.at>
Date: Fri, 7 Oct 2016 12:22:54 +0200
Subject: [PATCH] Fix NPE in "is refreshing progress bar"

---
 app/build.gradle                                              | 2 ++
 app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java | 4 ++--
 dav4android                                                   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a74a5b33..4aeabda0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -74,10 +74,12 @@ dependencies {
 
     compile 'com.github.yukuku:ambilwarna:2.0.1'
 
+    compile 'com.squareup.okhttp3:logging-interceptor:3.4.1'
     compile 'dnsjava:dnsjava:2.1.7'
     compile 'org.apache.commons:commons-lang3:3.4'
     compile 'org.apache.commons:commons-collections4:4.1'
     provided 'org.projectlombok:lombok:1.16.10'
+
     // for tests
     testCompile 'junit:junit:4.12'
     testCompile 'com.squareup.okhttp3:mockwebserver:3.4.1'
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java
index 8b7cf8a7..6b2dae7b 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java
@@ -425,14 +425,14 @@ public class AccountActivity extends AppCompatActivity implements Toolbar.OnMenu
                 if (Services.SERVICE_CARDDAV.equals(service)) {
                     info.carddav = new AccountInfo.ServiceInfo();
                     info.carddav.id = id;
-                    info.carddav.refreshing = davService.isRefreshing(id) || ContentResolver.isSyncActive(account, ContactsContract.AUTHORITY);
+                    info.carddav.refreshing = (davService != null && davService.isRefreshing(id)) || ContentResolver.isSyncActive(account, ContactsContract.AUTHORITY);
                     info.carddav.hasHomeSets = hasHomeSets(db, id);
                     info.carddav.collections = readCollections(db, id);
 
                 } else if (Services.SERVICE_CALDAV.equals(service)) {
                     info.caldav = new AccountInfo.ServiceInfo();
                     info.caldav.id = id;
-                    info.caldav.refreshing = davService.isRefreshing(id) ||
+                    info.caldav.refreshing = (davService != null && davService.isRefreshing(id)) ||
                             ContentResolver.isSyncActive(account, CalendarContract.AUTHORITY) ||
                             ContentResolver.isSyncActive(account, TaskProvider.ProviderName.OpenTasks.authority);
                     info.caldav.hasHomeSets = hasHomeSets(db, id);
diff --git a/dav4android b/dav4android
index 9a334f69..05065af8 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit 9a334f69c781be37bd26eca3f18734c5f6826a8e
+Subproject commit 05065af8ef4a73f831b51bc7766af885cc4735d3