issue #141 fixed

android/Pictogram/commonlibrary/src/main/java/com/yottacode/net/RestapiWrapper.java

@@ -145,7 +145,14 @@ public class RestapiWrapper {
       if (Character.isAlphabetic(response.charAt(0)))
       if (Character.isAlphabetic(response.charAt(0)))
           response.append('\'').insert(0,'\'');
           response.append('\'').insert(0,'\'');
 
 
-      Log.i(LOG_TAG, "Raw server answer: " + response);
+
+        for (int i=0;i<(int)(((float)response.length())/3000)+1;i++) {
+            int begin= i * 3000;
+            int end = (i+1) * 3000;
+            if (end>response.length())  end=response.length();
+
+            Log.d(LOG_TAG, "Raw server answer(" + i+ "): " + response.substring(begin, end));
+        }
       try {
       try {
         JSONresponse = new JSONObject("{ "+SERVER_RESULT+": " + response + (responseCode == HttpURLConnection.HTTP_OK
         JSONresponse = new JSONObject("{ "+SERVER_RESULT+": " + response + (responseCode == HttpURLConnection.HTTP_OK
                                                   ?  "}"
                                                   ?  "}"
@@ -154,7 +161,7 @@ public class RestapiWrapper {
         JSONresponse = null;
         JSONresponse = null;
         Log.e(RestapiWrapper.class.getCanonicalName(),e.getMessage());
         Log.e(RestapiWrapper.class.getCanonicalName(),e.getMessage());
       }
       }
-      Log.i(LOG_TAG, "server answer: " + JSONresponse.toString());
+      Log.i(LOG_TAG, "Server answer: " + JSONresponse.toString());
       return JSONresponse;
       return JSONresponse;
     }
     }
 
 

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/grammar/Vocabulary.java

@@ -135,7 +135,7 @@ public class Vocabulary implements Iterable<Picto>  {
     private  boolean synchronize_upload() {
     private  boolean synchronize_upload() {
         boolean upload_pending=false;
         boolean upload_pending=false;
         try {
         try {
-                this.pictos.clear();
+                if (this.pictos.isEmpty())
                     PCBcontext.getPcbdb().getStudentVocabulary(this);
                     PCBcontext.getPcbdb().getStudentVocabulary(this);
         } catch (JSONException e) {
         } catch (JSONException e) {
             Log.e(this.getClass().getName(), " Picto json error from local storage: " + e.getMessage());
             Log.e(this.getClass().getName(), " Picto json error from local storage: " + e.getMessage());
@@ -254,7 +254,7 @@ public class Vocabulary implements Iterable<Picto>  {
                pictos_cat = new LinkedList<>();
                pictos_cat = new LinkedList<>();
                pictos.put(new Integer(picto.get_category()),pictos_cat);
                pictos.put(new Integer(picto.get_category()),pictos_cat);
            }
            }
-
+           pictos_cat.add(picto);
            imgs.add(new Img(picto.get_id(), picto.get_url(), Img.VOCABULARY));
            imgs.add(new Img(picto.get_id(), picto.get_url(), Img.VOCABULARY));
        }
        }
        Log.d(this.getClass().getName(), "Vocabulary size: " + updated_collection.length);
        Log.d(this.getClass().getName(), "Vocabulary size: " + updated_collection.length);

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/NetService.java

@@ -39,7 +39,7 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
 
 
     private Vector<iNetServiceStatus> listeners;
     private Vector<iNetServiceStatus> listeners;
     private static final long restfullSynchroTimming=PCBcontext.getContext().getResources().getInteger(R.integer.netservice_force_restfull_synchro)*1000;
     private static final long restfullSynchroTimming=PCBcontext.getContext().getResources().getInteger(R.integer.netservice_force_restfull_synchro)*1000;
-    private long lastRestfullSynchro;
+    private long nextRestfullSynchro;
     public NetService(int delay, iNetServiceStatus listener) {
     public NetService(int delay, iNetServiceStatus listener) {
         this.updated=RestapiWrapper.ping(PCBcontext.getContext().getResources().getString(R.string.server), ping_session);
         this.updated=RestapiWrapper.ping(PCBcontext.getContext().getResources().getString(R.string.server), ping_session);
 
 
@@ -164,7 +164,7 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
                         Log.e(LOG_TAG, "PING JSON ERROR: " + result + " " + e.getMessage());
                         Log.e(LOG_TAG, "PING JSON ERROR: " + result + " " + e.getMessage());
                     }
                     }
                     if (!updated) {
                     if (!updated) {
-                        lastRestfullSynchro = new Date().getTime();
+                        nextRestfullSynchro = new Date().getTime();
                         updated = true;
                         updated = true;
                         if (PCBcontext.is_user_logged()) //si el usuario aun no hizo login, en realidad no es necesario hacer nada
                         if (PCBcontext.is_user_logged()) //si el usuario aun no hizo login, en realidad no es necesario hacer nada
                             // Comprobar si hay usuario offline, para hacer login transparente
                             // Comprobar si hay usuario offline, para hacer login transparente
@@ -183,13 +183,13 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
                         //cada restfullSynchroTimming aprox. se fuerza sincronización de vocabulario y configuración de usuario
                         //cada restfullSynchroTimming aprox. se fuerza sincronización de vocabulario y configuración de usuario
                         long now = new Date().getTime();
                         long now = new Date().getTime();
                         if (PCBcontext.is_user_logged()) {
                         if (PCBcontext.is_user_logged()) {
-                            if (restfullSynchroTimming > 0 && (now - lastRestfullSynchro > restfullSynchroTimming)) {
+                            if (restfullSynchroTimming > 0 && (now>= nextRestfullSynchro)) {
                                 Log.i(LOG_TAG, "Vocabulary request.");
                                 Log.i(LOG_TAG, "Vocabulary request.");
                                 PCBcontext.getVocabulary().synchronize();
                                 PCBcontext.getVocabulary().synchronize();
                                 synchronizeStudentAttributes();
                                 synchronizeStudentAttributes();
-                                lastRestfullSynchro = now;
+                                nextSynchro(now+restfullSynchroTimming);
                             }
                             }
-                        } else lastRestfullSynchro = new Date().getTime();
+                        } else nextSynchro(now+restfullSynchroTimming);
                     }
                     }
 
 
                 }
                 }
@@ -206,6 +206,13 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
         }
         }
     }
     }
 
 
