mirror of
https://github.com/bitfireAT/davx5-ose.git
synced 2025-12-23 23:17:50 -05:00
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()
This commit is contained in:
@@ -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);
|
||||
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
Submodule ical4android updated: a9495e1367...4a80de4b62
Submodule vcard4android updated: 80b0f29807...24aa17891f
Reference in New Issue
Block a user