@@ -37,7 +37,15 @@ public final class DetailFragment extends Fragment implements DatePickerDialog.O
     private EditText mEditDate;
     private EditText mEditPlace;
 
-    // TODO: override onCreate to retrieve the event
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Bundle args = getArguments();
+        if (args != null) {
+            mEvent = args.getParcelable(DetailActivity.EXTRA_EVENT);
+        }
+    }
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
@@ -63,7 +71,11 @@ public void onClick(View v) {
             }
         });
 
-        // TODO: set EditText values if not null
+        if (mEvent != null) {
+            mEditTitle.setText(mEvent.getTitle());
+            mEditPlace.setText(mEvent.getPlace());
+            mEditDate.setText(sDateFormat.format(mEvent.getDate()));
+        }
 
         return view;
     }
 
@@ -1,6 +1,8 @@
 package io.kristal.events.detail;
 
 import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.widget.Toast;
 
 import io.kristal.events.R;
@@ -13,8 +15,17 @@
 public final class EditActivity extends DetailActivity {
 
     public static final int RESULT_EDITED = -2;
+    
+    @Override
+    public void onAttachFragment(Fragment fragment) {
+        super.onAttachFragment(fragment);
 
-    // TODO: override onAttachFragment and pass the event to the DetailFragment
+        if (fragment instanceof DetailFragment) {
+            Bundle bundle = new Bundle(1);
+            bundle.putParcelable(EXTRA_EVENT, getIntent().getParcelableExtra(EXTRA_EVENT));
+            fragment.setArguments(bundle);
+        }
+    }
 
     @Override
     protected void onCheckOptionsItemSelected() {
 
@@ -7,6 +7,8 @@
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.Toast;
 
@@ -23,6 +25,7 @@
 import io.kristal.events.R;
 import io.kristal.events.detail.CreateActivity;
 import io.kristal.events.detail.DetailActivity;
+import io.kristal.events.detail.EditActivity;
 import io.kristal.events.model.Event;
 import io.kristal.events.model.EventsList;
 
@@ -43,7 +46,15 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ListView listView = findViewById(android.R.id.list);
         listView.setAdapter(mAdapter);
-        // TODO: set OnItemClickListener on listView and start EditActivity passing the event
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                Intent intent = new Intent(MainActivity.this, EditActivity.class);
+                intent.putExtra(DetailActivity.EXTRA_EVENT, mAdapter.getItem(position));
+                startActivityForResult(intent, 0);
+            }
+        });
 
         if (savedInstanceState == null) {
             reset();
@@ -75,14 +86,27 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        // TODO: retrieve the edited event & edit it instead of adding it
-        if (requestCode == 0
-            && resultCode == CreateActivity.RESULT_CREATED) {
-            Event event = data.getParcelableExtra(DetailActivity.EXTRA_EVENT);
-            EventsList.addEvent(event);
-            reload();
+        boolean handled = false;
+
+        if (requestCode == 0) {
+            Event event;
+            switch(resultCode) {
+                case CreateActivity.RESULT_CREATED:
+                    event = data.getParcelableExtra(DetailActivity.EXTRA_EVENT);
+                    EventsList.addEvent(event);
+                    reload();
+                    handled = true;
+                    break;
+                case EditActivity.RESULT_EDITED:
+                    event = data.getParcelableExtra(DetailActivity.EXTRA_EVENT);
+                    EventsList.editEvent(event);
+                    reload();
+                    handled = true;
+                    break;
+            }
         }
-        else {
+
+        if (! handled) {
             super.onActivityResult(requestCode, resultCode, data);
         }
     }