From c3b2929f88953f7ab8e839a1ac2173f058c1047e Mon Sep 17 00:00:00 2001
From: Ricki Hirner <hirner@bitfire.at>
Date: Wed, 13 Apr 2016 14:14:30 +0200
Subject: [PATCH] Changes in ical4android and vcard4android

* don't set ORGANIZER for events without attendees
* make some lists public final instead of @Getter private
* PermissionsActivity: call refresh in onResume() instead of onCreate()
---
 .../main/java/at/bitfire/davdroid/resource/LocalContact.java  | 4 ++--
 .../main/java/at/bitfire/davdroid/ui/PermissionsActivity.java | 4 ++++
 ical4android                                                  | 2 +-
 vcard4android                                                 | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.java b/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.java
index 462455ec..4d7e3442 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.java
@@ -82,7 +82,7 @@ public class LocalContact extends AndroidContact implements LocalResource {
                 Contact groupInfo = group.getContact();
 
                 // add to CATEGORIES
-                contact.getCategories().add(groupInfo.displayName);
+                contact.categories.add(groupInfo.displayName);
             } catch (FileNotFoundException|ContactsStorageException e) {
                 App.log.log(Level.WARNING, "Couldn't find assigned group #" + groupId + ", ignoring membership", e);
             }
@@ -91,7 +91,7 @@ public class LocalContact extends AndroidContact implements LocalResource {
 
     @Override
     protected void insertGroupMemberships(BatchOperation batch) throws ContactsStorageException {
-        for (String category : contact.getCategories()) {
+        for (String category : contact.categories) {
             // Is there already a category with this display name?
             LocalGroup group = ((LocalAddressBook)addressBook).findGroupByTitle(category);
 
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/PermissionsActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/PermissionsActivity.java
index a17490ec..98478c16 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/PermissionsActivity.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/PermissionsActivity.java
@@ -32,7 +32,11 @@ public class PermissionsActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_permissions);
+}
 
+    @Override
+    protected void onResume() {
+        super.onResume();
         refresh();
     }
 
diff --git a/ical4android b/ical4android
index a9495e13..4a80de4b 160000
--- a/ical4android
+++ b/ical4android
@@ -1 +1 @@
-Subproject commit a9495e136733e44f3276f08c049def2584aac3a4
+Subproject commit 4a80de4b62a43c6fd2d919ced0c12aca286c9056
diff --git a/vcard4android b/vcard4android
index 80b0f298..24aa1789 160000
--- a/vcard4android
+++ b/vcard4android
@@ -1 +1 @@
-Subproject commit 80b0f298076766df5844c5209a260423ebd1a8d3
+Subproject commit 24aa17891f88744d16d04d9f8b3f604bdf5632c3