signalapp/Signal-Android
signalapp/Signal-Android
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 16 Wiki Activity

Revert "Manually draw location on google map."

Browse Source 
This reverts commit 02d245ac0c.
This commit is contained in:
Greyson Parrelli 2026-06-16 14:37:54 -04:00
parent 570a310e2e
commit 2ef0032a33
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/org/thoughtcrime/securesms/maps/PlacePickerActivity.java
View File

@ -12,6 +12,7 @@ import android.location.Address;
import android.location.Geocoder;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.view.View;
import android.view.animation.OvershootInterpolator;
@ -24,11 +25,11 @@ import androidx.core.content.ContextCompat;
import androidx.core.view.ViewCompat;
import androidx.fragment.app.Fragment;
import com.google.accompanist.permissions.PermissionsUtilKt;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.MapView;
import com.google.android.gms.maps.SupportMapFragment;
import com.google.android.gms.maps.model.CircleOptions;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.MapStyleOptions;
@ -72,7 +73,6 @@ public final class PlacePickerActivity extends AppCompatActivity {
private Address currentAddress;
private LatLng initialLocation;
private LatLng currentLocation = new LatLng(0, 0);
private LatLng userLocation;
private AddressLookup addressLookup;
private GoogleMap googleMap;
@ -103,10 +103,7 @@ public final class PlacePickerActivity extends AppCompatActivity {
ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED)
{
new LocationRetriever(this, this, location -> {
LatLng latLng = new LatLng(location.getLatitude(), location.getLongitude());
userLocation = latLng;
setInitialLocation(latLng);
drawUserLocationIfPossible();
setInitialLocation(new LatLng(location.getLatitude(), location.getLongitude()));
}, () -> {
Log.w(TAG, "Failed to get location.");
setInitialLocation(PRIME_MERIDIAN);
@ -133,6 +130,8 @@ public final class PlacePickerActivity extends AppCompatActivity {
}
}
enableMyLocationButtonIfHaveThePermission(googleMap);
googleMap.setOnCameraMoveStartedListener(i -> {
markerImage.animate()
.translationY(-75f)
@ -171,18 +170,6 @@ public final class PlacePickerActivity extends AppCompatActivity {
this.googleMap = googleMap;
moveMapToInitialIfPossible();
drawUserLocationIfPossible();
}
private void drawUserLocationIfPossible() {
if (userLocation != null && googleMap != null) {
googleMap.addCircle(new CircleOptions()
.center(userLocation)
.radius(12)
.strokeWidth(4f)
.strokeColor(Color.WHITE)
.fillColor(Color.parseColor("#4285F4")));
}
}
private void moveMapToInitialIfPossible() {
@ -229,6 +216,12 @@ public final class PlacePickerActivity extends AppCompatActivity {
});
}
private void enableMyLocationButtonIfHaveThePermission(GoogleMap googleMap) {
if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED || checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
googleMap.setMyLocationEnabled(true);
}
}
private void lookupAddress(@Nullable LatLng target) {
if (addressLookup != null) {
addressLookup.cancel(true);
@ -237,9 +230,13 @@ public final class PlacePickerActivity extends AppCompatActivity {
addressLookup.execute(target);
}
@SuppressLint("MissingPermission")
@Override
protected void onPause() {
super.onPause();
if (googleMap != null && (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED || checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED)) {
googleMap.setMyLocationEnabled(false);
}
if (addressLookup != null) {
addressLookup.cancel(true);
}