Refresh DisplayEventActivity in onStart

[unical.git] / src / ro / ieval / unical / DisplayEventActivity.java

diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index bb819b9eb51558facca7f6844b3da8c5fd48b4fe..af4fe159379eda508d0d3741b9ad9c3458545397 100644 (file)
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -16,17 +16,18 @@ import android.widget.TextView;
 public class DisplayEventActivity extends Activity {
        public static final String EXTRA_EVENT = "event";
        private Event event;
+    private final DeleteEventDialog d=new DeleteEventDialog();
 
-       public static void displayEvent(final Context context, final Event event){
+       public static void displayEvent(final Context context, final long id){
                final Intent i=new Intent(context,DisplayEventActivity.class);
-               i.putExtra(DisplayEventActivity.EXTRA_EVENT, event);
+               i.putExtra(DisplayEventActivity.EXTRA_EVENT, id);
                context.startActivity(i);
        }
 
        @Override
-       protected void onCreate(final Bundle savedInstanceState) {
-               super.onCreate(savedInstanceState);
-               event=getIntent().getParcelableExtra(EXTRA_EVENT);
+       protected void onStart() {
+               super.onStart();
+               event=getIntent().hasExtra(EXTRA_EVENT) ? Event.getEventById(this, getIntent().getLongExtra(EXTRA_EVENT, 0)) : new Event();
                setContentView(R.layout.event_view);
                setTitle(event.title);
 
@@ -45,7 +46,7 @@ public class DisplayEventActivity extends Activity {
                final SimpleDateFormat dayOfWeekFormat = new SimpleDateFormat("EEEEEEE", Locale.UK);
 
                startDay.setText(dayOfWeekFormat.format(start));
-               if(dateFormat.format(start)!=dateFormat.format(end)) {
+               if(!dateFormat.format(start).equals(dateFormat.format(end))) {
                        endDay.setText(dayOfWeekFormat.format(end));
                        endDate.setText(dateFormat.format(end));
                }
@@ -66,20 +67,25 @@ public class DisplayEventActivity extends Activity {
        public boolean onOptionsItemSelected(final MenuItem item) {
                // Handle item selection
                switch (item. getItemId()) {
-                       case R.id.NewEvent:
-                               final Intent i=new Intent(this,AddEventActivity.class);
-                               startActivity(i);
-                               return true;
-                       case R.id.deleteevent:
-                               final DeleteEventDialog d=new DeleteEventDialog(event,this);
-                               d.show(getFragmentManager(), "Delete");
-                               return true;
-                       case R.id.eventlist:
-                               final Intent it=new Intent(this,EventListActivity.class);
-                               startActivity(it);
-                               return true;
-                       default:
-                               return true;
+               case R.id.deleteevent:
+            final Bundle b=new Bundle();
+            b.putParcelable("Event",event);
+            d.setArguments(b);
+                       d.show(getFragmentManager(), "Delete");
+
+                       return true;
+               case R.id.eventlist:
+                       final Intent it=new Intent(this,EventListActivity.class);
+                       startActivity(it);
+                       return true;
+               case R.id.edit_event:
+                       AddEventActivity.editEvent(DisplayEventActivity.this,event);
+                       return true;
+               case R.id.add_alarm:
+
+                       return true;
+               default:
+                       return true;
                }
        }
 }