X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FAddEventActivity.java;h=d36bbdab6c1512a543c1cb8fc07b573107471343;hb=fa9eede17bc629d24022122708d47e1320602b04;hp=8d00641084f34e8beb7753563b1e50e821bb04d8;hpb=684382d3fff6c49c3373bf8fd0f44d7cb2ffe218;p=unical.git

diff --git a/src/ro/ieval/unical/AddEventActivity.java b/src/ro/ieval/unical/AddEventActivity.java
index 8d00641..d36bbda 100644
--- a/src/ro/ieval/unical/AddEventActivity.java
+++ b/src/ro/ieval/unical/AddEventActivity.java
@@ -95,34 +95,32 @@ public final class AddEventActivity extends Activity implements OnDateSetListene
 		final ActionBar actionBar = getActionBar();
 		setContentView(R.layout.add_event);
 
-        if(getIntent().hasExtra(EXTRA_EVENT)) {
-            final LinearLayout layout = (LinearLayout) findViewById(R.id.repeat_layout);
-            final Switch repeatSwitch = (Switch) findViewById(R.id.repeat_switch);
-            Utils.setEnabledRecursively(layout, false);
-
-            repeatSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener(layout));
-
-            EditText title = (EditText) findViewById(R.id.eventtitle);
-            title.setText(event.title);
-
-            TextView tstart = (TextView) findViewById(R.id.time_start);
-            TextView tend = (TextView) findViewById(R.id.time_end);
-            SimpleDateFormat sf=new SimpleDateFormat("HH:mm");
-            Date d=new Date(event.dtstart);
-            tstart.setText(sf.format(d).toString());
-            d.setTime(event.dtend);
-            tend.setText(sf.format(d).toString());
-
-            SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
-            TextView dstart = (TextView)findViewById(R.id.date_start);
-            TextView dend = (TextView)findViewById(R.id.date_end);
-            d.setTime(event.dtstart);
-            dstart.setText(sd.format(d).toString());
-            d.setTime(event.dtend);
-            dend.setText(sd.format(d).toString());
-            EditText description = (EditText) findViewById(R.id.description);
-            description.setText(event.description);
-        }
+		final LinearLayout layout = (LinearLayout) findViewById(R.id.repeat_layout);
+		final Switch repeatSwitch = (Switch) findViewById(R.id.repeat_switch);
+		Utils.setEnabledRecursively(layout, false);
+
+		repeatSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener(layout));
+
+		final EditText title = (EditText) findViewById(R.id.eventtitle);
+		title.setText(event.title);
+
+		final TextView tstart = (TextView) findViewById(R.id.time_start);
+		final TextView tend = (TextView) findViewById(R.id.time_end);
+		final SimpleDateFormat sf=new SimpleDateFormat("HH:mm");
+		final Date d=new Date(event.dtstart);
+		tstart.setText(sf.format(d).toString());
+		d.setTime(event.dtend);
+		tend.setText(sf.format(d).toString());
+
+		final SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+		final TextView dstart = (TextView)findViewById(R.id.date_start);
+		final TextView dend = (TextView)findViewById(R.id.date_end);
+		d.setTime(event.dtstart);
+		dstart.setText(sd.format(d).toString());
+		d.setTime(event.dtend);
+		dend.setText(sd.format(d).toString());
+		final EditText description = (EditText) findViewById(R.id.description);
+		description.setText(event.description);
 	}
 
 	@Override
@@ -165,8 +163,8 @@ public final class AddEventActivity extends Activity implements OnDateSetListene
 				finish();
 				return true;
             case R.id.save:
-
-                if(event.title!=null) event.delete(this);
+                boolean edit=false;
+                if(event.title!=null) edit=true;
                 event.title=((EditText)findViewById(R.id.eventtitle)).getText().toString();
                 String start=((TextView)findViewById(R.id.date_start)).getText().toString()+ " " +((TextView)findViewById(R.id.time_start)).getText().toString();
                 String end=((TextView)findViewById(R.id.date_end)).getText().toString()+ " "+((TextView)findViewById(R.id.time_end)).getText().toString();
@@ -183,8 +181,13 @@ public final class AddEventActivity extends Activity implements OnDateSetListene
                 event.description=((EditText) findViewById(R.id.description)).getText().toString();
 
                 if(!Event.calendarCreated)createCalendar();
+                if(event.calendarID!=Event.getUnicalId(this)) {
+                    edit=false;
+                    event.delete(this);
+                }
                 event.calendarID=Event.getUnicalId(this);
-                event.insert(this);
+                if(!edit) event.insert(this);
+                else event.edit(this);
 
                 Toast toast = Toast.makeText(getApplicationContext(),"Event saved!",Toast.LENGTH_LONG);
                 toast.show();
@@ -221,7 +224,7 @@ public final class AddEventActivity extends Activity implements OnDateSetListene
 	public void onTimeSet(final TimePicker picker, final int hour, final int minute) {
 		dateTimeTextView.setText(String.format("%02d:%02d",hour,minute));
 		if(dateTimeTextView.getId() == R.id.time_start)
-			((TextView)findViewById(R.id.time_end)).setText(String.format("%2d:%2d",hour,minute));
+			((TextView)findViewById(R.id.time_end)).setText(String.format("%02d:%02d",hour,minute));
 	}
 
 	@Override