loading serialized missions but buggy

res/values/strings.xml

@@ -126,6 +126,8 @@
     <string name="sim_local_mission_not_removable">This mission cannot be deleted</string>
     <string name="sim_local_select_first_a_mission">Select a mission first</string>
     <string name="sim_local_simulator_connected">Simulator connected!</string>
+    <string name="sim_local_cannot_deserialize_selected_mission">Error, cannot deserialize selected mission</string>
+    <string name="sim_local_cannot_find_selected_mission_in_db">Error, cannot find selected mission in database</string>
     <string name="sim_orekit_init_error">Simulator initialization error</string>
     <string name="sim_orekit_prop_error">Simulator propagation error</string>
     <string name="sim_remote_simulator_connected">Remote simulator connected!</string>

src/database/MissionReaderContract.java

@@ -14,14 +14,14 @@ public final class MissionReaderContract {
     }
 
     private static final String TEXT_TYPE = " TEXT";
-    //private static final String SERIALIZED_TYPE = " BLOB";
+    private static final String SERIALIZED_TYPE = " BLOB";
     private static final String COMMA_SEP = ",";
     static final String SQL_CREATE_ENTRIES =
         "CREATE TABLE " + MissionEntry.TABLE_NAME + " (" +
         		MissionEntry._ID + " INTEGER PRIMARY KEY," +
         		MissionEntry.COLUMN_NAME_NAME + TEXT_TYPE + COMMA_SEP +
         		MissionEntry.COLUMN_NAME_DESCRIPTION + TEXT_TYPE + COMMA_SEP +
-        		MissionEntry.COLUMN_NAME_CLASS + TEXT_TYPE + 
+        		MissionEntry.COLUMN_NAME_CLASS + SERIALIZED_TYPE + 
         " )";
 
     static final String SQL_DELETE_ENTRIES =

src/database/SerializationUtil.java

@@ -18,11 +18,10 @@ import org.orekit.propagation.SpacecraftState;
 public class SerializationUtil {
  
     // deserialize to Object from given file
-    public static Mission deserialize(String serialized) throws IOException,
-            ClassNotFoundException {
+    public static Mission deserialize(byte[] serialized) {
     	try {
-    	     byte b[] = serialized.getBytes(); 
-    	     ByteArrayInputStream bi = new ByteArrayInputStream(b);
+    	     //byte b[] = serialized.getBytes(); 
+    	     ByteArrayInputStream bi = new ByteArrayInputStream(serialized);
     	     ObjectInputStream si = new ObjectInputStream(bi);
     	     Mission obj = (Mission) si.readObject();
     	     si.close();
@@ -34,15 +33,16 @@ public class SerializationUtil {
     }
  
     // serialize the given object and save it to file
-    public static String serialize(Object obj)//str.getBytes("UTF-8")
+    public static byte[] serialize(Object obj)//str.getBytes("UTF-8")
             throws IOException {
         ByteArrayOutputStream fos = new ByteArrayOutputStream();
         ObjectOutputStream oos = new ObjectOutputStream(fos);
         oos.writeObject(obj);
         oos.flush();
-        String tmp = fos.toString();
+        //String tmp = fos.toString();
+        byte[] ba = fos.toByteArray();
         fos.close();
-        return tmp;
+        return ba;
     }
  
 }
\ No newline at end of file

src/fragments/SimulatorFragment.java

@@ -3,12 +3,14 @@ package fragments;
 import java.util.ArrayList;
 import java.util.List;
 
+import mission.Mission;
 import simulator.Simulator;
 import simulator.SimulatorStatus;
 import cs.si.satatt.MainActivity;
 import cs.si.satatt.R;
 import database.MissionReaderDbHelper;
 import database.MissionReaderContract.MissionEntry;
+import database.SerializationUtil;
 import dialogs.DeleteMissionDialogFragment;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -162,12 +164,42 @@ public final class SimulatorFragment extends Fragment implements LoaderCallbacks
 	            				R.string.pref_key_sim_remote_port), 
 	            				port_view.getText().toString()
 	            				).commit();
+	            		simulator.connect();
             		}else{
             			//Set mission
+            			String[] projection = {
+            					MissionEntry._ID,
+            				    MissionEntry.COLUMN_NAME_CLASS
+            				    };
+
+        				//XGGDEBUG: put db in activity to not load it always.
+            			Cursor c = ((MainActivity)getActivity()).db_help.getWritableDatabase()
+            				.query(
+            						MissionEntry.TABLE_NAME,  // The table to query
+            					    projection,                               // The columns to return
+            					    MissionEntry._ID+" = ?",                                // The columns for the WHERE clause
+            					    new String[]{Integer.toString(activeMissionId)},                            // The values for the WHERE clause
+            					    "",                                     // don't group the rows
+            					    "",                                     // don't filter by row groups
+            					    null                                 // The sort order
+            					    );
+            			if (c != null && c.getCount() > 0) {
+            				c.moveToFirst();
+            				int idIndex = c.getColumnIndex(MissionEntry._ID);
+            				int nameIndex = c.getColumnIndex(MissionEntry.COLUMN_NAME_CLASS);
+            				//this.itemId = cursor.getLong(idIndex);
+            				byte[] mission_serie = c.getBlob(nameIndex);
+            				Mission mis = SerializationUtil.deserialize(mission_serie);
+            				if(mis!=null){
+		            			simulator.setSelectedMission(mis);
+		            			simulator.connect();
+            				}else{
+            					Toast.makeText(getActivity().getApplicationContext(), getString(R.string.sim_local_cannot_deserialize_selected_mission), Toast.LENGTH_LONG).show();
+            				}
+            			}else{
+            				Toast.makeText(getActivity().getApplicationContext(), getString(R.string.sim_local_cannot_find_selected_mission_in_db), Toast.LENGTH_LONG).show();
+            			}
             		}
-            		//Log.d("Sim",System.currentTimeMillis()+": "+"button connect pressed");
-            		simulator.connect();
-            		//Log.d("Sim",System.currentTimeMillis()+": "+"button connect onlick ends");
             	}
             }
         });

src/mission/Mission.java

 package mission;
 
+import java.io.Serializable;
+
 import mission.Orbit;
 
 import org.orekit.time.AbsoluteDate;
 
-public class Mission {
+public class Mission implements Serializable{
 	public String name = "CustomMission";
 	public String description = "Mission description";
 	//public String initial_stage = "First Stage";

src/mission/Orbit.java

 package mission;
 
+import java.io.Serializable;
+
 /**
  * Contains all the values of a Mission.
  * @author XavierGibert
  *
  */
-public class Orbit {
+public class Orbit implements Serializable{
 	public double mu =  3.986004415e+14;
 	/**
 	 * Semi major axis in meters

src/simulator/Simulator.java

@@ -27,6 +27,11 @@ public class Simulator {
 	private ModelSimulation simulation;
 	private Button buttonConnect;
 	private Switch switchSelector;
+	private Mission mission;
+	
+	public void setSelectedMission(Mission mis){
+		mission = mis;
+	}
 	
 	public void setButtonConnect(Button bt){
 		buttonConnect=bt;
@@ -169,7 +174,7 @@ public class Simulator {
 			simulation = new ModelSimulation((MainActivity)activity);
 			setProgress(40 * 100);
 			simulation.preInitialize();
-			sthread = (SimulatorThread) new SimulatorThread(this, new Mission()).execute(simulation);
+			sthread = (SimulatorThread) new SimulatorThread(this, mission).execute(simulation);
 			//TODO new mission implement selector of mission
 		}
 		//Log.d("Sim",System.currentTimeMillis()+": "+"simulator interior thread connected");