Fix blacklists

.idea/misc.xml

@@ -29,7 +29,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java

@@ -162,10 +162,10 @@ public class BlackList extends AppCompatActivity {
 
     private void fetchBlackListedUsers() {
         prevSize = blacklistedUsers.size();
-
         blacklistedUsers.clear();
 
         disposable.add(getListOfBlacklistedUsers(tutorId)
+                .doOnSubscribe(t -> didFetched = false)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .flatMap((Function<List<String>, Observable<String>>) Observable::fromIterable)
@@ -179,11 +179,13 @@ public class BlackList extends AppCompatActivity {
                     @Override
                     public void onError(Throwable e) {
                         showError(e);
+                        didFetched = false;
                     }
 
                     @Override
                     public void onComplete() {
                         Collections.sort(blacklistedUsers, (a, b) -> sortByUserName(a,b));
+                        didFetched = true;
                         refreshUI();
                     }
                 }));

app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java

@@ -123,7 +123,26 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
                        List<String> predefinedLocationsNames = Stream.of(coords).map(PredefinedCoordViewModel::getName).toList();
                        List<String> predefinedLocationsUUIDs = Stream.of(coords).map(PredefinedCoordViewModel::getPredefinedCoordinateId).toList();
                         predefinedCoordsList.addAll(coords);
-
+                       if (!PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) {
+                          preferenceCategory.removePreference(manualLocationList);
+                          preferenceCategory.removePreference(removeManualLocation);
+                          preferenceCategory.removePreference(manualLocationButton);
+                       }else{
+                          if(predefinedCoordsList.isEmpty()){
+                             locationSharing.setEnabled(false);
+                             locationSharing.setChecked(false);
+                             PrefUtils.disableSharing(getApplicationContext());
+                             ((MapActivity) getActivity()).handleBackgroundTaskLifeCycle();
+                             removeManualLocation.setEnabled(false);
+                             manualLocationList.setEnabled(false);
+                             manualLocationList.setSummary("");
+                          }else{
+                             manualLocationList.setEnabled(true);
+                             manualLocationList.setSummary(PrefUtils.getCurrentManualLocationName(getApplicationContext()));
+                             removeManualLocation.setEnabled(true);
+                             locationSharing.setEnabled(true);
+                          }
+                       }
                         String[] stringnames = predefinedLocationsNames.toArray(new String[0]);
                        predefinedLocationsList = new ArrayList<>(Arrays.asList(stringnames));
                         List<Integer> activesId = Stream.of(coords).indexed()
@@ -180,26 +199,7 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
         statusMapping.put(0, "available");
         statusMapping.put(1, "consultation");
         statusMapping.put(2, "busy");
-       if (!PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) {
+
-          preferenceCategory.removePreference(manualLocationList);
-          preferenceCategory.removePreference(removeManualLocation);
-          preferenceCategory.removePreference(manualLocationButton);
-       }else{
-          if(predefinedCoordsList.isEmpty()){
-             locationSharing.setEnabled(false);
-             locationSharing.setChecked(false);
-             PrefUtils.disableSharing(getApplicationContext());
-             ((MapActivity) getActivity()).handleBackgroundTaskLifeCycle();
-             removeManualLocation.setEnabled(false);
-             manualLocationList.setEnabled(false);
-             manualLocationList.setSummary("");
-          }else{
-             manualLocationList.setEnabled(true);
-             manualLocationList.setSummary(PrefUtils.getCurrentManualLocationName(getApplicationContext()));
-             removeManualLocation.setEnabled(true);
-             locationSharing.setEnabled(true);
-          }
-       }
         statusList.setSummary(PrefUtils.getUserStatus(getApplicationContext()));
         manualLocationList.setSummary(PrefUtils.getCurrentManualLocationName(getApplicationContext()));
 
@@ -215,8 +215,8 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
         /** Sharing level list **/
         locationMode.setOnPreferenceChangeListener((preference, newValue) -> {
            ((MapActivity) getActivity()).handleBackgroundTaskLifeCycle();
-
            PrefUtils.storeLocationMode(getApplicationContext(), locationLevelMapping.get(Integer.parseInt((String) newValue)));
+
             if (PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.MANUAL.toString())) {
                 if (!predefinedCoordsList.isEmpty()) {
                    preferenceCategory.addPreference(manualLocationList);

app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java

@@ -44,7 +44,6 @@ import com.uam.wmi.findmytutor.utils.WrapContentLinearLayoutManager;
 import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
-
 import java.util.List;
 import java.util.Locale;
 
@@ -61,11 +60,6 @@ import okhttp3.ResponseBody;
 
 public class WhiteList extends AppCompatActivity {
 
-    private CompositeDisposable disposable = new CompositeDisposable();
-    private UserService userService;
-    private boolean didFetched = false;
-    private String tutorId;
-
     @BindView(R.id.recycler_view_whitelist)
     RecyclerView recyclerView;
     @BindView(R.id.white_list_empty_text_view)
@@ -74,7 +68,10 @@ public class WhiteList extends AppCompatActivity {
     Switch aSwitch;
     @BindView(R.id.add_to_white_list_fab)
     FloatingActionButton addToWhiteListFab;
-
+    private CompositeDisposable disposable = new CompositeDisposable();
+    private UserService userService;
+    private boolean didFetched = false;
+    private String tutorId;
     private WhiteListAdapter mAdapter;
     private Integer prevSize;
     private List<User> whitelistedUsers = new ArrayList<>();
@@ -151,6 +148,7 @@ public class WhiteList extends AppCompatActivity {
         whitelistedUsers.clear();
 
         disposable.add(getListOfWhitelistedUsers(tutorId)
+                .doOnSubscribe(t -> didFetched = false)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .flatMap((Function<List<String>, Observable<String>>) Observable::fromIterable)
@@ -164,11 +162,13 @@ public class WhiteList extends AppCompatActivity {
                     @Override
                     public void onError(Throwable e) {
                         showError(e);
+                        didFetched = false;
                     }
 
                     @Override
                     public void onComplete() {
                         Collections.sort(whitelistedUsers, (a, b) -> sortByUserName(a, b));
+                        didFetched = true;
                         refreshUI();
                     }
                 }));
@@ -256,6 +256,7 @@ public class WhiteList extends AppCompatActivity {
     }
 
     private void toggleEmptyNotes() {
+
         if (didFetched && whitelistedUsers.size() == 0) {
             noNotesView.setText(R.string.list_is_empty);
             noNotesView.setVisibility(View.VISIBLE);