Merged branch develop into develop

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/Device.java

@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStream;
+import java.util.Hashtable;
 import java.util.Vector;
 import java.util.Vector;
 
 
 
 
@@ -194,16 +195,14 @@ public class Device extends SQLiteOpenHelper {
     }
     }
 
 
     //TODO: Recuperar los users (supervisors + students) de un alumno
     //TODO: Recuperar los users (supervisors + students) de un alumno
-    public Vector<User> recoverSupervisors(Integer id_stu) throws JSONException{
+    public Hashtable<String, String> recoverSupervisors(Integer id_stu) throws JSONException{
         SQLiteDatabase db = this.getReadableDatabase();
         SQLiteDatabase db = this.getReadableDatabase();
-        Vector<User> users = new Vector<>();
-        Cursor cursor = db.rawQuery(" SELECT * FROM supervisor,student WHERE "+id_stu+ " = (SELECT id_stu from users WHERE id_stu = " +id_stu+")" ,null);
+        Hashtable<String, String> users = new Hashtable<>(3);
+        Cursor cursor = db.rawQuery(" SELECT email_sup, name_sup, surname_sup FROM users_details WHERE id_stu = "+id_stu ,null);
         while (cursor.moveToNext())
         while (cursor.moveToNext())
             Log.i("TAG_PRUEBAS","Fila: "+cursor.getInt(0)+cursor.getString(1)+ cursor.getString(2)+ cursor.getString(3)+ cursor.getString(4)+ cursor.getString(5)+ cursor.getString(6)+ cursor.getString(7)+ cursor.getString(8)+
             Log.i("TAG_PRUEBAS","Fila: "+cursor.getInt(0)+cursor.getString(1)+ cursor.getString(2)+ cursor.getString(3)+ cursor.getString(4)+ cursor.getString(5)+ cursor.getString(6)+ cursor.getString(7)+ cursor.getString(8)+
                     cursor.getInt(9)+ cursor.getString(10)+ cursor.getString(11)+ cursor.getString(12)+ cursor.getString(13)+ cursor.getString(14)+ cursor.getString(15)+ cursor.getString(16)+ cursor.getString(17)+ cursor.getString(18));
                     cursor.getInt(9)+ cursor.getString(10)+ cursor.getString(11)+ cursor.getString(12)+ cursor.getString(13)+ cursor.getString(14)+ cursor.getString(15)+ cursor.getString(16)+ cursor.getString(17)+ cursor.getString(18));
-            /*if (cursor.getInt(9) == id_stu)
-                users.add(new User(cursor.getInt(0), cursor.getString(1), cursor.getString(2), cursor.getString(3), cursor.getString(4), cursor.getString(5), cursor.getString(6), cursor.getString(7), cursor.getString(8),
-                        cursor.getInt(9), cursor.getString(10), cursor.getString(11), cursor.getString(12), cursor.getString(13), cursor.getString(14), cursor.getString(15), cursor.getString(16), cursor.getString(17), cursor.getString(18)));*/
+            users.put(cursor.getString(0), cursor.getString(1)+" "+cursor.getString(2));
         cursor.close();
         cursor.close();
         //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
         //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
         return users;
         return users;

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/cropper/EditPictoActivity.java

@@ -53,6 +53,7 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.Hashtable;
 import java.util.Random;
 import java.util.Random;
 import java.util.Vector;
 import java.util.Vector;
 
 
@@ -239,16 +240,15 @@ public class EditPictoActivity extends Activity {
         Log.i(DEBUG_MESSAGE,"Usuario: "+ PCBcontext.getPcbdb().getCurrentUser().get_name_stu());
         Log.i(DEBUG_MESSAGE,"Usuario: "+ PCBcontext.getPcbdb().getCurrentUser().get_name_stu());
 
 
         ArrayList<String> supervisoresAdapter = new ArrayList<>();
         ArrayList<String> supervisoresAdapter = new ArrayList<>();
-        Vector<User> supervisores = null;
+        Hashtable<String, String> supervisores = null;
         try {
         try {
             supervisores = PCBcontext.getDevice().recoverSupervisors(PCBcontext.getPcbdb().getCurrentUser().get_id_stu());
             supervisores = PCBcontext.getDevice().recoverSupervisors(PCBcontext.getPcbdb().getCurrentUser().get_id_stu());
         } catch (JSONException e) {
         } catch (JSONException e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
         if (supervisores != null){
         if (supervisores != null){
-            for(User supervisor: supervisores){
-                supervisoresAdapter.add(supervisor.get_name_sup()+", "+supervisor.get_surname_sup()+ "\n" +supervisor.get_email_sup() );
-            }
+            for(String email_sup: supervisores.keySet())
+                supervisoresAdapter.add(email_sup+", "+supervisores.get(email_sup) );
         }
         }
         supervisoresAdapter.add(NO_SUP_TEXT+"\n"+NO_SUP_TEXT);
         supervisoresAdapter.add(NO_SUP_TEXT+"\n"+NO_SUP_TEXT);
         //String supervisors  = PCBcontext.getPcbdb().getCurrentUser().get_Supervisors();
         //String supervisors  = PCBcontext.getPcbdb().getCurrentUser().get_Supervisors();