Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 322fcad3 authored Apr 04, 2025 by Jonathan Klee

Use beancondb by default without contribution

parent 358bd531

.gitlab-ci.yml

+0 −2

Original line number	Diff line number	Diff line
		@@ -23,10 +23,8 @@ before_script:
		- echo sdk.dir $ANDROID_HOME > local.properties
		- echo mapbox.key $MAPBOX_KEY >> local.properties
		- echo mapbox.enabled true >> local.properties
		- echo ichnaea.key $ICHNAEA_KEY >> local.properties
		- echo stadia.key $STADIA_KEY >> local.properties
		- echo modules.hms false >> local.properties
		- echo ichnaea.endpoint $ICHNAEA_ENDPOINT >> local.properties
		- echo key=$LOCATION_TOTP_SECRET_PROD >> credentials.properties
		- echo url=$LOCATION_ENDPOINT_URL >> credentials.properties
		- echo "${KEYSTORE}" \| base64 -d > play-services-core/e.keystore

play-services-location/core/base/build.gradle

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ android {
		} else if (localProperties.get("ichnaea.endpoint", "") != "") {
		onlineSourcesString = "[{\"id\": \"default\", \"url\": \"${localProperties.get("ichnaea.endpoint", "")}\"},{\"id\": \"custom\", \"import\": true}]"
		} else {
		onlineSourcesString = "[{\"id\": \"beacondb\", \"name\": \"BeaconDB\", \"url\": \"https://api.beacondb.net/\", \"host\": \"beacondb.net\", \"terms\": \"https://beacondb.net/privacy/\", \"import\": true, \"allowContribute\": true},{\"id\": \"custom\", \"import\": true}]"
		onlineSourcesString = "[{\"id\": \"beacondb\", \"name\": \"BeaconDB\", \"url\": \"https://api.beacondb.net/?key=microg_murena\", \"host\": \"beacondb.net\", \"terms\": \"https://beacondb.net/privacy/\", \"import\": true, \"allowContribute\": false},{\"id\": \"custom\", \"import\": true}]"
		}
		buildConfigField "java.util.List<org.microg.gms.location.network.OnlineSource>", "ONLINE_SOURCES", "org.microg.gms.location.network.OnlineSourceKt.parseOnlineSources(\"${onlineSourcesString.replaceAll("\"", "\\\\\"")}\")"
		}