.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/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.uam.wmi.findmytutor"
         minSdkVersion 22
         targetSdkVersion 27
-        versionCode 14
+        versionCode 17
-        versionName "0.9.1-alpha"
+        versionName "0.9.2-alpha"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -54,7 +54,8 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
     implementation 'io.swagger:swagger-annotations:1.5.15'
     implementation 'org.threeten:threetenbp:1.3.5'
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:6.6.5'
+    implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:6.7.2'
+    implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:4.0.0'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.0'
     implementation 'com.android.support:recyclerview-v7:27.1.1'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
@@ -68,7 +69,6 @@ dependencies {
     implementation 'com.auth0.android:jwtdecode:1.1.1'
     implementation 'com.annimon:stream:1.2.1'
     implementation 'com.google.android.gms:play-services-location:16.0.0'
-    implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:4.0.0'
     // FloatingBarMenu
     implementation 'com.getbase:floatingactionbutton:1.10.1'
     implementation 'org.apache.commons:commons-collections4:4.0'

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

@@ -21,6 +21,7 @@ import com.auth0.android.jwt.JWT;
 import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
 import com.uam.wmi.findmytutor.R;
 import com.uam.wmi.findmytutor.model.JwtToken;
+import com.uam.wmi.findmytutor.model.LdapUser;
 import com.uam.wmi.findmytutor.model.User;
 import com.uam.wmi.findmytutor.model.ValidateUser;
 import com.uam.wmi.findmytutor.network.ApiClient;
@@ -148,8 +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);
         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

@@ -134,7 +134,6 @@ public class MapActivity extends BaseActivity
         findViewById(R.id.mapInfoImageButton).setOnClickListener(v-> InfoHelperUtils.infoPopUp(v, R.layout.info_popup_map));
         selectLocationButton = findViewById(R.id.select_location_button);
         removeLocationButton = findViewById(R.id.remove_location_button);
-        Mapbox.getInstance(this, getString(R.string.access_token));
         mapView = findViewById(R.id.mapView);
         mapView.onCreate(savedInstanceState);
         mapView.getMapAsync(this);
@@ -348,6 +347,7 @@ public class MapActivity extends BaseActivity
                     modalUserInput.requestFocus();
                 } else {
                     sendLocation(body, latLng);
+                    PrefUtils.putCurrentManualLocationName(getApplicationContext(),body);
                     alertDialog.dismiss();
                 }
             });
@@ -646,6 +646,7 @@ public class MapActivity extends BaseActivity
 
     @Override
     protected int getContentViewId() {
+        Mapbox.getInstance(this, getString(R.string.access_token));
         return R.layout.activity_map;
     }
 

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

@@ -66,7 +66,7 @@ public class SharingFragment extends PreferenceFragment {
                     @Override
                     public void onSuccess(List<String> strings) {
                         String[] statusesArray = strings.toArray(new String[strings.size()]);
-                        setListPreferenceData(statusList.getKey(), statusesArray,strings.size() -1);
+                        setListPreferenceData(statusList.getKey(), statusesArray,null);
                     }
 
                     @Override
@@ -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();
 
                     }
                 }));
