arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-16 17:42:03 +00:00
Code Issues Releases Wiki Activity

Changes in ical4android and vcard4android

Browse Source 
* 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:
Ricki Hirner 2016-04-13 14:14:30 +02:00
parent eb2537a278
commit c3b2929f88
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/at/bitfire/davdroid/resource/LocalContact.java
View File

@ -82,7 +82,7 @@ public class LocalContact extends AndroidContact implements LocalResource {
Contact groupInfo = group.getContact(); Contact groupInfo = group.getContact();
// add to CATEGORIES // add to CATEGORIES
contact.getCategories().add(groupInfo.displayName); contact.categories.add(groupInfo.displayName);
} catch (FileNotFoundException|ContactsStorageException e) { } catch (FileNotFoundException|ContactsStorageException e) {
App.log.log(Level.WARNING, "Couldn't find assigned group #" + groupId + ", ignoring membership", 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 @Override
protected void insertGroupMemberships(BatchOperation batch) throws ContactsStorageException { 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? // Is there already a category with this display name?
LocalGroup group = ((LocalAddressBook)addressBook).findGroupByTitle(category); LocalGroup group = ((LocalAddressBook)addressBook).findGroupByTitle(category);

4
app/src/main/java/at/bitfire/davdroid/ui/PermissionsActivity.java
View File

@ -32,7 +32,11 @@ public class PermissionsActivity extends AppCompatActivity {
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_permissions); setContentView(R.layout.activity_permissions);
}
@Override
protected void onResume() {
super.onResume();
refresh(); refresh();
} }

2
ical4android

@ -1 +1 @@
Subproject commit a9495e136733e44f3276f08c049def2584aac3a4 Subproject commit 4a80de4b62a43c6fd2d919ced0c12aca286c9056

2
vcard4android

@ -1 +1 @@
Subproject commit 80b0f298076766df5844c5209a260423ebd1a8d3 Subproject commit 24aa17891f88744d16d04d9f8b3f604bdf5632c3