Merge branch 'develop' of ssh://git.wmi.amu.edu.pl/s416084/find-my-tutor-android into develop

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/MapActivity.java

@@ -338,6 +338,7 @@ public class MapActivity extends BaseActivity
                     modalUserInput.requestFocus();
                 } else {
                     sendLocation(body, latLng);
+                    PrefUtils.putCurrentManualLocationName(getApplicationContext(),body);
                     alertDialog.dismiss();
                 }
             });

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());
@@ -158,9 +152,10 @@ public class SharingFragment extends PreferenceFragment {
 
             PrefUtils.storeLocationMode(getApplicationContext(), locationLevelMapping.get(Integer.parseInt((String) newValue)));
             if (PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) {
-
+               if(!predefinedCoordsList.isEmpty()){
                   preferenceCategory.addPreference(manualLocationList);
-                getLocations(disposable);
+               }
+
                 preferenceCategory.addPreference(manualLocationButton);
 
             } else {
@@ -174,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 **/
@@ -217,6 +218,7 @@ public class SharingFragment extends PreferenceFragment {
             return true;
         });
 
+
     }
 
     @Override
@@ -228,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];
@@ -241,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) {
@@ -250,6 +258,8 @@ public class SharingFragment extends PreferenceFragment {
 
         statusList.setValueIndex(resp.size() - 1);
         PrefUtils.storeStatus(getApplicationContext(), resp.get(resp.size() - 1));
+       statusList.setSummary(PrefUtils.getUserStatus(getApplicationContext()));
+
 
     }
 

app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java

@@ -62,7 +62,7 @@ public class PrefUtils {
     }
 
     public static String getUserStatus(Context context) {
-        return getSharedPreferences(context).getString("status_entry", "Available");
+        return getSharedPreferences(context).getString("status_entry", "Dostępny");
     }
 
     public static void storeStatus(Context context, String status) {

app/src/main/res/layout/pref_sharing.xml

@@ -41,7 +41,7 @@
             android:persistent="true"
             android:title="@string/status_switch_title"/>
         <ListPreference
-            android:defaultValue="1"
+            android:defaultValue="2"
             android:key="@string/key_status_value"
             android:summary="%s"
             android:title="@string/status_list_title" />

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>