+    public void nextSynchro(long next) {
+        nextRestfullSynchro = next;
+    }
+    public long getSynchroTimingLength(){
+        return restfullSynchroTimming;
+    }
+
     private void synchronizeStudentAttributes() {
     private void synchronizeStudentAttributes() {
         int id=PCBcontext.getPcbdb().getCurrentUser().get_id_stu();
         int id=PCBcontext.getPcbdb().getCurrentUser().get_id_stu();
         PCBcontext.getRestapiWrapper().ask("stu/" + id, new RestapiWrapper.iRestapiListener() {
         PCBcontext.getRestapiWrapper().ask("stu/" + id, new RestapiWrapper.iRestapiListener() {

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/websockets/VocabularyTalk.java

@@ -4,10 +4,13 @@ import android.util.Log;
 
 
 import com.github.nkzawa.emitter.Emitter;
 import com.github.nkzawa.emitter.Emitter;
 import com.yottacode.pictogram.dao.Picto;
 import com.yottacode.pictogram.dao.Picto;
+import com.yottacode.pictogram.tools.PCBcontext;
 
 
 import org.json.JSONException;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONObject;
 
 
+import java.util.Date;
+
 /**
 /**
  * Websocket Vocabulary Room based on Room
  * Websocket Vocabulary Room based on Room
  * @author Fernando Martinez Santiago
  * @author Fernando Martinez Santiago
@@ -50,7 +53,7 @@ public  class VocabularyTalk  implements  Emitter.Listener  {
             JSONObject picto_stupicto = stu_picto.optJSONObject(param_picto);
             JSONObject picto_stupicto = stu_picto.optJSONObject(param_picto);
             int picto_id = picto_stupicto.getInt(param_picto_id);
             int picto_id = picto_stupicto.getInt(param_picto_id);
             int picto_cat = attrs_stu_picto!=null ? attrs_stu_picto.optInt(param_picto_cat, Picto.NO_CATEGORY) : 0;
             int picto_cat = attrs_stu_picto!=null ? attrs_stu_picto.optInt(param_picto_cat, Picto.NO_CATEGORY) : 0;
-
+            PCBcontext.getNetService().nextSynchro(new Date().getTime()+PCBcontext.getNetService().getSynchroTimingLength()*2);  //nos saltamos una sincronización para evitar que llegue antes que los websockets
             Log.i(LOG_TAG, "Received message '" + action +
             Log.i(LOG_TAG, "Received message '" + action +
                 "' for picto " + picto_id + " (cat " + picto_cat + ", picto: " + picto_stupicto);
                 "' for picto " + picto_id + " (cat " + picto_cat + ", picto: " + picto_stupicto);
             for (iVocabularyListener listener: this.listeners)
             for (iVocabularyListener listener: this.listeners)

android/Pictogram/supervisor_tablet/build.gradle

@@ -21,6 +21,7 @@ android {
     resValue "bool","NotifyAllwaysVisible","false"
     resValue "bool","NotifyAllwaysVisible","false"
     resValue "string", "VersionManagerClass", "com.yottacode.pictogram.supervisor_tablet.net.VersionManager"
     resValue "string", "VersionManagerClass", "com.yottacode.pictogram.supervisor_tablet.net.VersionManager"
     resValue "string","apk","pictograms.apk"
     resValue "string","apk","pictograms.apk"
+    resValue "string","google_play_apk","https://play.google.com/store/apps/details?id=com.yottacode.supervisor_tablet"
 //    signingConfig signingConfigs.config
 //    signingConfig signingConfigs.config
   }
   }
   productFlavors {
   productFlavors {

android/Pictogram/supervisor_tablet/src/main/java/com/yottacode/pictogram/supervisor_tablet/net/VersionManager.java

@@ -26,8 +26,7 @@ public class VersionManager implements iVersionManager {
 
 
     public void newVersionAlert(final float version, final Context context, final float vnew) {
     public void newVersionAlert(final float version, final Context context, final float vnew) {
 
 
-        final SpannableString s = new SpannableString(context.getResources().getString(R.string.server)
-            + "/" + context.getResources().getString(com.yottacode.pictogram.R.string.apk));
+        final SpannableString s = new SpannableString(context.getResources().getString(R.string.google_play_apk));
 
 
         final TextView tx1 = new TextView(context);
         final TextView tx1 = new TextView(context);
         tx1.setText("\t"+context.getResources().getString(R.string.new_version_detail) +
         tx1.setText("\t"+context.getResources().getString(R.string.new_version_detail) +

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/session/SessionActivity.java

@@ -71,8 +71,10 @@ public class SessionActivity extends FragmentActivity implements ListInstruction
     }
     }
 
 
     private void evaluateMsg(final int msg_pos, final String evaluation_value, final int evaluation_translation, final int evaluation_bitmap) {
     private void evaluateMsg(final int msg_pos, final String evaluation_value, final int evaluation_translation, final int evaluation_bitmap) {
+
         final SessionFragment sessionFragment = (SessionFragment) getSupportFragmentManager().findFragmentByTag(SessionActivity.FRAGMENT_SESSION);
         final SessionFragment sessionFragment = (SessionFragment) getSupportFragmentManager().findFragmentByTag(SessionActivity.FRAGMENT_SESSION);
         final int currentMsgId=SessionActivity.this.msgs.get(msg_pos);
         final int currentMsgId=SessionActivity.this.msgs.get(msg_pos);
+        if (sessionFragment.get_current_msg_text().trim().length()>0) //no se permiten trys vacios
             SessionWrapper.evaluateTry(currentMsgId, msg_pos==this.msgs.size()-1, evaluation_value, new SessionWrapper.iTryUpdated() {
             SessionWrapper.evaluateTry(currentMsgId, msg_pos==this.msgs.size()-1, evaluation_value, new SessionWrapper.iTryUpdated() {
                 @Override
                 @Override
                 public void update(int next_try_id) {
                 public void update(int next_try_id) {