mollyim/mollyim-insider-android
1
0
Fork 0
mirror of https://github.com/mollyim/mollyim-insider-android.git synced 2025-05-13 05:40:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Include both OSM and Google Maps links when sharing location

Browse source 
Closes #203
This commit is contained in:
Oscar Mira 2024-05-20 21:06:36 +02:00
parent 8c2254d1c2
commit 00f9e5ea57
No known key found for this signature in database
GPG key ID: B371B98C5DC32237
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/org/thoughtcrime/securesms/components/location/SignalPlace.java
View file

@ -19,7 +19,8 @@ import java.io.IOException;
public class SignalPlace {
private static final String URL = "https://maps.google.com/maps";
private static final String OSM_URL = "https://openstreetmap.org/";
private static final String GMS_URL = "https://maps.google.com/maps";
private static final String TAG = Log.tag(SignalPlace.class);
@ -53,22 +54,28 @@ public class SignalPlace {
@JsonIgnore
public String getDescription() {
String description = "";
final StringBuilder description = new StringBuilder();
if (!TextUtils.isEmpty(name)) {
description += (name + "\n");
description.append(name).append("\n");
}
if (!TextUtils.isEmpty(address)) {
description += (address + "\n");
description.append(address).append("\n");
}
description += Uri.parse(URL)
.buildUpon()
.appendQueryParameter("q", String.format("%s,%s", latitude, longitude))
.build().toString();
description.append("\nOpenStreetMap: ")
.append(Uri.parse(OSM_URL)
.buildUpon()
.encodedFragment(String.format("map=15/%s/%s", latitude, longitude))
.build().toString())
.append("\n\nGoogle Maps: ")
.append(Uri.parse(GMS_URL)
.buildUpon()
.appendQueryParameter("q", String.format("%s,%s", latitude, longitude))
.build().toString());
return description;
return description.toString();
}
public @Nullable String serialize() {