From a0a52c877b2ed361eac642f800a69dfd15aaef85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Mart=C3=ADn=20Hidalgo?=
 <rubenmartin1991@gmail.com>
Date: Sun, 21 Aug 2016 13:06:13 +0200
Subject: [PATCH] management of frequent users list is working

---
 .../swadroid/modules/messages/Messages.java   |  5 +-
 .../modules/messages/SearchUsers.java         | 83 ++++++++++++-------
 2 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/Messages.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/Messages.java
index 8047474b..965300dc 100644
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/Messages.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/Messages.java
@@ -333,7 +333,7 @@ public class Messages extends Module {
         int newFrequents = 0;
         for(int i=0; i < arrayReceivers.size(); i++){
             for(int j=0; j < frequentsList.size(); j++){
-                if(frequentsList.get(j).getUserNickname() == arrayReceivers.get(i)){
+                if(frequentsList.get(j).getUserNickname().equals(arrayReceivers.get(i).toString())){
                     frequent = true;
                     frequentsList.get(j).setScore(frequentsList.get(j).getScore() * 1.2);
                 }
@@ -350,11 +350,12 @@ public class Messages extends Module {
 
         for(int i=0; i < frequentsList.size()-newFrequents; i++){
             dbHelper.updateFrequentRecipient(frequentsList.get(i));
+            Log.d(TAG, "frequent user updated, score = " + frequentsList.get(i).getScore());
         }
 
         for(int i=frequentsList.size()-newFrequents; i < frequentsList.size(); i++){
-            Log.d(TAG, "new frequent user");
             dbHelper.insertFrequentRecipient(frequentsList.get(i));
+            Log.d(TAG, "frequent user added = " + frequentsList.get(i).getScore());
         }
 
         Toast.makeText(this, messageSent, Toast.LENGTH_LONG).show();
diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/SearchUsers.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/SearchUsers.java
index becb32d9..c05e601d 100644
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/SearchUsers.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/SearchUsers.java
@@ -68,6 +68,7 @@ public class SearchUsers extends Module implements SearchView.OnQueryTextListene
     private boolean hideMenu = false;
     private long courseCode;
     private int numUsers;
+    private int numFrequents;
     private TextView frequentUsersTitle;
     private TextView frequentUsersText;
     private List<FrequentUser> frequentsList;
@@ -80,6 +81,20 @@ public class SearchUsers extends Module implements SearchView.OnQueryTextListene
 
         userFilters = new UsersList();
 
+        arrayReceivers = getIntent().getStringArrayListExtra("receivers");
+        arrayReceiversFirstNames = getIntent().getStringArrayListExtra("receiversFirstNames");
+        arrayReceiversSurNames1 = getIntent().getStringArrayListExtra("receiversSurNames1");
+        arrayReceiversSurNames2 = getIntent().getStringArrayListExtra("receiversSurNames2");
+        arrayPhotos = getIntent().getStringArrayListExtra("receiversPhotos");
+        //save the old receivers
+        oldReceivers = (ArrayList) arrayReceivers.clone();
+        oldReceiversFirstNames = (ArrayList) arrayReceiversFirstNames.clone();
+        oldReceiversSurNames1 = (ArrayList) arrayReceiversSurNames1.clone();
+        oldReceiversSurNames2 = (ArrayList) arrayReceiversSurNames2.clone();
+        oldPhotos = (ArrayList) arrayPhotos.clone();
+
+        search = "";
+
         //users list
         lvUsers = (ListView) findViewById(R.id.listItems);
         lvUsers.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
@@ -98,14 +113,15 @@ public class SearchUsers extends Module implements SearchView.OnQueryTextListene
         frequentUsers = new FrequentUsersList();
         frequentUsersText = (TextView) findViewById(R.id.listText);
 
-        frequentsList = dbHelper.getAllRows(DataBaseHelper.DB_TABLE_FREQUENT_RECIPIENTS, "", "score");
+        frequentsList = dbHelper.getAllRows(DataBaseHelper.DB_TABLE_FREQUENT_RECIPIENTS, "", "score DESC");
+        numFrequents = frequentsList.size();
 
-        if(frequentsList.size() == 0) {
+        if(numFrequents == 0) {
             frequentUsersText.setVisibility(View.VISIBLE);
         }
         else{
             frequentUsersText.setVisibility(View.GONE);
-            for(int i=0; i<frequentsList.size(); i++){
+            for(int i=0; i<numFrequents; i++){
                 String nickname = frequentsList.get(i).getUserNickname();
                 String surname1 = frequentsList.get(i).getUserSurname1();
                 String surname2 = frequentsList.get(i).getUserSurname2();
@@ -115,9 +131,19 @@ public class SearchUsers extends Module implements SearchView.OnQueryTextListene
                 Double score = frequentsList.get(i).getScore();
                 frequentUsers.saveUser(new FrequentUser(nickname, surname1, surname2, firstname, userPhoto, selected, score));
             }
+
+            for(int i=0; i<numFrequents; i++){
+                if (arrayReceivers.contains(frequentUsers.getUsers().get(i).getUserNickname().toString())) {
+                    frequentUsers.getUsers().get(i).setCheckbox(true);
+                }
+                else
+                    frequentUsers.getUsers().get(i).setCheckbox(false);
+            }
             frequentAdapter = new FrequentUsersAdapter(getBaseContext(), frequentUsers.getUsers());
             lvUsers.setAdapter(frequentAdapter);
             lvUsers.setVisibility(View.VISIBLE);
+
+
         }
 
         //checkbox is checked when the row of an user is clicked
@@ -147,20 +173,6 @@ public class SearchUsers extends Module implements SearchView.OnQueryTextListene
             }
         });
 
-        arrayReceivers = getIntent().getStringArrayListExtra("receivers");
-        arrayReceiversFirstNames = getIntent().getStringArrayListExtra("receiversFirstNames");
-        arrayReceiversSurNames1 = getIntent().getStringArrayListExtra("receiversSurNames1");
-        arrayReceiversSurNames2 = getIntent().getStringArrayListExtra("receiversSurNames2");
-        arrayPhotos = getIntent().getStringArrayListExtra("receiversPhotos");
-        //save the old receivers
-        oldReceivers = (ArrayList) arrayReceivers.clone();
-        oldReceiversFirstNames = (ArrayList) arrayReceiversFirstNames.clone();
-        oldReceiversSurNames1 = (ArrayList) arrayReceiversSurNames1.clone();
-        oldReceiversSurNames2 = (ArrayList) arrayReceiversSurNames2.clone();
-        oldPhotos = (ArrayList) arrayPhotos.clone();
-
-        search = "";
-
         setMETHOD_NAME("findUsers");
     }
 
@@ -216,6 +228,14 @@ public class SearchUsers extends Module implements SearchView.OnQueryTextListene
                     else
                         userFilters.getUsers().get(i).setCheckbox(false);
                 }
+
+                for(int i=0; i<numFrequents; i++){
+                    if (arrayReceivers.contains(frequentUsers.getUsers().get(i).getUserNickname().toString())) {
+                        frequentUsers.getUsers().get(i).setCheckbox(true);
+                    }
+                    else
+                        frequentUsers.getUsers().get(i).setCheckbox(false);
+                }
             }
 
         });
