mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-29 01:03:46 +00:00
Compare commits
4 Commits
always-upd
...
pastk-andr
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a0b3d54774 | ||
|
|
b14bdd883e | ||
|
|
67c0b3e6d2 | ||
|
|
7e7e84ea64 |
@@ -34,7 +34,10 @@ import app.organicmaps.util.log.Logger;
|
||||
|
||||
public class LocationHelper implements BaseLocationProvider.Listener
|
||||
{
|
||||
private static final long INTERVAL_MS = 0;
|
||||
private static final long INTERVAL_FOLLOW_MS = 0;
|
||||
private static final long INTERVAL_NOT_FOLLOW_MS = 3000;
|
||||
private static final long INTERVAL_NAVIGATION_MS = 1000;
|
||||
private static final long INTERVAL_TRACK_RECORDING = 0;
|
||||
|
||||
private static final long AGPS_EXPIRATION_TIME_MS = 16 * 60 * 60 * 1000; // 16 hours
|
||||
private static final long LOCATION_UPDATE_TIMEOUT_MS = 30 * 1000; // 30 seconds
|
||||
@@ -315,14 +318,18 @@ public class LocationHelper implements BaseLocationProvider.Listener
|
||||
|
||||
private long calcLocationUpdatesInterval()
|
||||
{
|
||||
if (RoutingController.get().isNavigating())
|
||||
return INTERVAL_NAVIGATION_MS;
|
||||
|
||||
if (TrackRecorder.nativeIsTrackRecordingEnabled())
|
||||
return INTERVAL_TRACK_RECORDING;
|
||||
|
||||
final int mode = Map.isEngineCreated() ? LocationState.getMode() : LocationState.NOT_FOLLOW_NO_POSITION;
|
||||
return switch (mode)
|
||||
{
|
||||
case LocationState.PENDING_POSITION,
|
||||
LocationState.FOLLOW,
|
||||
LocationState.FOLLOW_AND_ROTATE,
|
||||
LocationState.NOT_FOLLOW,
|
||||
LocationState.NOT_FOLLOW_NO_POSITION -> INTERVAL_MS;
|
||||
case LocationState.PENDING_POSITION, LocationState.FOLLOW, LocationState.FOLLOW_AND_ROTATE ->
|
||||
INTERVAL_FOLLOW_MS;
|
||||
case LocationState.NOT_FOLLOW, LocationState.NOT_FOLLOW_NO_POSITION -> INTERVAL_NOT_FOLLOW_MS;
|
||||
default -> throw new IllegalArgumentException("Unsupported location mode: " + mode);
|
||||
};
|
||||
}
|
||||
|
||||
26
android/app/src/main/res/raw/globalsignovssl2018
Normal file
26
android/app/src/main/res/raw/globalsignovssl2018
Normal file
@@ -0,0 +1,26 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIETjCCAzagAwIBAgINAe5fIh38YjvUMzqFVzANBgkqhkiG9w0BAQsFADBMMSAw
|
||||
HgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFs
|
||||
U2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjAeFw0xODExMjEwMDAwMDBaFw0yODEx
|
||||
MjEwMDAwMDBaMFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52
|
||||
LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIFJTQSBPViBTU0wgQ0EgMjAxODCCASIw
|
||||
DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKdaydUMGCEAI9WXD+uu3Vxoa2uP
|
||||
UGATeoHLl+6OimGUSyZ59gSnKvuk2la77qCk8HuKf1UfR5NhDW5xUTolJAgvjOH3
|
||||
idaSz6+zpz8w7bXfIa7+9UQX/dhj2S/TgVprX9NHsKzyqzskeU8fxy7quRU6fBhM
|
||||
abO1IFkJXinDY+YuRluqlJBJDrnw9UqhCS98NE3QvADFBlV5Bs6i0BDxSEPouVq1
|
||||
lVW9MdIbPYa+oewNEtssmSStR8JvA+Z6cLVwzM0nLKWMjsIYPJLJLnNvBhBWk0Cq
|
||||
o8VS++XFBdZpaFwGue5RieGKDkFNm5KQConpFmvv73W+eka440eKHRwup08CAwEA
|
||||
AaOCASkwggElMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMBAf8ECDAGAQH/AgEAMB0G
|
||||
A1UdDgQWBBT473/yzXhnqN5vjySNiPGHAwKz6zAfBgNVHSMEGDAWgBSP8Et/qC5F
|
||||
JK5NUPpjmove4t0bvDA+BggrBgEFBQcBAQQyMDAwLgYIKwYBBQUHMAGGImh0dHA6
|
||||
Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9yb290cjMwNgYDVR0fBC8wLTAroCmgJ4Yl
|
||||
aHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9yb290LXIzLmNybDBHBgNVHSAEQDA+
|
||||
MDwGBFUdIAAwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5j
|
||||
b20vcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAJmQyC1fQorUC2bbmANz
|
||||
EdSIhlIoU4r7rd/9c446ZwTbw1MUcBQJfMPg+NccmBqixD7b6QDjynCy8SIwIVbb
|
||||
0615XoFYC20UgDX1b10d65pHBf9ZjQCxQNqQmJYaumxtf4z1s4DfjGRzNpZ5eWl0
|
||||
6r/4ngGPoJVpjemEuunl1Ig423g7mNA2eymw0lIYkN5SQwCuaifIFJ6GlazhgDEw
|
||||
fpolu4usBCOmmQDo8dIm7A9+O4orkjgTHY+GzYZSR+Y0fFukAj6KYXwidlNalFMz
|
||||
hriSqHKvoflShx8xpfywgVcvzfTO3PYkz6fiNJBonf6q8amaEsybwMbDqKWwIX7e
|
||||
SPY=
|
||||
-----END CERTIFICATE-----
|
||||
@@ -2,6 +2,9 @@
|
||||
<network-security-config>
|
||||
<base-config cleartextTrafficPermitted="true">
|
||||
<trust-anchors>
|
||||
<!-- TODO: remove when/if (comaps-cdn.) s3-website.cloud.ru
|
||||
includes this intermediate cert into the cert chain -->
|
||||
<certificates src="@raw/globalsignovssl2018"/>
|
||||
<!-- Certificates are required for Android 7 and below. See the link for details:
|
||||
https://community.letsencrypt.org/t/letsencrypt-certificates-fails-on-android-phones-running-android-7-or-older/205686 -->
|
||||
<certificates src="@raw/isrgrootx1" />
|
||||
|
||||
4620
data/countries.txt
4620
data/countries.txt
File diff suppressed because it is too large
Load Diff
@@ -25,8 +25,7 @@ When reporting a bug please provide as much information as possible: OS and appl
|
||||
list of actions leading to a bug, a log file produced by the app.
|
||||
|
||||
When using CoMaps app on a device, use the built-in "Report a bug" option:
|
||||
on Android it creates a new e-mail with a log file attached. Your issue will be processed much
|
||||
faster if you send it to <bugs@comaps.app>. Enabling logs in CoMaps settings on Android
|
||||
on Android it creates a new e-mail with a log file attached. Enabling logs in CoMaps settings on Android
|
||||
before sending the bug report also helps us a lot with debugging.
|
||||
|
||||
### Translations
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Concatenates Android release notes in all languages into a single output format
|
||||
# suitable to upload to Google Play to update existing notes.
|
||||
# suitable to upload to Google Play to add or update existing notes.
|
||||
|
||||
GPLAY_NOTES=android/app/src/google/play/release-notes/*/default.txt
|
||||
# Original relnotes files:
|
||||
GPLAY_NOTES=android/app/src/fdroid/play/listings/*/release-notes.txt
|
||||
# also symlinked for Triple-T automation to android/app/src/google/play/release-notes/*/default.txt
|
||||
|
||||
for x in $(ls $GPLAY_NOTES); do
|
||||
l=$(basename $(dirname $x));
|
||||
|
||||
Reference in New Issue
Block a user