issues #276,#310,#311 and #312 closed

f2c56467 · Fernando Martínez Santiago · d5dc05d9 · f2c56467 · f2c56467 · f2c56467
Commit f2c56467 authored Aug 22, 2017 by Fernando Martínez Santiago
Showing with 39 additions and 33 deletions
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/UserLogin.java
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/tools/PCBcontext.java
android/Pictogram/commonlibrary/src/main/res/values-es/strings.xml
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/VocabularyManager.java
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/StudentFragmentGrid.java
--- a/android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/UserLogin.java
+++ b/android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/UserLogin.java
@@ -50,8 +50,6 @@ public class UserLogin {
    if (online) {
      Log.i(LOG_TAG, "Online login request for supervisor "+email);
-      final ProgressDialog progressDialog = ProgressDialog.show(activity, activity.getBaseContext().getString(R.string.userLoadingTxt),
-        activity.getBaseContext().getString(R.string.userLoadingTxt), false, false);
      ServerLogin.login_supervisor(email, password, new RestapiWrapper.iRestapiListener() {
        @Override
        public void preExecute() {
@@ -65,7 +63,6 @@ public class UserLogin {
        @Override
        public void result(JSONObject result) {
-          if (progressDialog.isShowing()) progressDialog.dismiss();
          String jsonToken;
          JSONObject user;
          try {
@@ -108,7 +105,6 @@ public class UserLogin {
        @Override
        public void error(RestapiWrapper.HTTPException e) {
          Log.i(this.getClass().getCanonicalName(),"Login fail:"+e.getMessage()+" ("+e.getClass().getCanonicalName()+")");
-          if (progressDialog.isShowing()) progressDialog.dismiss();
          if (e instanceof LoginException)
            if (((LoginException)e).invalidLicense())
                  GUITools.show_alert(activity, R.string.loginNoLicenseMsg);

--- a/android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/tools/PCBcontext.java
+++ b/android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/tools/PCBcontext.java
@@ -197,7 +197,7 @@ public  final class PCBcontext {
    public static RestapiWrapper getRestapiWrapper(){
        if (wrapper == null) {
            throw new java.lang.NullPointerException("RestapiWrapper is null. PCBcontext.init" +
-                    "must be invoked previously");
+                    " must be invoked previously");
        }
        return wrapper;
    }

--- a/android/Pictogram/commonlibrary/src/main/res/values-es/strings.xml
+++ b/android/Pictogram/commonlibrary/src/main/res/values-es/strings.xml
@@ -23,7 +23,7 @@
    <string name="userLoadingMsg">Cargando alumnos. Por favor espere.</string>
    <string name="loginErrorTxt">Login</string>
    <string name="loginErrorMsg">El usuario no existe o la contraseña indicada no es correcta. Inténtelo de nuevo.</string>
-    <string name="loginNoLicenseMsg">La licencia del usuario expiró con fecha. Contacte con Yotta para adquirir una.</string>
+    <string name="loginNoLicenseMsg">Licencia incorrecta o caducada. Contacte con Yotta para adquirir una.</string>
    <string name="loginExpiredLicenseMsg">La licencia del usuario expiró con fecha</string>
    <string name="imguserLoadingMsg">Cargando imágenes de los alumnos. Por favor espere.</string>
    <string name="imguserLoadingErrMsg">Imagen con formato no válido.</string>

--- a/android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/VocabularyManager.java
+++ b/android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/VocabularyManager.java
@@ -271,8 +271,7 @@ public class VocabularyManager extends Activity implements VocabularyTalk.iVocab
        toUserListBtn.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
-                Intent nextActivity = new Intent(getBaseContext(), LoginActivity.class);
+                PCBcontext.getNetService().restart_app(false);
-                startActivity(nextActivity);
            }
        });

--- a/android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/StudentFragmentGrid.java
+++ b/android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/StudentFragmentGrid.java
@@ -51,7 +51,6 @@ public class StudentFragmentGrid extends Fragment{
    final String TAG_PIC = "pic";
    final String TAG_LANG = "lang";
    final String TAG_ATTRIBUTES = "attributes";
-    //TODO: para qué sirve: final String TAG_SUPERVISION="supervision";
    ProgressDialog progressDialog;
    Vector<Integer> idStudents;
    String nameStudents[];
@@ -63,7 +62,6 @@ public class StudentFragmentGrid extends Fragment{
    boolean onlineStudentsOK=false;
    private void showStudentsGrid(){
        CustomList adapter = new CustomList(getActivity(), nameStudents, imageStudents);
        gridView.setAdapter(adapter);
        gridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -88,14 +86,14 @@ public class StudentFragmentGrid extends Fragment{
            startActivity(pictogramActivity);
        } else {
            if (this.nameStudents[i].equals(getString(R.string.addStudent)))
-                register_student();
+                register_student(getActivity().getIntent().getIntExtra("sup_id", 0));
            else {
                new_user(i);
                download_supervisors(PCBcontext.getPcbdb().getCurrentUser().get_id_stu());
            }
        }
    }
-private void register_student() {
+private void register_student(final int sup_id) {
    AlertDialog.Builder alert = new AlertDialog.Builder(this.getActivity());
    final EditText edittext = new EditText(this.getActivity());
    alert.setMessage(getString(R.string.getLicenseStudent));
@@ -106,7 +104,30 @@ private void register_student() {
    alert.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
        public void onClick(DialogInterface dialog, int whichButton) {
            //What ever you want to do with the value
-            String license = edittext.getText().toString();
+            String license = edittext.getText().toString().replaceAll("[^a-zA-Z0-9]","").toUpperCase();
+            RestapiWrapper wrapper = PCBcontext.getRestapiWrapper();
+            String operation = "stu/license/sup/" + sup_id ;
+            Hashtable<String, String> params=new Hashtable<String, String>(1);
+            params.put("license",license);
+            wrapper.ask(operation, params,  "post", new RestapiWrapper.iRestapiListener() {
+                @Override
+                public void error(RestapiWrapper.HTTPException e) {
+                    Log.e(this.getClass().getName(), " Server restapi error: " + e.getLocalizedMessage());
+                    String err = e.getLocalizedMessage();
+                    if ( err.indexOf("nvalid license") > 0)
+                        GUITools.show_alert(getActivity(),R.string.loginNoLicenseMsg);
+                }
+                @Override
+                public void preExecute() {
+                }
+                @Override
+                public void result(JSONArray result) {
+                }
+                @Override
+                public void result(JSONObject result) {
+                            PCBcontext.getNetService().restart_app(false);
+                    }
+            });
        }
    });
@@ -175,7 +196,7 @@ private void register_student() {
        }
    }
    private void show_student_list_online() {
-        int listsize=downloaded_students.size()+1;
+        final int listsize=downloaded_students.size()+1;
        final Vector<Img> imgs = new Vector<>(listsize);
        this.nameStudents=new String[listsize];
        this.idStudents=new Vector<>(listsize);
@@ -202,21 +223,16 @@ private void register_student() {
        nameStudents[listsize-1]=getString(R.string.addStudent);
        idStudents.add(-1);
        imgs.add(new Img(-1,null,Img.STUDENT)); //it's required to download student's images
-        progressDialog= ProgressDialog.show(getActivity(), getString(R.string.imguserLoadingMsg),
-                getString(R.string.userLoadingTxt), false, false);
        ImgDownloader downloader = new ImgDownloader(getActivity(), new ImgDownloader.iImgDownloaderListener() {
            private void loaded() {
-                if (progressDialog!=null && progressDialog.isShowing()) progressDialog.dismiss();
+                try {
-                if (downloaded_students.size() >= 1) {
+                    if (downloaded_students.size() >= 1)
-                    for (int i = 0; i < imgs.size(); i++)
+                        for (int i = 0; i < imgs.size(); i++)
-                        try {
                            imageStudents.add(imgs.get(i).get_bitmap(getActivity().getBaseContext()));
-                        } catch (IOException e) {
+                    imageStudents.add(imgs.get(listsize-1).get_bitmap(getActivity().getBaseContext()));
-                            e.printStackTrace();
+                } catch (IOException e) {
-                            Log.e(StudentFragmentGrid.this.getClass().getCanonicalName(),e.getMessage());
+                    e.printStackTrace();
-                        }
+                    Log.e(StudentFragmentGrid.this.getClass().getCanonicalName(),e.getMessage());
                }
                if (StudentFragmentGrid.super.getView()!=null)
                    showStudentsGrid();
@@ -312,19 +328,15 @@ private void register_student() {
        });
    }
-    private void download_students(int sup_id ) {
+    private void download_students(final int sup_id ) {
        String token = getActivity().getIntent().getExtras().getString("token");
        RestapiWrapper wrapper = PCBcontext.getRestapiWrapper();
        wrapper.setToken(token);
        String operation = "sup/" + sup_id + "/students";
-        progressDialog= ProgressDialog.show(getActivity(), getString(R.string.userLoadingTxt),
-                getString(R.string.userLoadingTxt), false, false);
        wrapper.ask(operation, new RestapiWrapper.iRestapiListener() {
            @Override
            public void error(RestapiWrapper.HTTPException e) {
              Log.e(this.getClass().getName(), " Server restapi error: " + e.getLocalizedMessage());
-              if (progressDialog.isShowing()) progressDialog.dismiss();
              GUITools.show_alert(getActivity(), R.string.loginErrorTxt, getString(R.string.serverError), new GUITools.iOKListener() {
                @Override
                public void ok() {
@@ -343,8 +355,7 @@ private void register_student() {
                    JSONObject student;
                    try {
                        student = students.getJSONObject(i);
-                        //if (student.getInt(TAG_SUPERVISION)>0)
+                        StudentFragmentGrid.this.downloaded_students.add(student);
-                            StudentFragmentGrid.this.downloaded_students.add(student);
                    } catch (JSONException e) {
                        e.printStackTrace();
                    }