@@ -253,25 +273,20 @@ public class SearchUsers extends Module implements SearchView.OnQueryTextListene
                     onQueryTextSubmit(search); //find users with string search
                 }
                 else {
-                    frequentsList = dbHelper.getAllRows(DataBaseHelper.DB_TABLE_FREQUENT_RECIPIENTS);
-
-                    if(frequentsList.size() == 0) {
+                    if(numFrequents == 0) {
                         lvUsers.setVisibility(View.GONE);
                         frequentUsersText.setVisibility(View.VISIBLE);
                     }
                     else{
-                        frequentUsers = new FrequentUsersList();
                         frequentUsersText.setVisibility(View.GONE);
-                        for(int i=0; i<frequentsList.size(); i++){
-                            String nickname = frequentsList.get(i).getUserNickname();
-                            String surname1 = frequentsList.get(i).getUserSurname1();
-                            String surname2 = frequentsList.get(i).getUserSurname2();
-                            String firstname = frequentsList.get(i).getUserFirstname();
-                            String userPhoto = frequentsList.get(i).getUserPhoto();
-                            boolean selected = frequentsList.get(i).getCheckbox();
-                            Double score = frequentsList.get(i).getScore();
-                            frequentUsers.saveUser(new FrequentUser(nickname, surname1, surname2, firstname, userPhoto, selected, score));
+                        for(int i=0; i<numFrequents; i++){
+                            if (arrayReceivers.contains(frequentUsers.getUsers().get(i).getUserNickname().toString())) {
+                                frequentUsers.getUsers().get(i).setCheckbox(true);
+                            }
+                            else
+                                frequentUsers.getUsers().get(i).setCheckbox(false);
                         }
+
                         frequentAdapter = new FrequentUsersAdapter(getBaseContext(), frequentUsers.getUsers());
                         lvUsers.setAdapter(frequentAdapter);
                         lvUsers.setVisibility(View.VISIBLE);
@@ -329,6 +344,14 @@ public class SearchUsers extends Module implements SearchView.OnQueryTextListene
             else
                 userFilters.getUsers().get(i).setCheckbox(false);
         }
+
+        for(int i=0; i<numFrequents; i++){
+            if (arrayReceivers.contains(frequentUsers.getUsers().get(i).getUserNickname().toString())) {
+                frequentUsers.getUsers().get(i).setCheckbox(true);
+            }
+            else
+                frequentUsers.getUsers().get(i).setCheckbox(false);
+        }
     }
 
     @Override