changed extra type of 'dueDate' to java.util.date

mickey946 · Mar 16, 2014 · 3ca8786 · 3ca8786
1 parent ccabf51
commit 3ca8786
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 2 deletions.
diff --git a/TodoListManager/bin/TodoListManager.apk b/TodoListManager/bin/TodoListManager.apk
diff --git a/TodoListManager/bin/classes.dex b/TodoListManager/bin/classes.dex
diff --git a/TodoListManager/bin/classes/il/ac/huji/todolist/AddNewTodoItemActivity.class b/TodoListManager/bin/classes/il/ac/huji/todolist/AddNewTodoItemActivity.class
diff --git a/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity$1.class b/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity$1.class
diff --git a/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity.class b/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity.class
diff --git a/TodoListManager/src/il/ac/huji/todolist/AddNewTodoItemActivity.java b/TodoListManager/src/il/ac/huji/todolist/AddNewTodoItemActivity.java
@@ -1,5 +1,7 @@
 package il.ac.huji.todolist;
 
+import java.util.Date;
+
 import android.os.Bundle;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -33,7 +35,7 @@ public void add(View view) {
 		String task = edtTask.getText().toString();
 
 		DatePicker datePicker = (DatePicker) findViewById(R.id.datePicker);
-		long date = datePicker.getCalendarView().getDate();
+		Date date = new Date(datePicker.getCalendarView().getDate());
 
 		Intent returnIntent = new Intent();
 		returnIntent.putExtra("title", task);

diff --git a/TodoListManager/src/il/ac/huji/todolist/TodoListManagerActivity.java b/TodoListManager/src/il/ac/huji/todolist/TodoListManagerActivity.java
@@ -3,6 +3,7 @@
 import il.ac.huji.todolist.ActionTaskDialog.DeleteTaskDialogListener;
 
 import java.util.ArrayList;
+import java.util.Date;
 
 import android.os.Build;
 import android.os.Bundle;
@@ -104,7 +105,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		// If the request went well (OK) and the request was TASK_N_DATE
 		if (resultCode == Activity.RESULT_OK && requestCode == TASK_N_DATE) {
 			String task = data.getStringExtra("title");
-			long date = data.getLongExtra("dueDate", 0);
+			Date ddate = (Date) data.getSerializableExtra("dueDate");
+			long date = ddate.getTime();
 
 			// add the item
 			if(task != null) {