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

@@ -149,10 +149,9 @@ public class LoginActivity extends AppCompatActivity {
 
     private void loginProcess(String email, String password) {
         ValidateUser user = new ValidateUser(email, password);
-        LdapUser fakeUser = new LdapUser(email, password,"wmi","tutor",email,"Fałszywy",email);
+//        LdapUser fakeUser = new LdapUser(email, password,"wmi","tutor",email,"Fałszywy",email);
 //        disposable.add(ldapService.fakeValidate(fakeUser)
-//        disposable.add(ldapService.validate(user)
+        disposable.add(ldapService.validate(user)
-        disposable.add(ldapService.fakeValidate(fakeUser)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(this::handleResponse, this::handleError));

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

@@ -98,11 +98,12 @@ public class SharingFragment extends PreferenceFragment {
                         else{
                             setListPreferenceData(manualLocationList.getKey(), stringnames,null);
                         }
+                        Log.d("sharingpref", names.toString());
                     }
 
                     @Override
                     public void onError(Throwable e) {
-                        Toast.makeText(getApplicationContext(), R.string.manual_status_error, Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getApplicationContext(), R.string.error_location_fetch, Toast.LENGTH_SHORT).show();
 
                     }
                 }));
@@ -123,14 +124,7 @@ public class SharingFragment extends PreferenceFragment {
         statusesService = ApiClient.getClient(getApplicationContext()).create(PredefinedStatusesService.class);
         disposable = new CompositeDisposable();
         getStatuses(disposable);
-
-        if (PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) {
        getLocations(disposable);
-        }
-        Log.d("SHAR TAB", (String) statusList.getSummary());
-       Log.d("SHAR TAB",( String) manualLocationList.getSummary());
-//       Log.d("SHAR TAB","dupa");
-
 
         locationLevelMapping = new HashMap<Integer, String>();
         locationLevelMapping.put(0, SharingLevel.PRESENCE.toString());
@@ -160,7 +154,6 @@ public class SharingFragment extends PreferenceFragment {
             if (PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) {
                if(!predefinedCoordsList.isEmpty()){
                   preferenceCategory.addPreference(manualLocationList);
-                  getLocations(disposable);
                }
 
                 preferenceCategory.addPreference(manualLocationButton);
@@ -176,6 +169,12 @@ public class SharingFragment extends PreferenceFragment {
         if (!PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) {
             preferenceCategory.removePreference(manualLocationList);
             preferenceCategory.removePreference(manualLocationButton);
+        }else{
+//           if(predefinedCoordsList.isEmpty()){
+////              preferenceCategory.removePreference(manualLocationList);
+//
+//
+//           }
         }
 
         /** Custom manual location list change listener **/
@@ -219,6 +218,7 @@ public class SharingFragment extends PreferenceFragment {
             return true;
         });
 
+
     }
 
     @Override
@@ -230,6 +230,7 @@ public class SharingFragment extends PreferenceFragment {
     }
 
     protected void setListPreferenceData(String lp_name, String[] entries, Integer activeId) {
+       try {
           ListPreference lp = (ListPreference) findPreference(lp_name);
           lp.setEntries(entries);
           CharSequence[] entryValues = new CharSequence[entries.length];
@@ -243,6 +244,11 @@ public class SharingFragment extends PreferenceFragment {
 
           if(entries.length > 0 && activeId != null)
              lp.setValueIndex(activeId);
+       }catch (Exception e){
+//          Toast.makeText(getApplicationContext(),
+//                  "duupa", Toast.LENGTH_SHORT).show();
+       }
+
     };
 
     private void handleResponse(List<String> resp) {

app/src/main/res/values/strings.xml

@@ -233,6 +233,7 @@
     <string name="network_error">Network Error!</string>
     <string name="manual_status_error">Error handling status fetch</string>
     <string name="error_status_fetch">Error handling status fetch</string>
+    <string name="error_location_fetch">Error handling status fetch</string>
 
     <string name="pref_acra_disabled" translatable="false">Auto reporting on issue is OFF</string>
     <string name="pref_acra_enabled" translatable="false">Auto reporting on issue is ON</string>