Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove usage of some deprecated Android functions #2435

Merged
merged 4 commits into from
May 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import android.content.res.Resources;
import android.graphics.PointF;
import android.os.Handler;
import android.os.Looper;
import android.view.InputDevice;
import android.view.MotionEvent;
import android.view.animation.DecelerateInterpolator;
Expand Down Expand Up @@ -96,7 +97,7 @@ final class MapGestureDetector {
* {@link MapLibreConstants#SCHEDULED_ANIMATION_TIMEOUT}
*/
@NonNull
private Handler animationsTimeoutHandler = new Handler();
private Handler animationsTimeoutHandler = new Handler(Looper.getMainLooper());

private boolean doubleTapRegistered;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import android.graphics.PointF;
import android.graphics.RectF;
import android.os.Handler;
import android.os.Looper;
import android.text.TextUtils;

import androidx.annotation.IntRange;
Expand Down Expand Up @@ -1524,7 +1525,7 @@ public void addSnapshotCallback(@NonNull MapLibreMap.SnapshotReadyCallback callb

@Override
public void setOnFpsChangedListener(@Nullable final MapLibreMap.OnFpsChangedListener listener) {
final Handler handler = new Handler();
final Handler handler = new Handler(Looper.getMainLooper());
mapRenderer.queueEvent(new Runnable() {

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.graphics.PointF;
import android.os.Handler;
import android.os.Looper;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
Expand Down Expand Up @@ -31,7 +32,7 @@ public final class Transform implements MapView.OnCameraDidChangeListener {

private final NativeMap nativeMap;
private final MapView mapView;
private final Handler handler = new Handler();
private final Handler handler = new Handler(Looper.getMainLooper());

@Nullable
private CameraPosition cameraPosition;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package org.maplibre.android.snapshotter
import android.content.Context
import android.graphics.*
import android.os.Handler
import android.os.Looper
import android.text.Html
import android.text.TextUtils
import android.view.View
Expand Down Expand Up @@ -141,10 +142,8 @@ open class MapSnapshotter(context: Context, options: Options) {
/**
* @return The base of our API endpoint
*/
@get:Deprecated("use {@link #getApiBaseUri()} instead")
var apiBaseUri: String? = null
private set
get() = field

var builder: Style.Builder? = null
private set
Expand Down Expand Up @@ -611,7 +610,7 @@ open class MapSnapshotter(context: Context, options: Options) {
*/
@Keep
protected fun onSnapshotReady(snapshot: MapSnapshot) {
Handler().post {
Handler(Looper.getMainLooper()).post {
if (callback != null) {
addOverlay(snapshot)
callback!!.onSnapshotReady(snapshot)
Expand All @@ -627,7 +626,7 @@ open class MapSnapshotter(context: Context, options: Options) {
*/
@Keep
protected fun onSnapshotFailed(reason: String) {
Handler().post {
Handler(Looper.getMainLooper()).post {
if (errorHandler != null) {
errorHandler!!.onError(reason)
reset()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.mapboxsdk.style.expressions
package org.maplibre.android.style.expressions

import android.graphics.Color
import org.maplibre.geojson.Point
Expand All @@ -10,7 +10,6 @@ import org.maplibre.android.utils.ColorUtils
import org.junit.Assert
import org.junit.Test
import org.junit.runner.RunWith
import org.maplibre.android.style.expressions.Expression
import org.robolectric.RobolectricTestRunner
import java.util.*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package org.maplibre.android.testapp.activity.camera
import android.annotation.SuppressLint
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.view.*
import android.widget.RelativeLayout
import android.widget.TextView
Expand Down Expand Up @@ -306,7 +307,7 @@ class GestureDetectorActivity : AppCompatActivity() {

private class GestureAlertsAdapter : RecyclerView.Adapter<GestureAlertsAdapter.ViewHolder>() {
private var isUpdating = false
private val updateHandler = Handler()
private val updateHandler = Handler(Looper.getMainLooper())
private val alerts: MutableList<GestureAlert> = ArrayList()

class ViewHolder internal constructor(view: View) : RecyclerView.ViewHolder(view) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package org.maplibre.android.testapp.activity.maplayout

import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import org.maplibre.android.camera.CameraUpdateFactory
Expand All @@ -15,7 +16,7 @@ import org.maplibre.android.testapp.R
class VisibilityChangeActivity : AppCompatActivity() {
private lateinit var mapView: MapView
private lateinit var maplibreMap: MapLibreMap
private val handler = Handler()
private val handler = Handler(Looper.getMainLooper())
private var runnable: Runnable? = null
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package org.maplibre.android.testapp.activity.offline
import android.annotation.SuppressLint
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.view.View
import android.widget.ArrayAdapter
import android.widget.SeekBar
Expand All @@ -29,7 +30,7 @@ class DownloadRegionActivity : AppCompatActivity(), OfflineRegion.OfflineRegionO
const val STATUS_UPDATE_TIMEOUT_MS = 10_000L
}

private val handler: Handler = Handler()
private val handler: Handler = Handler(Looper.getMainLooper())
private lateinit var offlineManager: OfflineManager
private lateinit var binding: ActivityRegionDownloadBinding
private var offlineRegion: OfflineRegion? = null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class MapSnapshotterActivity : AppCompatActivity() {
grid.getViewTreeObserver()
.addOnGlobalLayoutListener(object : OnGlobalLayoutListener {
override fun onGlobalLayout() {
grid.getViewTreeObserver().removeGlobalOnLayoutListener(this)
grid.getViewTreeObserver().removeOnGlobalLayoutListener(this)
addSnapshots()
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class MapSnapshotterBitMapOverlayActivity :
container.viewTreeObserver
.addOnGlobalLayoutListener(object : OnGlobalLayoutListener {
override fun onGlobalLayout() {
container.viewTreeObserver.removeGlobalOnLayoutListener(this)
container.viewTreeObserver.removeOnGlobalLayoutListener(this)
Timber.i("Starting snapshot")
mapSnapshotter = MapSnapshotter(
applicationContext,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class MapSnapshotterHeatMapActivity : AppCompatActivity(), MapSnapshotter.Snapsh
container.viewTreeObserver
.addOnGlobalLayoutListener(object : OnGlobalLayoutListener {
override fun onGlobalLayout() {
container.viewTreeObserver.removeGlobalOnLayoutListener(this)
container.viewTreeObserver.removeOnGlobalLayoutListener(this)
Timber.i("Starting snapshot")
val builder = Style.Builder().fromUri(Style.getPredefinedStyle("Outdoor"))
.withSource(earthquakeSource!!)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class MapSnapshotterLocalStyleActivity : AppCompatActivity(), MapSnapshotter.Sna
container.viewTreeObserver
.addOnGlobalLayoutListener(object : OnGlobalLayoutListener {
override fun onGlobalLayout() {
container.viewTreeObserver.removeGlobalOnLayoutListener(this)
container.viewTreeObserver.removeOnGlobalLayoutListener(this)
val styleJson: String
styleJson = try {
ResourceUtils.readRawResource(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.graphics.Bitmap
import android.graphics.drawable.BitmapDrawable
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import androidx.appcompat.app.AppCompatActivity
import org.maplibre.android.MapLibre
import org.maplibre.android.geometry.LatLng
Expand All @@ -27,7 +28,7 @@ import org.maplibre.android.utils.BitmapUtils
*/
class AnimatedImageSourceActivity : AppCompatActivity(), OnMapReadyCallback {
private lateinit var mapView: MapView
private val handler = Handler()
private val handler = Handler(Looper.getMainLooper())
private var runnable: Runnable? = null
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package org.maplibre.android.testapp.activity.turf
import android.graphics.Color
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.os.PersistableBundle
import androidx.appcompat.app.AppCompatActivity
import org.maplibre.geojson.*
Expand Down Expand Up @@ -32,7 +33,7 @@ class WithinExpressionActivity : AppCompatActivity() {
private lateinit var binding: ActivityWithinExpressionBinding
private lateinit var mapView: MapView

private val handler: Handler = Handler()
private val handler: Handler = Handler(Looper.getMainLooper())
private val runnable: Runnable = Runnable {
optimizeStyle()
}
Expand Down
Loading