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

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

@@ -20,19 +20,16 @@ import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.SearchView;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.Toast;
 
-import com.mapbox.mapboxsdk.Mapbox;
 import com.uam.wmi.findmytutor.R;
 import com.uam.wmi.findmytutor.service.BackgroundLocalizationService;
 import com.uam.wmi.findmytutor.utils.ActiveFragment;
 import com.uam.wmi.findmytutor.utils.FeedbackUtils;
-import com.uam.wmi.findmytutor.utils.MapUtils;
 import com.uam.wmi.findmytutor.utils.PrefUtils;
 import com.uam.wmi.findmytutor.utils.RxSearchObservable;
 
@@ -49,8 +46,8 @@ import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
 
 
-import static com.uam.wmi.findmytutor.utils.Consts.deafultMapZoom;
+import static com.uam.wmi.findmytutor.utils.Const.defaultMapZoom;
-import static com.uam.wmi.findmytutor.utils.Consts.searchMapZoom;
+import static com.uam.wmi.findmytutor.utils.Const.searchMapZoom;
 import static com.uam.wmi.findmytutor.utils.PrefUtils.storeBackgroundLocationStatus;
 
 
@@ -77,6 +74,7 @@ public abstract class BaseActivity
 
     private Fragment userListFragment;
     private ActiveFragment activeFragment = ActiveFragment.NONE;
+    private Fragment activeBottomMenu  = null;
     private SearchView searchView;
 
     @SuppressLint("CheckResult")
@@ -275,7 +273,7 @@ public abstract class BaseActivity
         searchView.setOnQueryTextFocusChangeListener((v, hasFocus) -> {
             if (!hasFocus && activeFragment.equals(ActiveFragment.NONE)) {
                 restoreMapMarkers();
-                adjustMapToSearch(deafultMapZoom);
+                adjustMapToSearch(defaultMapZoom);
             }
 
             if(hasFocus && activeFragment.equals(ActiveFragment.NONE)){
@@ -351,7 +349,7 @@ public abstract class BaseActivity
             } else if (itemId == R.id.nav_user_list) {
                 loadUserListFragment();
             }
-
+            selectBottomNavigationBarItem(itemId);
         }, 300);
 
         return true;
@@ -363,6 +361,7 @@ public abstract class BaseActivity
         FragmentTransaction ft = getFragmentManager().beginTransaction();
         ft.replace(R.id.activity_content, sharingFragment);
         ft.commit();
+
     }
 
     private void loadUserListFragment() {
@@ -372,8 +371,8 @@ public abstract class BaseActivity
         FragmentTransaction ft = getFragmentManager().beginTransaction();
         ft.replace(R.id.activity_content, userListFragment);
         ft.commit();
-    }
 
+    }
 
     private void updateNavigationBarState() {
         int actionId = getNavigationMenuItemId();
@@ -385,9 +384,6 @@ public abstract class BaseActivity
         item.setChecked(true);
     }
 
-
-
     abstract int getNavigationMenuItemId();
-
     abstract int getContentViewId();
 }

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

@@ -21,7 +21,6 @@ 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;
@@ -149,11 +148,8 @@ public class LoginActivity extends AppCompatActivity {
 
     private void loginProcess(String email, String password) {
         ValidateUser user = new ValidateUser(email, password);
-        LdapUser fuser = new LdapUser(email, password, "wmi", "tutor", "henryk", "zdzblo", email);
-
-//        disposable.add(ldapService.validate(user)
-        disposable.add(ldapService.fakeValidate(fuser)
 
+        disposable.add(ldapService.validate(user)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(this::handleResponse, this::handleError));

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

@@ -344,7 +344,6 @@ public class MapActivity extends BaseActivity
             });
         });
 
-
         alertDialog.show();
     }
 
@@ -440,7 +439,7 @@ public class MapActivity extends BaseActivity
                                             }
 
                                             LatLng toDestination = new LatLng(element.getLatitude(), element.getLongitude());
