X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FEvent.java;h=f8e35cc78203125d6fd32f0e531b677735d6ca8c;hb=c1da3e5da33d975f4665952ee8ed41a3a5b11270;hp=c09e36666ae76db205321d858c62fdfffc577d7c;hpb=452aaab6a8f8b0a7ed8c3af7b56a78929f357564;p=unical.git diff --git a/src/ro/ieval/unical/Event.java b/src/ro/ieval/unical/Event.java index c09e366..f8e35cc 100644 --- a/src/ro/ieval/unical/Event.java +++ b/src/ro/ieval/unical/Event.java @@ -1,5 +1,7 @@ package ro.ieval.unical; +import java.util.ArrayList; + import android.content.ContentResolver; import android.content.Context; import android.database.Cursor; @@ -11,12 +13,12 @@ import android.provider.CalendarContract.Events; final class Event implements Parcelable{ public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override - public Event createFromParcel(Parcel source) { + public Event createFromParcel(final Parcel source) { return new Event(source.readLong(), source.readString(), source.readString(), source.readString(), source.readString(), source.readInt(), source.readLong(), source.readLong(), source.readLong()); } @Override - public Event[] newArray(int size) { + public Event[] newArray(final int size) { return new Event[size]; } }; @@ -73,10 +75,20 @@ final class Event implements Parcelable{ sort); cursor.moveToFirst(); final Event[] events = new Event[cursor.getCount()]; - for(int i=0;i r = new ArrayList(); + for(final Calendar calendar : Calendar.getAllCalendars(context)) + for(final Event event : getEventsByCalendar(context, calendar._id, null)) + r.add(event); + return r.toArray(new Event[r.size()]); + } public void delete(final Context context){ final ContentResolver cr=context.getContentResolver(); @@ -89,7 +101,7 @@ final class Event implements Parcelable{ } @Override - public void writeToParcel(Parcel dest, int flags) { + public void writeToParcel(final Parcel dest, final int flags) { dest.writeLong(_id); dest.writeString(organizer); dest.writeString(title);