@@ -120,14 +121,10 @@ public class SharingFragment extends PreferenceFragment {
         manualLocationButton = (RightButtonPreference) findPreference("manual_location_button");
         manualStatus = findPreference("key_manual_status");
         statusList = (ListPreference) findPreference("key_status_value");
-
         statusesService = ApiClient.getClient(getApplicationContext()).create(PredefinedStatusesService.class);
         disposable = new CompositeDisposable();
         getStatuses(disposable);
-
+       getLocations(disposable);
-        if (PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) {
-            getLocations(disposable);
-        }
 
         locationLevelMapping = new HashMap<Integer, String>();
         locationLevelMapping.put(0, SharingLevel.PRESENCE.toString());
@@ -140,6 +137,9 @@ public class SharingFragment extends PreferenceFragment {
         statusMapping.put(1, "consultation");
         statusMapping.put(2, "busy");
 
+        statusList.setSummary(PrefUtils.getUserStatus(getApplicationContext()));
+        manualLocationList.setSummary(PrefUtils.getCurrentManualLocationName(getApplicationContext()));
+//        manualLocationList.setSummary(PrefUtils.getManualLocation(getApplicationContext()));
         /** Main sharing switch**/
         locationSharing.setOnPreferenceChangeListener((buttonView, newValue) -> {
             PrefUtils.storeEnableSharingLocalization(getApplicationContext(), (Boolean) newValue);
@@ -152,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);
+               }
 
-                preferenceCategory.addPreference(manualLocationList);
-                getLocations(disposable);
                 preferenceCategory.addPreference(manualLocationButton);
 
             } else {
@@ -168,16 +169,23 @@ 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 **/
         manualLocationList.setOnPreferenceChangeListener((preference, newValue) -> {
             ListPreference lp = (ListPreference) preference;
-
+            CharSequence[] entries = lp.getEntries();
             PredefinedCoordViewModel temp = Stream.of(predefinedCoordsList).filter(p -> p.getName().equals(lp.getEntries()[Integer.parseInt((String) newValue)].toString())).toList().get(0);
-
             PrefUtils.putManualLocation(getApplicationContext(), temp.getGeoData(), temp.getApproximatedLocation() );
             PrefUtils.putCurrentManualLocation(getApplicationContext(),temp.getPredefinedCoordinateId());
+            PrefUtils.putCurrentManualLocationName(getApplicationContext(), (String )lp.getEntries()[Integer.parseInt((String) newValue)]);
+            lp.setSummary(lp.getEntries()[Integer.parseInt((String) newValue)]);
 
             return true;
         });
@@ -195,7 +203,7 @@ public class SharingFragment extends PreferenceFragment {
             ListPreference lp = (ListPreference) preference;
             CharSequence[] entries = lp.getEntries();
             PrefUtils.storeStatus(getApplicationContext(), (String) entries[Integer.parseInt((String) newValue)]);
-
+            lp.setSummary(entries[Integer.parseInt((String) newValue)]);
             return true;
         });
         /** Custom status list change listener **/
@@ -210,6 +218,7 @@ public class SharingFragment extends PreferenceFragment {
             return true;
         });
 
+
     }
 
     @Override
