issues #678, #674 closed

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/action/Action.java

@@ -2,16 +2,14 @@ package com.yottacode.pictogram.action;
 
 import android.util.Log;
 
-import com.yottacode.pictogram.dao.Picto;
+import com.yottacode.pictogram.net.websockets.Room;
 import com.yottacode.pictogram.tools.PCBcontext;
 
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.LinkedList;
 
 /**
  *  User actions that happens when the user is online --> they are sent to the server by websockets (Room class)
@@ -39,7 +37,7 @@ public  abstract class Action {
 
     public String get_type() { return this.type;}
     public abstract String get_action();
-    protected JSONObject get_json() {
+    public JSONObject get_json() {
         final String param_id_stu="id_stu";
         final String param_id_sup="id_sup";
         final String param_id_dev="id_dev";

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/action/PictoAction.java

@@ -2,6 +2,7 @@ package com.yottacode.pictogram.action;
 
 import android.util.Log;
 
+import com.yottacode.pictogram.net.websockets.Room;
 import com.yottacode.pictogram.dao.Picto;
 import com.yottacode.pictogram.tools.PCBcontext;
 

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/action/PictosAction.java

@@ -2,15 +2,13 @@ package com.yottacode.pictogram.action;
 
 import android.util.Log;
 
+import com.yottacode.pictogram.net.websockets.Room;
 import com.yottacode.pictogram.dao.Picto;
-import com.yottacode.pictogram.tools.PCBcontext;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.LinkedList;
 
 /**

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/action/SubscribeAction.java

 package com.yottacode.pictogram.action;
 
-import com.yottacode.pictogram.dao.Picto;
+import com.yottacode.pictogram.net.websockets.Room;
 
 /**
  *  User actions regarding a pictogram that happens when the user is online --> they are sent to the server by websockets (Room class)

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/action/TalkAction.java

 package com.yottacode.pictogram.action;
 
+import com.yottacode.pictogram.net.websockets.Room;
 import com.yottacode.pictogram.dao.Picto;
 
 /**

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/action/UnsubscribeAction.java

 package com.yottacode.pictogram.action;
 
+import com.yottacode.pictogram.net.websockets.Room;
+
 /**
  *  User actions regarding a pictogram that happens when the user is online --> they are sent to the server by websockets (Room class)
  * It is required, inter alia, to support session state diagram such

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/action/VocabularyAction.java

 package com.yottacode.pictogram.action;
 
-import android.util.Log;
-
+import com.yottacode.pictogram.net.websockets.Room;
 import com.yottacode.pictogram.dao.Picto;
-import com.yottacode.pictogram.tools.PCBcontext;
-
-import org.json.JSONException;
-import org.json.JSONObject;
 
 /**
  *  User actions regarding a pictogram that happens when the user is online --> they are sent to the server by websockets (Room class)
@@ -35,4 +30,4 @@ public class VocabularyAction extends PictoAction {
 
 
     public String get_action() {return ACTION;}
-}
\ No newline at end of file
+}

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

@@ -83,7 +83,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
      * @param user the current PCB user (Student or Supervisor with a given Student collection)
      * @see PCBDBHelper#getCurrentUser()
      */
-    private void setCurrentUser(User user) {
+    public void setCurrentUser(User user) {
         this.currentUser = user;
         PCBcontext.getDevice().setLastStuId(user.get_id_stu());
         if (user.is_supervisor()) PCBcontext.getDevice().setLastSupId(user.get_id_sup());

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

@@ -27,8 +27,8 @@ public class User  {
     public final static class JSON_STUDENT_ATTTRS{
         static String CATEGORIES = "categories";
         static String INPUT_FEEDBACK = "input_feedback";
-        static String INPUT_SELECTION = "input selection";
-        static String PICTOGRAM_SIZE ="pictogram size";
+        static String INPUT_SELECTION = "input_selection";
+        static String PICTOGRAM_SIZE ="size";
         static String TTS_ENGINE = "tts engine";
         static String TTS_VOICE = "tts voice";
     }

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

@@ -194,6 +194,7 @@ public class UserLogin {
             GUITools.show_alert(activity, R.string.serverError, e.getMessage());
             Log.e(this.getClass().getCanonicalName(), "JSON:"+ e.getLocalizedMessage());
             if(progressDialog.isShowing()) progressDialog.dismiss();
+
           }
 
         }
@@ -225,7 +226,7 @@ public class UserLogin {
       }
     } //offline student login
   }
