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

diff --git a/src/ro/ieval/unical/AddEventActivity.java b/src/ro/ieval/unical/AddEventActivity.java
index 373c4f9..d36bbda 100644
--- a/src/ro/ieval/unical/AddEventActivity.java
+++ b/src/ro/ieval/unical/AddEventActivity.java
@@ -163,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();
@@ -181,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();
@@ -219,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