issues #560, #561 and password field on login activity implemented

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

@@ -344,7 +344,9 @@ public class Picto  extends Img {
      * @return true if current status is enabled. False in other case.
      */
     public boolean alter_status() {
-        String status=is_enabled() ? JSON_ATTTR_STATUS_VALUES.DISABLED : JSON_ATTTR_STATUS_VALUES.ENABLED;
+        String status=is_enabled()  ? JSON_ATTTR_STATUS_VALUES.DISABLED
+                                    : is_disabled() ? JSON_ATTTR_STATUS_VALUES.INVISIBLE
+                                                    : JSON_ATTTR_STATUS_VALUES.ENABLED;
         Log.i(this.getClass().getCanonicalName(),"Picto id. "+get_id()+" status enabled/disabled modified to "+is_enabled());
         try {
             this.attributes.put(JSON_ATTTRS.STATUS, status);

android/Pictogram/tablet/src/main/java/com/yottacode/pictogram/tablet/gui/LoginActivity.java

@@ -39,23 +39,27 @@ public class LoginActivity extends FragmentActivity {
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        setContentView(R.layout.activity_login);
+      super.onCreate(savedInstanceState);
+      requestWindowFeature(Window.FEATURE_NO_TITLE);
+      setContentView(R.layout.activity_login);
 
-        // Enable logout button
+      // Enable logout button
 
-        final Button logoutButton = (Button) findViewById(R.id.loginTopbarLogout);
-        logoutButton.setEnabled(true);
-        logoutButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent serialActivity = new Intent(getBaseContext(), SerialActivity.class);
-                serialActivity.putExtra("resetPrevUser", true);
-                startActivity(serialActivity);
-            }
-        });
+      final Button logoutButton = (Button) findViewById(R.id.loginTopbarLogout);
+      logoutButton.setEnabled(true);
+      logoutButton.setOnClickListener(new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+          Intent serialActivity = new Intent(getBaseContext(), SerialActivity.class);
+          serialActivity.putExtra("resetPrevUser", true);
+          startActivity(serialActivity);
+        }
+      });
+    }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
         // Set supervisor information on topbar
 
         final TextView supervisorFullNameView = (TextView) findViewById(R.id.loginTopbarSupervisorFullName);

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

@@ -115,12 +115,9 @@ public class StudentFragmentGrid extends Fragment{
             PCBcontext.set_user(new_user, intent.getStringExtra("token"), new iImgDownloaderListener() {
                 @Override
                 public void loadComplete() {
-                  if (progressDialog.isShowing()) {
-                    progressDialog.dismiss();
+                    if (progressDialog.isShowing())                      progressDialog.dismiss();
                     Intent pictogramActivity = new Intent(getActivity(), PictogramActivity.class);
                     startActivity(pictogramActivity);
-
-                  }
                 }
 
                 @Override
@@ -128,7 +125,7 @@ public class StudentFragmentGrid extends Fragment{
 
                 }
                 public void error(Exception e) {
-                  progressDialog.dismiss();
+                  if (progressDialog.isShowing()) progressDialog.dismiss();
                   GUITools.show_alert(StudentFragmentGrid.this.getActivity(), R.string.serverError, e.getMessage());
                   Log.e(this.getClass().getCanonicalName(), "Server error:"+ e.getLocalizedMessage());
                 }
@@ -168,7 +165,7 @@ public class StudentFragmentGrid extends Fragment{
         ImgDownloader downloader = new ImgDownloader(getActivity(), new iImgDownloaderListener() {
             @Override
             public void loadComplete() {
-                progressDialog.dismiss();
+                if (progressDialog.isShowing()) progressDialog.dismiss();
                 if (downloaded_students.size() > 1) {
                     for (int i = 0; i < imgs.size(); i++)
                         try {
@@ -188,7 +185,7 @@ public class StudentFragmentGrid extends Fragment{
             public void loadImg(Img image) {
             }
             public void error(Exception e) {
-              progressDialog.dismiss();
+              if (progressDialog.isShowing()) progressDialog.dismiss();
               GUITools.show_alert(PCBcontext.getContext(), R.string.serverError, e.getMessage());
               Log.e(this.getClass().getCanonicalName(), "Server error:"+ e.getLocalizedMessage());
             }
@@ -209,7 +206,7 @@ public class StudentFragmentGrid extends Fragment{
             @Override
             public void error(Exception e) {
               Log.e(this.getClass().getName(), " Server restapi error: " + e.getLocalizedMessage());
-              progressDialog.dismiss();
+              if (progressDialog.isShowing()) progressDialog.dismiss();
               GUITools.show_alert(getActivity(), R.string.loginErrorTxt, getString(R.string.serverError), new GUITools.iOKListener() {
                 @Override
                 public void ok() {
@@ -222,7 +219,7 @@ public class StudentFragmentGrid extends Fragment{
             }
             @Override
             public void result(JSONArray students) {
-                progressDialog.dismiss();
+                if (progressDialog.isShowing()) progressDialog.dismiss();
                 StudentFragmentGrid.this.downloaded_students=new Vector();
                 for (int i=0;i<students.length();i++) {
                     JSONObject student;
@@ -261,8 +258,13 @@ public class StudentFragmentGrid extends Fragment{
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setRetainInstance(true);
+      super.onCreate(savedInstanceState);
+      setRetainInstance(true);
+    }
+
+  @Override
+    public void onStart() {
+        super.onStart();
         Intent intent=getActivity().getIntent();
         Boolean offline = intent.getBooleanExtra("offline", false);
         int sup_id=intent.getIntExtra("sup_id", 0);
@@ -293,15 +295,17 @@ public class StudentFragmentGrid extends Fragment{
          }
         else
             download_students(sup_id);
-    }
+
+      if (offline || onlineStudentsOK) showStudentsGrid();
+
+  }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_new_student, container, false);
-        gridView = (GridView)view.findViewById(R.id.loginStudentGridView);
-        Boolean offline = getActivity().getIntent().getBooleanExtra("offline", false);
-        if (offline || onlineStudentsOK) showStudentsGrid();
-        return  view;
+      View view = inflater.inflate(R.layout.fragment_new_student, container, false);
+      gridView = (GridView) view.findViewById(R.id.loginStudentGridView);
+      return view;
     }
+
 }

android/Pictogram/tablet/src/main/res/layout/activity_main.xml

@@ -25,7 +25,8 @@
     <EditText
         android:id="@+id/edittext"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+      android:password="true" />
     <!-- The "Translate!" button -->
     <Button
         android:id="@+id/button"
@@ -54,4 +55,4 @@
         android:layout_height="fill_parent"
         android:layout_weight="1"/>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>

android/Pictogram/tablet/src/main/res/layout/activity_serial.xml

@@ -8,7 +8,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".SerialActivity">
+    tools:context=".gui.SerialActivity">
 
     <EditText
         android:id="@+id/serialmail"
@@ -30,10 +30,11 @@
         android:imeActionId="@+id/login"
         android:imeActionLabel="@string/action_entrar"
         android:imeOptions="actionUnspecified"
-        android:inputType="text"
+        android:inputType="textPassword"
         android:maxLines="1"
         android:singleLine="true"
-        android:layout_below="@+id/serialmail"/>
+        android:layout_below="@+id/serialmail"
+       />
 
     <Button
         android:id="@+id/entrar_button" style="?android:textAppearanceSmall"