diff --git a/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java index da91779..3b3c181 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java @@ -35,9 +35,9 @@ import retrofit2.converter.jackson.JacksonConverterFactory; -public class MainActivity extends AppCompatActivity implements LocationListener{ +public class MainActivity extends AppCompatActivity implements LocationListener { - private static final String TAG = MainActivity.class.getSimpleName() ; + private static final String TAG = MainActivity.class.getSimpleName(); LocationManager locationManager; private ArrayList listeners = new ArrayList<>(); @@ -54,20 +54,32 @@ NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); NavigationUI.setupWithNavController(navView, navController); - if (ContextCompat.checkSelfPermission(this, - Manifest.permission.ACCESS_FINE_LOCATION) != - PackageManager.PERMISSION_GRANTED) { - ActivityCompat.requestPermissions(this, - new String[]{Manifest.permission.ACCESS_FINE_LOCATION,}, - 1000); +// if (ContextCompat.checkSelfPermission(this, +// Manifest.permission.ACCESS_FINE_LOCATION) != +// PackageManager.PERMISSION_GRANTED) { +// ActivityCompat.requestPermissions(this, +// new String[]{Manifest.permission.ACCESS_FINE_LOCATION,}, +// 1000); +// } +// else{ +// locationStart(); +// locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 100, 50, this); +// +// +// } + + LocationManager manager = (LocationManager) getSystemService(LOCATION_SERVICE); + 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 + // here to request the missing permissions, and then overriding + // public void onRequestPermissionsResult(int requestCode, String[] permissions, + // int[] grantResults) + // to handle the case where the user grants the permission. See the documentation + // for ActivityCompat#requestPermissions for more details. + return; } - else{ - locationStart(); - locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 100, 50, this); - - - } - + manager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, this); } private void locationStart(){ @@ -149,6 +161,10 @@ // } } + + + + public void subscribe(LocationListener listener){ listeners.add(listener); } @@ -167,6 +183,10 @@ listener.onLocationChanged(location); } + double latitude,longitude; + latitude=location.getLatitude(); + longitude=location.getLatitude(); + } @Override public void onProviderEnabled(String provider) {