-// TODO fix flickiering markers
+
                                             ValueAnimator markerAnimator = ObjectAnimator.ofObject(marker, "position",
                                                     new MapUtils.LatLngEvaluator(),
                                                     marker.getPosition(),
@@ -607,7 +606,6 @@ public class MapActivity extends BaseActivity
         super.onStop();
         mapView.onStop();
         shouldFetchNewCoords = false;
-
     }
 
     @Override

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

@@ -3,7 +3,9 @@ package com.uam.wmi.findmytutor.model;
 import android.util.Range;
 
 import com.google.gson.annotations.SerializedName;
+import com.uam.wmi.findmytutor.utils.Const;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 
@@ -14,8 +16,9 @@ import io.swagger.annotations.ApiModelProperty;
  */
 
 public class Coordinate extends BaseResponse {
-    Range<Double> latitudeRange = Range.create(52.46598, 52.467545);
+    private Range<Double> latitudeRange = Const.latitudeRange;
-    Range<Double> longtitudeRange = Range.create(16.926099, 16.927794);
+    private Range<Double> longtitudeRange =  Const.longitudeRange;
+    private List<String> allowedApproximatedLocations = Const.validApproximatedLocations;
 
     @SerializedName("coordinateId")
     private UUID coordinateId = null;
@@ -47,7 +50,7 @@ public class Coordinate extends BaseResponse {
     public Coordinate (Double latitude, Double longitude, Double altitude, String approximatedLocation, String label, String userId, String displayMode) {
        if (!latitudeRange.contains(latitude)) throw new IllegalArgumentException("Inappropriate latitude value" + latitude);
        if (!longtitudeRange.contains(longitude)) throw new IllegalArgumentException("Inappropriate longitude value" + longitude);
-       //if (approximatedLocation == null) throw new IllegalArgumentException("Inappropriate approximatedLocation");
+       if (!allowedApproximatedLocations.contains(approximatedLocation)) throw new IllegalArgumentException("Inappropriate approximatedLocation");
 
        this.latitude = latitude;
        this.longitude = longitude;

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

@@ -16,13 +16,13 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.HandlerThread;
 import android.os.IBinder;
 import android.support.annotation.RequiresApi;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 
+import com.annimon.stream.Stream;
 import com.google.android.gms.location.FusedLocationProviderClient;
 import com.google.android.gms.location.LocationServices;
 import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
@@ -31,25 +31,28 @@ import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.uam.wmi.findmytutor.model.Coordinate;
 import com.uam.wmi.findmytutor.network.ApiClient;
 import com.uam.wmi.findmytutor.utils.ApproximatedLocalization;
+import com.uam.wmi.findmytutor.utils.MapUtils;
 import com.uam.wmi.findmytutor.utils.PrefUtils;
 import com.uam.wmi.findmytutor.utils.RestApiHelper;
 import com.uam.wmi.findmytutor.utils.SharingLevel;
-import com.uam.wmi.findmytutor.utils.MapUtils;
+
+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.DisposableSingleObserver;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.ResponseBody;
-import timber.log.Timber;
 
-import static com.uam.wmi.findmytutor.utils.Consts.presenceApproximatedName;
+import static com.uam.wmi.findmytutor.utils.Const.defaultBackgroundLocationInterval;
-import static com.uam.wmi.findmytutor.utils.Consts.presenceLatitude;
+import static com.uam.wmi.findmytutor.utils.Const.presenceApproximatedName;
-import static com.uam.wmi.findmytutor.utils.Consts.presenceLongitude;
+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;
 
 public class BackgroundLocalizationService extends Service {
@@ -57,21 +60,20 @@ public class BackgroundLocalizationService extends Service {
     private static final String TAG = "MyLocationService";
     private static final int LOCATION_INTERVAL = 1000;
     private static final float LOCATION_DISTANCE = 5f;
-    public static String str_receiver = "background.location.broadcast";
+    private static long notify_interval = defaultBackgroundLocationInterval;
-    private static long notify_interval = 10000;
+    private static long notify_interval_inside_building = defaultBackgroundLocationInterval;
-    Location mLastLocation;
+    private static long notify_interval_outside_building = 360000;
-    Boolean stopService = false;
+    private static int coordinatesHistoryLength = 10;
-    Intent intent;
+    private Location mLastLocation;
-    ArrayList<String> providers = new ArrayList<String>();
+    private Boolean stopService = false;
-    LocationListener[] mLocationListeners;
+    private ArrayList<String> providers = new ArrayList<String>();
-
+    private LocationListener[] mLocationListeners;
+    private CircularFifoQueue<Location> coordinatesHistory = new CircularFifoQueue<Location>(coordinatesHistoryLength);
     private LocationManager mLocationManager = null;
     private Handler mHandler = new Handler();
-    private HandlerThread mHandlerThread = null;
     private Runnable mStatusChecker;
     private FusedLocationProviderClient mFusedLocationClient;
 
-
     public BackgroundLocalizationService() {
         providers.add(LocationManager.GPS_PROVIDER);
         providers.add(LocationManager.NETWORK_PROVIDER);
@@ -82,7 +84,6 @@ public class BackgroundLocalizationService extends Service {
                 new LocationListener(LocationManager.NETWORK_PROVIDER),
                 new LocationListener(LocationManager.PASSIVE_PROVIDER)
         };
-
     }
 
     @Override
@@ -146,27 +147,39 @@ public class BackgroundLocalizationService extends Service {
         }
 
         if (!stopService) {
-
-
             mStatusChecker = () -> {
                 try {
                     fn_getlocation();
+                    changeBackgroundMode();
                 } finally {
                     mHandler.postDelayed(mStatusChecker, notify_interval);
                 }
             };
 
             AsyncTask.execute(mStatusChecker);
-
+        }
     }
 
+    private void changeBackgroundMode() {
+        if (coordinatesHistory.size() > 4) {
+            Boolean shouldExtendTimeInterval = Stream.of(coordinatesHistory)
+                    .map(MapUtils::checkIfCoordinateIsValid).takeWhile(s -> !s).toList().size() == coordinatesHistory.size();
 
+            Boolean shouldAbbreviateTimeInterval = Stream.of(coordinatesHistory).
+                    map(MapUtils::checkIfCoordinateIsValid).toList().get(coordinatesHistory.size() - 1);
+
+            if (shouldExtendTimeInterval) {
+                notify_interval = notify_interval_outside_building;
+            } else if (shouldAbbreviateTimeInterval) {
+                notify_interval = notify_interval_inside_building;
+            }
+        }
     }
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     private void startMyOwnForeground() {
 
-        String NOTIFICATION_CHANNEL_ID = "com.example.simpleapp";
+        String NOTIFICATION_CHANNEL_ID = "com.example.fmt";
         String channelName = "My Background Service";
         NotificationChannel chan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, NotificationManager.IMPORTANCE_NONE);
         chan.setLightColor(Color.BLUE);
@@ -198,8 +211,20 @@ public class BackgroundLocalizationService extends Service {
 
         List<String> providers1 = mLocationManager.getProviders(true);
         Location bestLocation = null;
+        AtomicReference<Boolean> triggerAnotherLocationListener = new AtomicReference<>(false);
 
+        mFusedLocationClient.getLastLocation().addOnSuccessListener(
+                location -> {
+                    if (location != null) {
+                        mLastLocation = location;
+                        coordinatesHistory.add(location);
+                        fn_update(location);
+                    }
 
+                    triggerAnotherLocationListener.set(true);
+                });
+
+        if (triggerAnotherLocationListener.get()) {
             for (String provider : providers1) {
                 Location location = mLocationManager.getLastKnownLocation(provider);
 
@@ -209,18 +234,12 @@ public class BackgroundLocalizationService extends Service {
                 if (bestLocation == null || location.getAccuracy() < bestLocation.getAccuracy()) {
                     bestLocation = location;
                 }
-
             }
 
+            coordinatesHistory.add(bestLocation);
             Log.e("Best localization:", String.valueOf(bestLocation));
-
-        mFusedLocationClient.getLastLocation().addOnSuccessListener(
-                location -> {
-                    if (location != null) {
-                        mLastLocation = location;
-                        fn_update(location);
         }
-                });
+
     }
 
     private void fn_update(Location location) {
@@ -241,7 +260,6 @@ public class BackgroundLocalizationService extends Service {
                         return;
                     }
                     mLocationManager.removeUpdates(listener);
-                    Log.i(TAG, "Removed");
 
                 } catch (Exception ex) {
                     Log.i(TAG, "fail to remove location listener, ignore", ex);
@@ -258,13 +276,6 @@ public class BackgroundLocalizationService extends Service {
         }
     }
     
-    private class TimerTaskToGetLocation extends TimerTask {
-        @Override
-        public void run() {
-            mHandler.post(BackgroundLocalizationService.this::fn_getlocation);
-        }
-    }
-
     private class LocationListener implements android.location.LocationListener {
 
         public LocationListener(String provider) {
@@ -344,9 +355,6 @@ public class BackgroundLocalizationService extends Service {
                         locationLevel
                 );
 
-                Log.e(TAG, String.valueOf(coordinate));
-
-
                 disposable.add(
                         coordinateService
                                 .postCoordinate(coordinate)
@@ -362,13 +370,7 @@ public class BackgroundLocalizationService extends Service {
                                     @SuppressLint("LongLogTag")
                                     @Override
                                     public void onError(Throwable e) {
-
                                         Log.e("CoordinateService onError", e.getMessage());
-
-                                        if (e instanceof HttpException) {
-                                            ResponseBody responseBody = ((HttpException) e).response().errorBody();
-                                            Log.e("CoordinateService onError", RestApiHelper.getErrorMessage(responseBody));
-                                        }
                                     }
                                 }));
             } catch (IllegalArgumentException e) {

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

@@ -48,7 +48,7 @@ public class ApproximatedLocalization {
                 return Objects.requireNonNull(Objects.requireNonNull(feature.getStringProperty("name")));
         }
 
-        return null;
+        return Const.presenceApproximatedName;
     }
 
     public List<Double> getMiddlePointOfBuildingPart(String buildingPart) {

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

@@ -0,0 +1,18 @@
+package com.uam.wmi.findmytutor.utils;
+
+import android.util.Range;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class Const {
+    public final static Integer defaultBackgroundLocationInterval = 15000;
+    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> longitudeRange = Range.create(16.926159, 16.927759);
+    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/Consts.java

@@ -1,13 +0,0 @@
-package com.uam.wmi.findmytutor.utils;
-
-import android.util.Range;
-
-public class Consts {
-    public final static Integer deafultMapZoom = 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.466709, 52.467007);
-    public final static Range<Double> longtitudeRange = Range.create(16.926159, 16.926976);
-}

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

@@ -44,8 +44,6 @@ public class ManualLocationUtils  {
         activityContext = context;
     }
 
-
-
     private void handleError(Throwable error) {
         if (error instanceof HttpException) {
 

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

@@ -2,30 +2,20 @@ package com.uam.wmi.findmytutor.utils;
 
 import android.animation.TypeEvaluator;
 import android.content.Context;
-import android.graphics.Color;
 import android.location.Location;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.content.res.AssetManager;
 
-import com.mapbox.mapboxsdk.annotations.Polygon;
-import com.mapbox.mapboxsdk.annotations.PolygonOptions;
 import com.mapbox.mapboxsdk.camera.CameraPosition;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.style.layers.FillLayer;
-import com.mapbox.mapboxsdk.style.layers.Layer;
-import com.uam.wmi.findmytutor.model.Coordinate;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import static com.uam.wmi.findmytutor.utils.Consts.latitudeRange;
+import static com.uam.wmi.findmytutor.utils.Const.latitudeRange;
-import static com.uam.wmi.findmytutor.utils.Consts.longtitudeRange;
+import static com.uam.wmi.findmytutor.utils.Const.longitudeRange;
 
 public class MapUtils {
 
@@ -85,7 +75,7 @@ public class MapUtils {
     }
 
     public static Boolean checkIfCoordinateIsValid(Location coordinate){
-        return (!latitudeRange.contains(coordinate.getLatitude()) && !longtitudeRange.contains(coordinate.getLongitude()));
+       return latitudeRange.contains(coordinate.getLatitude()) && longitudeRange.contains(coordinate.getLongitude());
     }
 
     // Function for marker animation