-  private void set_student_oline(final User student, String token, final Intent pictogramActivity, final Activity activity) {
+  public void set_student_oline(final User student, String token, final Intent pictogramActivity, final Activity activity) {
     final ProgressDialog progressDialog=ProgressDialog.show(activity, activity.getString(R.string.userLoadingTxt),activity. getString(R.string.loadingGrammar));
 
     PCBcontext.set_user(student, token, new iImgDownloaderListener() {

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

@@ -5,12 +5,16 @@ import android.util.Log;
 
 import com.yottacode.net.iRestapiListener;
 import com.yottacode.pictogram.R;
-import com.yottacode.pictogram.action.Room;
 import com.yottacode.pictogram.action.VocabularyAction;
 import com.yottacode.pictogram.dao.Picto;
 import com.yottacode.pictogram.net.ImgDownloader;
 import com.yottacode.pictogram.net.PictoUploader;
 import com.yottacode.pictogram.net.iImgDownloaderListener;
+import com.yottacode.pictogram.net.websockets.ActionTalk;
+import com.yottacode.pictogram.net.websockets.Room;
+import com.yottacode.pictogram.net.websockets.VocabularyTalk;
+import com.yottacode.pictogram.net.websockets.iActionListener;
+import com.yottacode.pictogram.net.websockets.iVocabularyListener;
 import com.yottacode.pictogram.tools.Img;
 import com.yottacode.pictogram.tools.PCBcontext;
 import com.yottacode.tools.GUITools;
@@ -61,7 +65,7 @@ public class Vocabulary implements Iterable<Picto>  {
     }
 
     public void listen(Room room, iVocabularyListener listener, iActionListener action_listener) {
-            iVocabularyListener listeners[] = {new iVocabularyListener() {
+            iVocabularyListener vocabulary_listeners[] = {new iVocabularyListener() {
                 @Override
                 public void change(action action, int picto_cat, int picto_id, JSONObject args) {
                     switch (action) {
@@ -98,8 +102,9 @@ public class Vocabulary implements Iterable<Picto>  {
                     }
                 }
             },listener};
-            new VocabularyTalk(room, listeners);
+            new VocabularyTalk(room, vocabulary_listeners);
             new ActionTalk(room, new iActionListener[] {action_listener});
+
     }
 
     /**

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

@@ -158,4 +158,8 @@ public class NetService implements Runnable {
     Log.e(this.getClass().getName(), "PCB offline because exception happens: " + e.getMessage());
     notifyStatus();
   }
+
+    public iNetServiceDevice getNetServiceDevice() {
+        return this.device;
+    }
 }

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

@@ -12,4 +12,5 @@ public interface iNetServiceDevice {
   public void closeNotifyStatus();
   public void restart_app();
   public void restart_app(Intent intent);
+  public void updateUserConfig();
 }

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/grammar/ActionTalk.java → android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/websockets/ActionTalk.java

-package com.yottacode.pictogram.grammar;
+package com.yottacode.pictogram.net.websockets;
 
 import android.util.Log;
 
 import com.github.nkzawa.emitter.Emitter;
-import com.yottacode.pictogram.action.Room;
 import com.yottacode.pictogram.dao.Picto;
 import com.yottacode.pictogram.tools.PCBcontext;
 
@@ -15,7 +14,7 @@ import org.json.JSONObject;
  * @author Fernando Martinez Santiago
  * @version 1.0
  */
-public class ActionTalk implements  Emitter.Listener  {
+public  class ActionTalk implements  Emitter.Listener  {
 
     private static final String URL ="action";
     private Room room;

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/action/Room.java → android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/websockets/Room.java

-package com.yottacode.pictogram.action;
+package com.yottacode.pictogram.net.websockets;
 
 
 import android.util.Log;
 
 import com.github.nkzawa.emitter.Emitter;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import com.github.nkzawa.socketio.client.Ack;
 import com.github.nkzawa.socketio.client.SocketIOException;
-import com.yottacode.pictogram.dao.PCBDBHelper;
-import com.yottacode.pictogram.dao.Picto;
-
 import com.yottacode.net.SailsSocketsIO;
+import com.yottacode.pictogram.action.Action;
+import com.yottacode.pictogram.action.SubscribeAction;
+import com.yottacode.pictogram.action.UnsubscribeAction;
 import com.yottacode.pictogram.tools.PCBcontext;
 
-import java.io.IOException;
-import java.sql.SQLDataException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashMap;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.Hashtable;
-import java.util.LinkedList;
 
 
 
@@ -138,4 +129,6 @@ public class Room   {
       super.finalize();
       exit();
     }
-}
+
+
+   }

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

+package com.yottacode.pictogram.net.websockets;
+
+/**
+ * Created by Fernando on 10/12/2016.
+ */
+
+import android.util.Log;
+
+import com.github.nkzawa.emitter.Emitter;
+import com.yottacode.pictogram.dao.User;
+import com.yottacode.pictogram.tools.PCBcontext;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Websocket Vocabulary Room based on Room
+ * @author Fernando Martinez Santiago
+ * @version 1.0
+ */
+public  class StudentTalk implements  Emitter.Listener  {
+
+    private static final String URL ="updateStudent";
+    private Room room;
+
+    iStudentListener listeners[];
+
+    public StudentTalk(Room room, iStudentListener listeners[]) {
+        this.room = room;
+        this.room.listen(URL, this);
+        this.listeners=listeners;
+    }
+
+    @Override
+    public void call(Object... args) {
+
+        try {
+            JSONObject msg = ((JSONObject) args[0]).getJSONObject("student");
+            Log.i(this.getClass().getName(), "raw Received message " +msg.toString());
+            int id=msg.getInt("id");
+            String username=msg.getString("username");
+            String surname=msg.getString("surname");
+            String gender=msg.getString("gender");
+            String pic=msg.getString("pic");
+            String lang=msg.getString("lang");
+            String attributes=msg.getString("attributes");
+            User user=PCBcontext.getPcbdb().getCurrentUser();
+            User updatedUser=new User(id, username, user.get_pwd_stu(), username, surname, pic, gender, lang, attributes,
+                user.get_id_sup(), user.get_email_sup(), user.get_pwd_sup(), user.get_name_sup(), user.get_surname_sup(), user.get_url_img_sup(), user.get_gender_sup(),
+                user.get_lang_sup(), user.get_tts_engine_sup());
+            Log.i(this.getClass().getName(), "Attributes" +attributes+" listeners:"+listeners.length);
+            for (iStudentListener listener: listeners)
+                listener.change(updatedUser);
+
+        } catch (JSONException e) {
+            Log.e(this.getClass().getCanonicalName(), e.getClass().getCanonicalName() +  "--" + e);
+        }
+
+    }
+}

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

-package com.yottacode.pictogram.grammar;
+package com.yottacode.pictogram.net.websockets;
 
 import android.util.Log;
 
 import com.github.nkzawa.emitter.Emitter;
-import com.yottacode.pictogram.action.Room;
 import com.yottacode.pictogram.dao.Picto;
 
 import org.json.JSONException;
@@ -14,7 +13,7 @@ import org.json.JSONObject;
  * @author Fernando Martinez Santiago
  * @version 1.0
  */
-public class VocabularyTalk  implements  Emitter.Listener  {
+public  class VocabularyTalk  implements  Emitter.Listener  {
 
     private static final String URL ="vocabulary";
     private Room room;
@@ -24,7 +23,7 @@ public class VocabularyTalk  implements  Emitter.Listener  {
     public  VocabularyTalk(Room room, iVocabularyListener listeners[]) {
         this.room = room;
         this.room.listen(URL, this);
-         this.listeners=listeners;
+        this.listeners=listeners;
     }
 
     @Override
@@ -50,12 +49,12 @@ public class VocabularyTalk  implements  Emitter.Listener  {
             int picto_cat = attrs_stu_picto!=null ? attrs_stu_picto.optInt(param_picto_cat, Picto.NO_CATEGORY) : 0;
 
             Log.i(this.getClass().getName(), "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)
-              listener.change(action.equals(action_update) ? iVocabularyListener.action.update
-                  : action.equals(action_add) ? iVocabularyListener.action.add
-                  : iVocabularyListener.action.delete
-                , picto_cat, picto_id, stu_picto);
+                listener.change(action.equals(action_update) ? iVocabularyListener.action.update
+                        : action.equals(action_add) ? iVocabularyListener.action.add
+                        : iVocabularyListener.action.delete
+                    , picto_cat, picto_id, stu_picto);
 
         } catch (JSONException e) {
             Log.e(this.getClass().getCanonicalName(), e.getClass().getCanonicalName() +  "--" + e);

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/grammar/iActionListener.java → android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/websockets/iActionListener.java

-package com.yottacode.pictogram.grammar;
+package com.yottacode.pictogram.net.websockets;
 
 
 /**

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

+package com.yottacode.pictogram.net.websockets;
+
+
+import com.yottacode.pictogram.dao.User;
+
+/**
+ * Vocabulary Listener
+ * @author Fernando Martinez Santiago
+ * @version 1.0
+ */
+public interface iStudentListener {
+	public void change(User updatedStudent);
+}

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/grammar/iVocabularyListener.java → android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/websockets/iVocabularyListener.java

-package com.yottacode.pictogram.grammar;
+package com.yottacode.pictogram.net.websockets;
 
 
-import com.yottacode.pictogram.dao.Picto;
-
-import org.json.JSONArray;
 import org.json.JSONObject;
 
-import java.util.Hashtable;
-import java.util.LinkedList;
-
 /**
  * Vocabulary Listener
  * @author Fernando Martinez Santiago

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/tools/PCBcontext.java

@@ -11,10 +11,12 @@ import com.yottacode.pictogram.dao.Device;
 import com.yottacode.pictogram.dao.PCBDBHelper;
 import com.yottacode.pictogram.dao.User;
 import com.yottacode.pictogram.grammar.Vocabulary;
-import com.yottacode.pictogram.net.iNetServiceDevice;
-import com.yottacode.pictogram.action.Room;
 import com.yottacode.pictogram.net.NetService;
 import com.yottacode.pictogram.net.iImgDownloaderListener;
+import com.yottacode.pictogram.net.iNetServiceDevice;
+import com.yottacode.pictogram.net.websockets.Room;
+import com.yottacode.pictogram.net.websockets.StudentTalk;
+import com.yottacode.pictogram.net.websockets.iStudentListener;
 
 public  final class PCBcontext {
     private static Context context;
@@ -68,6 +70,15 @@ public  final class PCBcontext {
         actionLog = new ActionLog();
         vocabulary = new Vocabulary(listener);
         getNetService().notifyStatus();
+        if (getNetService().online()) new StudentTalk(room, new iStudentListener[] {new iStudentListener() {
+            @Override
+            public void change(User updatedStudent) {
+                        PCBcontext.getPcbdb().setCurrentUser(updatedStudent);
+                        PCBcontext.getDevice().insertUser(updatedStudent);
+                        PCBcontext.getNetService().getNetServiceDevice().updateUserConfig();
+            }
+        }});
+
     }
 
   public static void unset_user() {

android/Pictogram/supervisor_tablet/supervisor_tablet.iml

@@ -43,13 +43,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/CIFlavor/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/CIFlavor/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/assets" type="java-test-resource" />
@@ -58,6 +51,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/CIFlavor/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/CIFlavor/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/assets" type="java-resource" />
@@ -124,7 +124,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.1/jars" />
@@ -137,17 +136,11 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />

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

@@ -164,10 +164,10 @@ public class StudentFragmentGrid extends Fragment{
         progressDialog= ProgressDialog.show(getActivity(), getString(R.string.imguserLoadingMsg),
                 getString(R.string.userLoadingTxt), false, false);
         ImgDownloader downloader = new ImgDownloader(getActivity(), new iImgDownloaderListener() {
-            @Override
-            public void loadComplete() {
+
+            private void loaded() {
                 if (progressDialog!=null && progressDialog.isShowing()) progressDialog.dismiss();
-                if (downloaded_students.size() > 1) {
+                if (downloaded_students.size() >= 1) {
                     for (int i = 0; i < imgs.size(); i++)
                         try {
                             imageStudents.add(imgs.get(i).get_bitmap(getActivity().getBaseContext()));
@@ -181,9 +181,14 @@ public class StudentFragmentGrid extends Fragment{
                 else
                     onlineStudentsOK=true;
             }
+            @Override
+            public void loadComplete() {
+                loaded();
+            }
 
             @Override
             public void loadImg(Img image) {
+                loaded();
             }
             public void error(Exception e) {
               if (progressDialog.isShowing()) progressDialog.dismiss();

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/net/NetServiceTablet.java

@@ -7,6 +7,7 @@ import android.util.Log;
 
 import com.yottacode.pictogram.net.iNetServiceDevice;
 import com.yottacode.pictogram.tabletlibrary.R;
+import com.yottacode.pictogram.tabletlibrary.gui.PictogramActivity;
 import com.yottacode.pictogram.tabletlibrary.gui.SerialActivity;
 import com.yottacode.pictogram.tools.PCBcontext;
 
@@ -19,6 +20,7 @@ import com.yottacode.pictogram.tools.PCBcontext;
 public class NetServiceTablet implements iNetServiceDevice {
 
     private static NotificationCompat.Builder builder;
+    private PictogramActivity pictogramActivity;
 
   public void build() {
 
@@ -85,4 +87,9 @@ public class NetServiceTablet implements iNetServiceDevice {
     }
 
     public void restart_app() {restart_app(null);}
+    public void setPictogramActivity(PictogramActivity pictogramActivity) {this.pictogramActivity=pictogramActivity;}
+    public void updateUserConfig() {
+        this.pictogramActivity.setConfig();
+        this.pictogramActivity.refresh();
+    }
   }

android/Pictogram/tabletlibrary/tabletlibrary.iml

@@ -73,14 +73,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -89,6 +81,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

android/Pictogram/watch/src/main/java/com/yottacode/pictogram/watch/net/NetServiceWatch.java

 package com.yottacode.pictogram.watch.net;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.util.Log;
 import android.widget.TextView;
 
 import com.yottacode.pictogram.net.iNetServiceDevice;
-import com.yottacode.pictogram.watch.R;
 import com.yottacode.pictogram.tools.PCBcontext;
+import com.yottacode.pictogram.watch.R;
 
 
 /**
@@ -52,6 +51,11 @@ public class NetServiceWatch implements iNetServiceDevice {
         PCBcontext.getContext().startActivity(intent);
     }
 
+    @Override
+    public void updateUserConfig() {
+
+    }
+
 
     public void set_notifyTextView(TextView _notifyTextView) {
     this.status = _notifyTextView;

android/Pictogram/watch/watch.iml

@@ -66,14 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/DefaultFlavor/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/DefaultFlavor/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/DefaultFlavor/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />

android/Pictogram/yotta_tablet/build.gradle

@@ -9,14 +9,7 @@ android {
         storePassword 'danoia'
       }
     }*/
-    signingConfigs {
-        config {
-            keyAlias 'config_key'
-            keyPassword 'config_pwd'
-            storeFile file('config_file')
-            storePassword 'config_pwd'
-        }
-    }
+
     compileSdkVersion 24
     buildToolsVersion "23.0.2"
     defaultConfig {
@@ -39,7 +32,6 @@ android {
         PreFlavor {
             resValue "string", "server", "https://pre.yottacode.com"
             resValue "bool", "ssl_connect", "true"
-            signingConfig signingConfigs.config
         }
     }
 }