Skip to content

Commit 26658e9

Browse files
authored
Removed MAPBOX Access token (commons-app#5555)
* Update gradle.properties * Update build.gradle * Update CommonsApplication.java * Update LocationServiceManager.java
1 parent 4c5d690 commit 26658e9

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@ android {
311311
buildConfigField "String", "TEST_USERNAME", "\"" + getTestUserName() + "\""
312312
buildConfigField "String", "TEST_PASSWORD", "\"" + getTestPassword() + "\""
313313
buildConfigField "String", "DEPICTS_PROPERTY", "\"P180\""
314-
buildConfigField "String", "MapboxAccessToken", "\"$MAPBOX_ACCESS_TOKEN\""
315314
dimension 'tier'
316315
}
317316

@@ -347,7 +346,6 @@ android {
347346
buildConfigField "String", "TEST_USERNAME", "\"" + getTestUserName() + "\""
348347
buildConfigField "String", "TEST_PASSWORD", "\"" + getTestPassword() + "\""
349348
buildConfigField "String", "DEPICTS_PROPERTY", "\"P245962\""
350-
buildConfigField "String", "MapboxAccessToken", "\"$MAPBOX_ACCESS_TOKEN\""
351349
dimension 'tier'
352350
}
353351
}

app/src/main/java/fr/free/nrw/commons/CommonsApplication.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import com.facebook.drawee.backends.pipeline.Fresco;
2323
import com.facebook.imagepipeline.core.ImagePipeline;
2424
import com.facebook.imagepipeline.core.ImagePipelineConfig;
25-
import com.mapbox.mapboxsdk.Mapbox;
26-
import com.mapbox.mapboxsdk.WellKnownTileServer;
2725
import fr.free.nrw.commons.auth.SessionManager;
2826
import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table;
2927
import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
@@ -157,7 +155,6 @@ public void onCreate() {
157155

158156
INSTANCE = this;
159157
ACRA.init(this);
160-
Mapbox.getInstance(this, BuildConfig.MapboxAccessToken, WellKnownTileServer.Mapbox);
161158

162159
ApplicationlessInjection
163160
.getInstance(this)

app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package fr.free.nrw.commons.location;
22

3-
import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
4-
53
import android.Manifest.permission;
64
import android.app.Activity;
75
import android.content.Context;
@@ -30,13 +28,15 @@ public class LocationServiceManager implements LocationListener {
3028
private final List<LocationUpdateListener> locationListeners = new CopyOnWriteArrayList<>();
3129
private boolean isLocationManagerRegistered = false;
3230
private Set<Activity> locationExplanationDisplayed = new HashSet<>();
31+
private Context context;
3332

3433
/**
3534
* Constructs a new instance of LocationServiceManager.
3635
*
3736
* @param context the context
3837
*/
3938
public LocationServiceManager(Context context) {
39+
this.context = context;
4040
this.locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
4141
}
4242

@@ -58,9 +58,9 @@ private Location getLastKnownLocation() {
5858
Location bestLocation = null;
5959
for (String provider : providers) {
6060
Location l=null;
61-
if (ActivityCompat.checkSelfPermission(getApplicationContext(), permission.ACCESS_FINE_LOCATION)
61+
if (ActivityCompat.checkSelfPermission(context, permission.ACCESS_FINE_LOCATION)
6262
== PackageManager.PERMISSION_GRANTED
63-
&& ActivityCompat.checkSelfPermission(getApplicationContext(), permission.ACCESS_COARSE_LOCATION)
63+
&& ActivityCompat.checkSelfPermission(context, permission.ACCESS_COARSE_LOCATION)
6464
== PackageManager.PERMISSION_GRANTED) {
6565
l = locationManager.getLastKnownLocation(provider);
6666
}

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,3 @@ android.jetifier.ignorelist=bcprov-jdk15on
3939
android.defaults.buildfeatures.buildconfig=true
4040
android.nonTransitiveRClass=false
4141
android.nonFinalResIds=false
42-
MAPBOX_ACCESS_TOKEN=pk.eyJ1Ijoibmljb2xhcy1yYW91bCIsImEiOiJjbHJrNGZyZTcwMDA0MmpwbjJjemt3MGE3In0.o9NrQuQeJ_oz3-lbS4MLvw

0 commit comments

Comments
 (0)