Merge pull request #583 from misaochan/minor-gps-changes

Put checkGps() in onResume
This commit is contained in:
Josephine Lim 2017-05-15 12:15:38 +02:00 committed by GitHub
commit 4450917f5c

View file

@ -57,7 +57,7 @@ public class NearbyActivity extends BaseActivity {
if (getSupportActionBar() != null) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
checkGps();
bundle = new Bundle();
locationManager = new LocationServiceManager(this);
locationManager.registerLocationManager();
@ -110,7 +110,7 @@ public class NearbyActivity extends BaseActivity {
startActivityForResult(callGPSSettingIntent, 1);
}
});
alertDialogBuilder.setNegativeButton("Cancel",
alertDialogBuilder.setNegativeButton(R.string.menu_cancel_upload,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
@ -150,6 +150,7 @@ public class NearbyActivity extends BaseActivity {
@Override
protected void onResume() {
super.onResume();
checkGps();
}
protected void refreshView() {