Merge branch 'develop' into bg-task-increase-interval

This commit is contained in:
Mieszko Wrzeszczyński 2018-12-06 22:00:04 +01:00
commit 0182d2e041

View File

@ -49,10 +49,10 @@ import com.uam.wmi.findmytutor.service.UserService;
import com.uam.wmi.findmytutor.utils.ApproximatedLocalization;
import com.uam.wmi.findmytutor.utils.ManualLocationUtils;
import com.uam.wmi.findmytutor.utils.MapMarker;
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 java.util.ArrayList;
import java.util.HashMap;
@ -98,6 +98,7 @@ public class MapActivity extends BaseActivity
private String myId;
private boolean isTutor;
private ApproximatedLocalization approximatedLocalization;
private boolean shouldFetchNewCoords = true;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -113,7 +114,9 @@ public class MapActivity extends BaseActivity
mStatusChecker = () -> {
try {
if (shouldFetchNewCoords) {
fetchTopCoords();
}
} finally {
mHandler.postDelayed(mStatusChecker, mInterval);
}
@ -386,7 +389,7 @@ public class MapActivity extends BaseActivity
public void onSuccess(List<Coordinate> coordsList) {
if (tmpLocalMarker != null && coordsList.isEmpty()) {
Timber.e("200 empty []");
Log.e("MapActivity", "200 empty []");
mapboxMap.clear();
}
@ -589,6 +592,7 @@ public class MapActivity extends BaseActivity
public void onResume() {
super.onResume();
mapView.onResume();
shouldFetchNewCoords = true;
}
@Override
@ -601,12 +605,15 @@ public class MapActivity extends BaseActivity
protected void onStop() {
super.onStop();
mapView.onStop();
shouldFetchNewCoords = false;
}
@Override
public void onPause() {
super.onPause();
mapView.onPause();
shouldFetchNewCoords = false;
}
@Override