arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-11-15 12:28:57 +00:00
Code Issues Releases Wiki Activity

Remove the redundant collection getAll() function.

Browse Source 
We aren't using it, and shouldn't be using it. It's very inefficient,
and doesn't help what we want to do.
This commit is contained in:
Tom Hacohen 2017-02-16 19:22:40 +00:00
parent 6ea0b47d79
commit dd6ce617cc
4 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java
View File

@ -49,7 +49,7 @@ public class LocalAddressBook extends AndroidAddressBook implements LocalCollect
/**
* Whether contact groups (LocalGroup resources) are included in query results for
* {@link #getAll()}, {@link #getDeleted()}, {@link #getDirty()} and
* {@link #getDeleted()}, {@link #getDirty()} and
* {@link #getWithoutFileName()}.
*/
public boolean includeGroups = true;
@ -61,22 +61,12 @@ public class LocalAddressBook extends AndroidAddressBook implements LocalCollect
@NonNull
public LocalContact findContactByUID(String uid) throws ContactsStorageException, FileNotFoundException {
LocalContact[] contacts = (LocalContact[])queryContacts(LocalContact.COLUMN_UID + "=?", new String[] { uid });
LocalContact[] contacts = (LocalContact[]) queryContacts(LocalContact.COLUMN_UID + "=?", new String[]{uid});
if (contacts.length == 0)
throw new FileNotFoundException();
return contacts[0];
}
@Override
@NonNull
public LocalResource[] getAll() throws ContactsStorageException {
List<LocalResource> all = new LinkedList<>();
Collections.addAll(all, (LocalResource[])queryContacts(null, null));
if (includeGroups)
Collections.addAll(all, (LocalResource[])queryGroups(null, null));
return all.toArray(new LocalResource[all.size()]);
}
/**
* Returns an array of local contacts/groups which have been deleted locally. (DELETED != 0).
*/

6
app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java
View File

@ -109,12 +109,6 @@ public class LocalCalendar extends AndroidCalendar implements LocalCollection {
return values;
}
@Override
public LocalResource[] getAll() throws CalendarStorageException, ContactsStorageException {
return (LocalEvent[])queryEvents(Events.ORIGINAL_ID + " IS NULL", null);
}
@Override
public LocalEvent[] getDeleted() throws CalendarStorageException {
return (LocalEvent[])queryEvents(Events.DELETED + "!=0 AND " + Events.ORIGINAL_ID + " IS NULL", null);

1
app/src/main/java/at/bitfire/davdroid/resource/LocalCollection.java
View File

@ -20,7 +20,6 @@ public interface LocalCollection {
/** Dirty *non-deleted* entries */
LocalResource[] getDirty() throws CalendarStorageException, ContactsStorageException, FileNotFoundException;
LocalResource[] getAll() throws CalendarStorageException, ContactsStorageException;
LocalResource getByUid(String uid) throws CalendarStorageException, ContactsStorageException;
String getCTag() throws CalendarStorageException, ContactsStorageException;

6
app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.java
View File

@ -78,12 +78,6 @@ public class LocalTaskList extends AndroidTaskList implements LocalCollection {
return values;
}
@Override
public LocalTask[] getAll() throws CalendarStorageException {
return (LocalTask[])queryTasks(null, null);
}
@Override
public LocalTask[] getDeleted() throws CalendarStorageException {
return (LocalTask[])queryTasks(Tasks._DELETED + "!=0", null);