X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FEvent.java;h=94b817ac63169656a2fbe556d16909aa3ed90840;hb=ecee6932221bfa129c90b47a4d8015c0082752f7;hp=d1e8b22d803a6925aa4d0821ed6c3d86a3c52e40;hpb=5cf4714f0675349ed599707e024cf0e70fe114b2;p=unical.git diff --git a/src/ro/ieval/unical/Event.java b/src/ro/ieval/unical/Event.java index d1e8b22..94b817a 100644 --- a/src/ro/ieval/unical/Event.java +++ b/src/ro/ieval/unical/Event.java @@ -1,11 +1,14 @@ package ro.ieval.unical; +import java.util.ArrayList; + import android.content.ContentResolver; import android.content.Context; import android.database.Cursor; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; +import android.provider.BaseColumns; import android.provider.CalendarContract.Events; final class Event implements Parcelable{ @@ -22,7 +25,7 @@ final class Event implements Parcelable{ }; private static final String[] PROJECTION = { - Events._ID, + BaseColumns._ID, Events.ORGANIZER, Events.TITLE, Events.EVENT_LOCATION, @@ -73,10 +76,21 @@ 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 GCalendar calendar : GCalendar.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();