X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FAddAlarmActivity.java;h=b79256cd144764bf6365f05bcf89b457a72d3cbe;hb=7bd01d93d42a7fe989b295b23870ae55dd1a09eb;hp=851edaee11b73239cf671a5b569a9be205748123;hpb=36c4a5768fe75e8b8c9d65680a7706eba3e29e4f;p=unical.git

diff --git a/src/ro/ieval/unical/AddAlarmActivity.java b/src/ro/ieval/unical/AddAlarmActivity.java
index 851edae..b79256c 100644
--- a/src/ro/ieval/unical/AddAlarmActivity.java
+++ b/src/ro/ieval/unical/AddAlarmActivity.java
@@ -12,8 +12,8 @@ import android.view.MenuItem;
 import android.widget.DatePicker;
 import android.widget.TimePicker;
 
-import java.util.Date;
-import java.util.GregorianCalendar;
+import java.util.*;
+import java.util.Calendar;
 
 public class AddAlarmActivity  extends ListActivity {
 	public static final String EXTRA_EVENT = "event";
@@ -36,13 +36,15 @@ public class AddAlarmActivity  extends ListActivity {
         final DatePicker datePicker = (DatePicker) findViewById(R.id.datePicker);
         final TimePicker timePicker = (TimePicker) findViewById(R.id.timePicker);
         Date d=new Date(Math.max(event.dtstart,GregorianCalendar.getInstance().getTimeInMillis()));
-        datePicker.init(d.getYear()+1900,d.getMonth(),d.getDay(),new DatePicker.OnDateChangedListener() {
+        GregorianCalendar gc=new GregorianCalendar();
+        gc.setTime(d);
+        datePicker.init(gc.get(Calendar.YEAR),gc.get(Calendar.MONTH),gc.get(Calendar.DAY_OF_MONTH),new DatePicker.OnDateChangedListener() {
             @Override
             public void onDateChanged(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
             }
         });
-        timePicker.setCurrentHour(d.getHours());
-        timePicker.setCurrentMinute(d.getMinutes());
+        timePicker.setCurrentHour(gc.get(Calendar.HOUR_OF_DAY));
+        timePicker.setCurrentMinute(gc.get(Calendar.MINUTE));
 
     }
 
@@ -61,7 +63,7 @@ public class AddAlarmActivity  extends ListActivity {
 			final TimePicker timePicker = (TimePicker) findViewById(R.id.timePicker);
 			final GregorianCalendar calendar = new GregorianCalendar(datePicker.getYear(), datePicker.getMonth(), datePicker.getDayOfMonth(), timePicker.getCurrentHour(), timePicker.getCurrentMinute(), 0);
 			try {
-                Utils.addAlarm((Application) getApplication(), calendar.getTimeInMillis(), getIntent().getLongExtra(EXTRA_EVENT, 0));
+                Utils.addAlarm((Application) getApplication(), calendar.getTimeInMillis(), event._id);
                 finish();
             }catch(SQLException e)  {
                 AlertDialog.Builder builder = new AlertDialog.Builder(this);