@@ -221,19 +230,25 @@ public class SharingFragment extends PreferenceFragment {
     }
 
     protected void setListPreferenceData(String lp_name, String[] entries, Integer activeId) {
-        ListPreference lp = (ListPreference) findPreference(lp_name);
+       try {
-        lp.setEntries(entries);
+          ListPreference lp = (ListPreference) findPreference(lp_name);
-        CharSequence[] entryValues = new CharSequence[entries.length];
+          lp.setEntries(entries);
+          CharSequence[] entryValues = new CharSequence[entries.length];
 
-        for (int i = 0; i < entries.length; i++) {
+          for (int i = 0; i < entries.length; i++) {
-            entryValues[i] = Integer.toString(i);
+             entryValues[i] = Integer.toString(i);
-        }
+          }
 
-        lp.setDefaultValue(0);
+          lp.setDefaultValue(0);
-        lp.setEntryValues(entryValues);
+          lp.setEntryValues(entryValues);
+
+          if(entries.length > 0 && activeId != null)
+             lp.setValueIndex(activeId);
+       }catch (Exception e){
+//          Toast.makeText(getApplicationContext(),
+//                  "duupa", Toast.LENGTH_SHORT).show();
+       }
 
-        if(entries.length > 0 && activeId != null)
-            lp.setValueIndex(activeId);
     };
 
     private void handleResponse(List<String> resp) {
@@ -243,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/activity/UsersListFragment.java

@@ -214,6 +214,7 @@ public class UsersListFragment extends Fragment {
                             @Override
                             public void onSuccess(List<User> users) {
                                 tutorsList.clear();
+                                tutorsFiltered.clear();
                                 tutorsList.addAll(users);
                                 tutorsFiltered.addAll(users);
                                 mAdapter.notifyDataSetChanged();

app/src/main/java/com/uam/wmi/findmytutor/model/Coordinate.java

@@ -16,13 +16,10 @@ import io.swagger.annotations.ApiModelProperty;
  */
 
 public class Coordinate extends BaseResponse {
-    private Range<Double> latitudeRange = Const.latitudeRange;
+    private Range<Double> latitudeRange = Const.buildingLatitudeRange;
-    private Range<Double> longtitudeRange =  Const.longitudeRange;
+    private Range<Double> longtitudeRange =  Const.buildingLongitudeRange;
     private List<String> allowedApproximatedLocations = Const.validApproximatedLocations;
 
-    @SerializedName("coordinateId")
-    private UUID coordinateId = null;
-
     @SerializedName("latitude")
     private Double latitude;
 
@@ -66,23 +63,9 @@ public class Coordinate extends BaseResponse {
     }
 
     public Coordinate coordinateId(UUID coordinateId) {
-        this.coordinateId = coordinateId;
         return this;
     }
 
-    /**
-     * Get coordinateId
-     * @return coordinateId
-     **/
-    @ApiModelProperty(required = true, value = "")
-    public UUID getCoordinateId() {
-        return coordinateId;
-    }
-
-    public void setCoordinateId(UUID coordinateId) {
-        this.coordinateId = coordinateId;
-    }
-
     public Coordinate latitude(Double latitude) {
         this.latitude = latitude;
         return this;
@@ -236,8 +219,7 @@ public class Coordinate extends BaseResponse {
             return false;
         }
         Coordinate coordinate = (Coordinate) o;
-        return Objects.equals(this.coordinateId, coordinate.coordinateId) &&
+        return  Objects.equals(this.latitude, coordinate.latitude) &&
-                Objects.equals(this.latitude, coordinate.latitude) &&
                 Objects.equals(this.longitude, coordinate.longitude) &&
                 Objects.equals(this.altitude, coordinate.altitude) &&
                 Objects.equals(this.userId, coordinate.userId) &&
@@ -249,7 +231,7 @@ public class Coordinate extends BaseResponse {
 
     @Override
     public int hashCode() {
-        return Objects.hash(coordinateId, latitude, longitude, altitude, userId, approximatedLocation, displayMode, timeStamp, label);
+        return Objects.hash( latitude, longitude, altitude, userId, approximatedLocation, displayMode, timeStamp, label);
     }
 
 
@@ -258,7 +240,6 @@ public class Coordinate extends BaseResponse {
         StringBuilder sb = new StringBuilder();
         sb.append("class Coordinate {\n");
 
-        sb.append("    coordinateId: ").append(toIndentedString(coordinateId)).append("\n");
         sb.append("    latitude: ").append(toIndentedString(latitude)).append("\n");
         sb.append("    longitude: ").append(toIndentedString(longitude)).append("\n");
         sb.append("    altitude: ").append(toIndentedString(altitude)).append("\n");

app/src/main/java/com/uam/wmi/findmytutor/network/ApiClient.java

@@ -26,7 +26,7 @@ public class ApiClient {
         private static Retrofit retrofit = null;
         private static int REQUEST_TIMEOUT = 60;
         private static OkHttpClient okHttpClient;
-        private static final String BASE_URL = "https://s416084.projektstudencki.pl/develop/";
+        private static final String BASE_URL = "https://s416084.projektstudencki.pl/master/";
 
         public static Retrofit getClient(Context context) {
 

app/src/main/java/com/uam/wmi/findmytutor/service/BackgroundLocalizationService.java

@@ -40,30 +40,32 @@ import org.apache.commons.collections4.queue.CircularFifoQueue;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.TimerTask;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.observers.DisposableCompletableObserver;
 import io.reactivex.observers.DisposableSingleObserver;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.ResponseBody;
 
-import static com.uam.wmi.findmytutor.utils.Const.defaultBackgroundLocationInterval;
+import static com.uam.wmi.findmytutor.utils.Const.offlineBackgroundLocationInterval;
+import static com.uam.wmi.findmytutor.utils.Const.onlineBackgroundLocationInterval;
 import static com.uam.wmi.findmytutor.utils.Const.presenceApproximatedName;
 import static com.uam.wmi.findmytutor.utils.Const.presenceLatitude;
 import static com.uam.wmi.findmytutor.utils.Const.presenceLongitude;
 import static com.uam.wmi.findmytutor.utils.PrefUtils.storeBackgroundLocationStatus;
+import static java.lang.String.valueOf;
 
 public class BackgroundLocalizationService extends Service {
 
     private static final String TAG = "MyLocationService";
-    private static final int LOCATION_INTERVAL = 1000;
+    private static final float LOCATION_DISTANCE = 1f;
-    private static final float LOCATION_DISTANCE = 5f;
+    private static long notify_interval = onlineBackgroundLocationInterval;
-    private static long notify_interval = defaultBackgroundLocationInterval;
+    private static long notify_interval_inside_building = onlineBackgroundLocationInterval;
-    private static long notify_interval_inside_building = defaultBackgroundLocationInterval;
+    private static long notify_interval_outside_building = offlineBackgroundLocationInterval;
-    private static long notify_interval_outside_building = 360000;
+    private static int coordinatesHistoryLength = 5;
-    private static int coordinatesHistoryLength = 10;
+    private static final Long LOCATION_INTERVAL = notify_interval;
     private Location mLastLocation;
     private Boolean stopService = false;
     private ArrayList<String> providers = new ArrayList<String>();
@@ -149,7 +151,7 @@ public class BackgroundLocalizationService extends Service {
         if (!stopService) {
             mStatusChecker = () -> {
                 try {
-                    fn_getlocation();
+                    getLocalizationFromListeners();
                     changeBackgroundMode();
                 } finally {
                     mHandler.postDelayed(mStatusChecker, notify_interval);
@@ -178,9 +180,8 @@ public class BackgroundLocalizationService extends Service {
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     private void startMyOwnForeground() {
-
         String NOTIFICATION_CHANNEL_ID = "com.example.fmt";
-        String channelName = "My Background Service";
+        String channelName = "FMT Background location service";
         NotificationChannel chan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, NotificationManager.IMPORTANCE_NONE);
         chan.setLightColor(Color.BLUE);
         chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
@@ -197,7 +198,7 @@ public class BackgroundLocalizationService extends Service {
         startForeground(2, notification);
     }
 
-    private void fn_getlocation() {
+    private void getLocalizationFromListeners() {
         if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
             // TODO: Consider calling
             //    ActivityCompat#requestPermissions
@@ -218,7 +219,7 @@ public class BackgroundLocalizationService extends Service {
                     if (location != null) {
                         mLastLocation = location;
                         coordinatesHistory.add(location);
-                        fn_update(location);
+                        sendCoordinateToBackend(location);
                     }
 
                     triggerAnotherLocationListener.set(true);
@@ -237,12 +238,11 @@ public class BackgroundLocalizationService extends Service {
             }
 
             coordinatesHistory.add(bestLocation);
-            Log.e("Best localization:", String.valueOf(bestLocation));
         }
 
     }
 
-    private void fn_update(Location location) {
+    private void sendCoordinateToBackend(Location location) {
         new Task(location).execute();
     }
 
@@ -278,7 +278,7 @@ public class BackgroundLocalizationService extends Service {
     
     private class LocationListener implements android.location.LocationListener {
 
-        public LocationListener(String provider) {
+        LocationListener(String provider) {
             Log.e(TAG, "LocationListener " + provider);
             mLastLocation = new Location(provider);
         }
@@ -328,6 +328,7 @@ public class BackgroundLocalizationService extends Service {
         protected Object doInBackground(Object[] objects) {
 
             String locationLevel = PrefUtils.getLocationLevel(getApplicationContext());
+            String status = (PrefUtils.isStatusEnabled(getApplicationContext())) ? PrefUtils.getUserStatus(getApplicationContext()) : "";
 
             if (locationLevel.equals(SharingLevel.PRESENCE.toString())) {
                 latitude = presenceLatitude;
@@ -350,27 +351,28 @@ public class BackgroundLocalizationService extends Service {
                         longitude,
                         altitude,
                         approximatedBuildingPart,
-                        (PrefUtils.isStatusEnabled(getApplicationContext())) ? PrefUtils.getUserStatus(getApplicationContext()) : "",
+                        status,
                         PrefUtils.getUserId(getApplicationContext()),
                         locationLevel
                 );
 
                 disposable.add(
                         coordinateService
-                                .postCoordinate(coordinate)
+                                .putCoordinate(coordinate, PrefUtils.getUserId(getApplicationContext()))
                                 .subscribeOn(Schedulers.io())
                                 .observeOn(AndroidSchedulers.mainThread())
-                                .subscribeWith(new DisposableSingleObserver<Coordinate>() {
+                                .subscribeWith(new DisposableCompletableObserver() {
-                                    @SuppressLint("LongLogTag")
+
                                     @Override
-                                    public void onSuccess(Coordinate coord) {
+                                    public void onComplete() {
-                                        Log.e("CoordinateService onSuccess", String.valueOf(coord));
+                                        Log.e(TAG, "CoordinateSuccess");
                                     }
 
-                                    @SuppressLint("LongLogTag")
                                     @Override
                                     public void onError(Throwable e) {
-                                        Log.e("CoordinateService onError", e.getMessage());
+
+                                        Log.e(TAG,"onErr" + valueOf(e));
+
                                     }
                                 }));
             } catch (IllegalArgumentException e) {

app/src/main/java/com/uam/wmi/findmytutor/service/CoordinateService.java

@@ -3,6 +3,7 @@ package com.uam.wmi.findmytutor.service;
 import com.uam.wmi.findmytutor.model.Coordinate;
 import java.util.List;
 
+import io.reactivex.Completable;
 import io.reactivex.Single;
 import retrofit2.http.Body;
 import retrofit2.http.DELETE;
@@ -36,9 +37,9 @@ public interface CoordinateService {
     Single <Coordinate> postCoordinate(@Body Coordinate coordinate);
 
     @PUT("api/coordinates/{id}")
-    Single<Coordinate> putCoordinatesById(@Path("id") String id);
+    Completable putCoordinate(@Body Coordinate coordinate, @Path("id") String id);
 
     @DELETE("api/coordinates/{id}")
-    Single<Coordinate> deleteCoordinatesById(@Path("id") String id);
+    Completable deleteCoordinatesById(@Path("id") String id);
 
 }

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

@@ -6,13 +6,17 @@ import java.util.Arrays;
 import java.util.List;
 
 public class Const {
-    public final static Integer defaultBackgroundLocationInterval = 15000;
+    public final static Integer onlineBackgroundLocationInterval = 15000;
+    public final static Integer offlineBackgroundLocationInterval = 36000;
     public final static Integer defaultMapZoom = 17;
     public final static Integer searchMapZoom = 13;
     public final static Double presenceLatitude = 52.466365;
     public final static Double presenceLongitude = 16.926792;
     public final static String presenceApproximatedName = "Unknown";
-    public final static Range<Double> latitudeRange = Range.create(52.466092, 52.467529);
+    public final static Range<Double> buildingLatitudeRange = Range.create(52.466092, 52.467529);
-    public final static Range<Double> longitudeRange = Range.create(16.926159, 16.927759);
+    public final static Range<Double> buildingLongitudeRange = Range.create(16.926159, 16.927759);
+    public final static Range<Double> outsideLatitudeRange = Range.create(52.463512, 52.468837);
+    public final static Range<Double> outsideLongitudeRange = Range.create(16.922372, 16.936004);
     public final static List<String> validApproximatedLocations = Arrays.asList("Skrzydło B", "Skrzydło A", "Aule", "Łącznik", "Biblioteka", "Hol", "Unknown");
 }
+

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

@@ -14,8 +14,8 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
 import java.io.IOException;
 import java.io.InputStream;
 
-import static com.uam.wmi.findmytutor.utils.Const.latitudeRange;
+import static com.uam.wmi.findmytutor.utils.Const.outsideLongitudeRange;
-import static com.uam.wmi.findmytutor.utils.Const.longitudeRange;
+import static com.uam.wmi.findmytutor.utils.Const.outsideLatitudeRange;
 
 public class MapUtils {
 
@@ -59,7 +59,6 @@ public class MapUtils {
 
     // read file to JSON
     public static String loadJsonFromAsset(Context context, String filename) {
-        // Using this method to load in GeoJSON files from the assets folder.
         try {
             InputStream is = context.getAssets().open(filename);
             int size = is.available();
@@ -75,7 +74,7 @@ public class MapUtils {
     }
 
     public static Boolean checkIfCoordinateIsValid(Location coordinate){
-       return latitudeRange.contains(coordinate.getLatitude()) && longitudeRange.contains(coordinate.getLongitude());
+       return outsideLatitudeRange.contains(coordinate.getLatitude()) && outsideLongitudeRange.contains(coordinate.getLongitude());
     }
 
     // Function for marker animation

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) {
@@ -188,5 +188,13 @@ public class PrefUtils {
     public static String getCurrentManualLocation(Context context) {
         return getSharedPreferences(context).getString("current_manual_location", null);
     }
+    public static void putCurrentManualLocationName(Context context, String locationName) {
+        SharedPreferences.Editor editor = getSharedPreferences(context).edit();
+        editor.putString("current_manual_location_name", locationName);
+        editor.apply();
+    }
+    public static String getCurrentManualLocationName(Context context) {
+        return getSharedPreferences(context).getString("current_manual_location_name", null);
+    }
 
 }

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

@@ -15,7 +15,8 @@
             android:summary="%s"
             android:title="@string/title_language" />
 
-        <SwitchPreference android:key="acra.disable"
+        <SwitchPreference
+            android:key="acra.disable"
             android:title="@string/pref_disable_acra"
             android:summaryOn="@string/pref_acra_disabled"
             android:summaryOff="@string/pref_acra_enabled"

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

@@ -27,8 +27,6 @@
             android:title="@string/title_location_level" />
         <ListPreference
             android:key="key_manual_location_value"
-            android:entries="@array/manual_location_entries"
-            android:entryValues="@array/manual_location_values"
             android:summary="%s"
             android:title="@string/title_list_manual_location" />
         <com.uam.wmi.findmytutor.utils.RightButtonPreference
@@ -44,10 +42,8 @@
             android:persistent="true"
             android:title="@string/status_switch_title"/>
         <ListPreference
-            android:defaultValue="1"
+            android:defaultValue="2"
             android:key="@string/key_status_value"
-            android:entries="@array/status_entries"
-            android:entryValues="@array/status_values"
             android:summary="%s"
             android:title="@string/status_list_title" />
         <EditTextPreference

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

@@ -160,7 +160,7 @@
     <string name="manual_status_error">Błąd podczas pobierania danych.</string>
     <string name="error_status_fetch">Błąd podczas pobierania statusów.</string>
     <string name="notification_text">Upss. Coś poszło nie tak. Pracujemy nad tym!</string>
-    <string name="lack_duty_hours">Brak informacji o dyzurze.</string>
+    <string name="lack_duty_hours">Brak informacji o dyżurze.</string>
     <string name="lack_note">Brak notatki.</string>
     <string name="search">Wyszukiwarka</string>
     <string name="description_notdisturb">Nie przeszkadzać</string>

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

@@ -233,10 +233,14 @@
     <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>
+    <string name="pref_disable_acra" translatable="false">ACRA reporting tool</string>
     <string name="acra_toast_text" translatable="false">Sorry, the application crashed. A report will be sent to the developers</string>
     <string name="notification_text">Sorry, the application crashed. A report will be sent to the developers</string>
-    <string name="notification_title" translatable="false">FMT Crash</string>
+    <string name="notification_title" translatable="false">FMT Issue</string>
     <string name="notification_channel" translatable="false">FMT</string>
     <string name="lack_duty_hours">Lack information about duty hours</string>
     <string name="lack_note">No note.</string>