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

Removed MAPBOX Access token (#5555)

Browse source 
* Update gradle.properties

* Update build.gradle

* Update CommonsApplication.java

* Update LocationServiceManager.java
This commit is contained in:
Kanahia 2024-02-16 17:26:58 +05:30 • committed by GitHub
parent 4c5d690a9e
commit 26658e91b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -311,7 +311,6 @@ android {
buildConfigField "String", "TEST_USERNAME", "\"" + getTestUserName() + "\"" buildConfigField "String", "TEST_USERNAME", "\"" + getTestUserName() + "\""
buildConfigField "String", "TEST_PASSWORD", "\"" + getTestPassword() + "\"" buildConfigField "String", "TEST_PASSWORD", "\"" + getTestPassword() + "\""
buildConfigField "String", "DEPICTS_PROPERTY", "\"P180\"" buildConfigField "String", "DEPICTS_PROPERTY", "\"P180\""
buildConfigField "String", "MapboxAccessToken", "\"$MAPBOX_ACCESS_TOKEN\""
dimension 'tier' dimension 'tier'
} }
@ -347,7 +346,6 @@ android {
buildConfigField "String", "TEST_USERNAME", "\"" + getTestUserName() + "\"" buildConfigField "String", "TEST_USERNAME", "\"" + getTestUserName() + "\""
buildConfigField "String", "TEST_PASSWORD", "\"" + getTestPassword() + "\"" buildConfigField "String", "TEST_PASSWORD", "\"" + getTestPassword() + "\""
buildConfigField "String", "DEPICTS_PROPERTY", "\"P245962\"" buildConfigField "String", "DEPICTS_PROPERTY", "\"P245962\""
buildConfigField "String", "MapboxAccessToken", "\"$MAPBOX_ACCESS_TOKEN\""
dimension 'tier' dimension 'tier'
} }
} }

3
app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
View file

@ -22,8 +22,6 @@ import androidx.multidex.MultiDexApplication;
import com.facebook.drawee.backends.pipeline.Fresco; import com.facebook.drawee.backends.pipeline.Fresco;
import com.facebook.imagepipeline.core.ImagePipeline; import com.facebook.imagepipeline.core.ImagePipeline;
import com.facebook.imagepipeline.core.ImagePipelineConfig; import com.facebook.imagepipeline.core.ImagePipelineConfig;
import com.mapbox.mapboxsdk.Mapbox;
import com.mapbox.mapboxsdk.WellKnownTileServer;
import fr.free.nrw.commons.auth.SessionManager; import fr.free.nrw.commons.auth.SessionManager;
import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table; import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table;
import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao; import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
@ -157,7 +155,6 @@ public class CommonsApplication extends MultiDexApplication {
INSTANCE = this; INSTANCE = this;
ACRA.init(this); ACRA.init(this);
Mapbox.getInstance(this, BuildConfig.MapboxAccessToken, WellKnownTileServer.Mapbox);
ApplicationlessInjection ApplicationlessInjection
.getInstance(this) .getInstance(this)

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

@ -1,7 +1,5 @@
package fr.free.nrw.commons.location; package fr.free.nrw.commons.location;
import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
import android.Manifest.permission; import android.Manifest.permission;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
@ -30,6 +28,7 @@ public class LocationServiceManager implements LocationListener {
private final List<LocationUpdateListener> locationListeners = new CopyOnWriteArrayList<>(); private final List<LocationUpdateListener> locationListeners = new CopyOnWriteArrayList<>();
private boolean isLocationManagerRegistered = false; private boolean isLocationManagerRegistered = false;
private Set<Activity> locationExplanationDisplayed = new HashSet<>(); private Set<Activity> locationExplanationDisplayed = new HashSet<>();
private Context context;
/** /**
* Constructs a new instance of LocationServiceManager. * Constructs a new instance of LocationServiceManager.
@ -37,6 +36,7 @@ public class LocationServiceManager implements LocationListener {
* @param context the context * @param context the context
*/ */
public LocationServiceManager(Context context) { public LocationServiceManager(Context context) {
this.context = context;
this.locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE); this.locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
} }
@ -58,9 +58,9 @@ public class LocationServiceManager implements LocationListener {
Location bestLocation = null; Location bestLocation = null;
for (String provider : providers) { for (String provider : providers) {
Location l=null; Location l=null;
if (ActivityCompat.checkSelfPermission(getApplicationContext(), permission.ACCESS_FINE_LOCATION) if (ActivityCompat.checkSelfPermission(context, permission.ACCESS_FINE_LOCATION)
== PackageManager.PERMISSION_GRANTED == PackageManager.PERMISSION_GRANTED
&& ActivityCompat.checkSelfPermission(getApplicationContext(), permission.ACCESS_COARSE_LOCATION) && ActivityCompat.checkSelfPermission(context, permission.ACCESS_COARSE_LOCATION)
== PackageManager.PERMISSION_GRANTED) { == PackageManager.PERMISSION_GRANTED) {
l = locationManager.getLastKnownLocation(provider); l = locationManager.getLastKnownLocation(provider);
} }

1
gradle.properties
View file

@ -39,4 +39,3 @@ android.jetifier.ignorelist=bcprov-jdk15on
android.defaults.buildfeatures.buildconfig=true android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false android.nonTransitiveRClass=false
android.nonFinalResIds=false android.nonFinalResIds=false
MAPBOX_ACCESS_TOKEN=pk.eyJ1Ijoibmljb2xhcy1yYW91bCIsImEiOiJjbHJrNGZyZTcwMDA0MmpwbjJjemt3MGE3In0.o9NrQuQeJ_oz3-lbS4MLvw