mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'refs/remotes/commons-app/master'

Browse source
This commit is contained in:
Josephine Lim 2017-05-15 12:20:05 +02:00
commit 89cb6c4997
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
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() {