X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FDisplayEventActivity.java;h=af4fe159379eda508d0d3741b9ad9c3458545397;hb=86ad378625e166a5ea5b03614c5926616000bd55;hp=906ed5cddf77e7118f4f851469fefdbfdda71078;hpb=dc52b2617d80acc8b1c82a96f2fcb4fb8de7885c;p=unical.git

diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index 906ed5c..af4fe15 100644
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -18,16 +18,16 @@ public class DisplayEventActivity extends Activity {
 	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);
 
@@ -56,13 +56,6 @@ public class DisplayEventActivity extends Activity {
 		description.setText(event.description);
 	}
 
-    @Override
-    protected void onResume () {
-        super.onResume();
-        if(d.deleted)
-            finish();
-    }
-
 	@Override
 	public boolean onCreateOptionsMenu(final Menu menu) {
 		final MenuInflater inflater = getMenuInflater();