working on serial/login activity refactorization (vi)

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

@@ -348,31 +348,24 @@ public class Device extends SQLiteOpenHelper {
      */
     public void synchronizeUsers(Vector<User> users, iImgDownloaderListener imgListener) throws JSONException {
 
-        Vector<User> prev_users = getUsers();
+        Vector<User> current_users = getUsers();
 
         Vector<Img> imgs = new Vector<Img>(users.size() * 2);
 
         SQLiteDatabase db = this.getWritableDatabase();
 
         for (User user : users) {
-            if (prev_users.contains(user)) {
+            if (current_users.contains(user)) {
                 updateUser(user, db);
-                prev_users.remove(user);
             } else
                 insertUser(user, db);
-
             if (!imgs.contains(user.get_Img_stu())) imgs.add(user.get_Img_stu());
             if (!imgs.contains(user.get_Img_sup())) imgs.add(user.get_Img_sup());
         }
-
-        for (User user : prev_users)
-            db.delete("users_detail","id_stu=? AND id_sup=?",new String[]{Integer.toString(user.get_id_stu()),Integer.toString(user.get_id_sup())});
+        db.close();
 
         ImgDownloader downloader = new ImgDownloader(this.context, imgListener, ImgDownloader.tsource.remote );
         downloader.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,imgs);
-
-
-        db.close();
     }
 
 

android/Pictogram/app/src/main/java/com/yottacode/pictogram/gui/SerialActivity.java

@@ -57,11 +57,11 @@ public class SerialActivity extends Activity   {
 
     public static final String PREFS_NAME = "MyPrefsFile";
 
-    private void manageSupervisorLogin(String username, String password, boolean online) {
+    private void manageSupervisorLogin(final String username, final String password, boolean online) {
 
         final Intent loginActivity = new Intent(SerialActivity.this, LoginActivity.class);
         if (online) {
-            final ProgressDialog progressDialog = ProgressDialog.show(SerialActivity.this, SerialActivity.this.getBaseContext().getString(R.string.userLoadingMsg),
+            final ProgressDialog progressDialog = ProgressDialog.show(SerialActivity.this, SerialActivity.this.getBaseContext().getString(R.string.userLoadingTxt),
                     SerialActivity.this.getBaseContext().getString(R.string.userLoadingTxt), false, false);
             final String operation = "sup/login";
             Hashtable<String, String> postDataParams = new Hashtable<String, String>();
@@ -99,9 +99,18 @@ public class SerialActivity extends Activity   {
                         try {
                             Integer su_id = user.getInt(TAG_ID);
                             int su_id_int = su_id.intValue();
+    ;
+
                             loginActivity.putExtra("offline", false);
                             loginActivity.putExtra("sup_id", su_id_int);
                             loginActivity.putExtra("token", jsonToken);
+                            loginActivity.putExtra("username", username);
+                            loginActivity.putExtra("password", password);
+                            loginActivity.putExtra("name", user.getString(TAG_NAME));
+                            loginActivity.putExtra("surname", user.getString(TAG_SURNAME));
+                            loginActivity.putExtra("pic", user.getString(TAG_PIC));
+                            loginActivity.putExtra("gender", user.getString(TAG_GENDER));
+                            loginActivity.putExtra("lang", user.getString(TAG_LANG));
                             startActivity(loginActivity);
 
                         } catch (JSONException e) {
@@ -209,23 +218,7 @@ public class SerialActivity extends Activity   {
     }
     private void set_student_oline(User student, String token, final Intent pictogramActivity) {
         final ProgressDialog progressDialog=ProgressDialog.show(this, getString(R.string.userLoadingTxt),getString(R.string.loadingGrammar));
-        Vector<User> vstudent = new Vector<>(1);
-        vstudent.add(student);
-        try {
-            PCBcontext.getDevice().synchronizeUsers(vstudent, new iImgDownloaderListener() {
-                @Override
-                public void loadComplete() {
 
-                }
-
-                @Override
-                public void loadImg(Img image) {
-                    Log.d(LOG_TAG, "Load a single image with ID: " + image.get_id());
-                }
-            });
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
         PCBcontext.set_user(student, token, new iImgDownloaderListener() {
             @Override
             public void loadComplete() {