|
|
|
@ -39,6 +39,7 @@ import android.view.ViewGroup;
|
|
|
|
|
import android.widget.ImageButton;
|
|
|
|
|
import android.widget.LinearLayout;
|
|
|
|
|
import android.widget.TextView;
|
|
|
|
|
import android.widget.Toast;
|
|
|
|
|
|
|
|
|
|
import com.car2go.maps.AnyMap;
|
|
|
|
|
import com.car2go.maps.OnMapReadyCallback;
|
|
|
|
@ -271,14 +272,6 @@ public class MapsFragment extends Fragment implements OnMapReadyCallback {
|
|
|
|
|
map = null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
|
|
|
|
|
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
|
|
|
|
if(grantResults[0] == PackageManager.PERMISSION_GRANTED || grantResults[1] == PackageManager.PERMISSION_GRANTED) {
|
|
|
|
|
startUpdateLocations();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void startUpdateLocations() {
|
|
|
|
|
if(getActivity() == null)
|
|
|
|
|
return;
|
|
|
|
@ -292,7 +285,8 @@ public class MapsFragment extends Fragment implements OnMapReadyCallback {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
LocationManager manager = (LocationManager) getActivity().getSystemService(LOCATION_SERVICE);
|
|
|
|
|
if (ActivityCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
|
|
|
|
|
if (ActivityCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED ||
|
|
|
|
|
ActivityCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
|
|
|
|
|
String[] permissions = {Manifest.permission.ACCESS_FINE_LOCATION,Manifest.permission.ACCESS_COARSE_LOCATION};
|
|
|
|
|
ActivityCompat.requestPermissions(getActivity(),permissions,1);
|
|
|
|
|
} else {
|
|
|
|
@ -346,6 +340,13 @@ public class MapsFragment extends Fragment implements OnMapReadyCallback {
|
|
|
|
|
@Override
|
|
|
|
|
public void onMapReady(AnyMap anyMap) {
|
|
|
|
|
map = anyMap;
|
|
|
|
|
|
|
|
|
|
if (ActivityCompat.checkSelfPermission(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED ||
|
|
|
|
|
ActivityCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
|
|
|
|
|
String[] permissions = {Manifest.permission.WRITE_EXTERNAL_STORAGE};
|
|
|
|
|
ActivityCompat.requestPermissions(getActivity(),permissions,2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
startUpdateLocations();
|
|
|
|
|
|
|
|
|
|
country = Country.FRANCE;
|
|
|
|
|