Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Harden MarkerView integration by checking for null bitmap #10532

Merged
merged 1 commit into from
Nov 22, 2017

Conversation

tobrun
Copy link
Member

@tobrun tobrun commented Nov 22, 2017

This PR patches up the getBitmap call on Icon to avoid throwing a nullpointer when using the deprecated MarkerView api. Closes #10507.

@tobrun tobrun added the Android Mapbox Maps SDK for Android label Nov 22, 2017
@tobrun tobrun added this to the android-v5.2.1 milestone Nov 22, 2017
@tobrun tobrun self-assigned this Nov 22, 2017
@tobrun tobrun requested a review from osana November 22, 2017 15:11
@tobrun tobrun merged commit e3f1d8e into master Nov 22, 2017
@tobrun tobrun deleted the tvn-bitmap-zero branch December 5, 2017 08:01
@tobrun tobrun mentioned this pull request Dec 5, 2017
2 tasks
@tobrun tobrun mentioned this pull request Dec 6, 2017
21 tasks
mappy-mobile pushed a commit to Mappy/mapbox-gl-native that referenced this pull request Dec 11, 2017
* mapbox_release5.2.1: (29 commits)
  [android] - update changelog for 5.2.1 release
  [ios, macos] Rename the iOS and macOS SDKs (mapbox#10610)
  [core, ios, qt, android] Close race condition in RunLoop (issue mapbox#9620) Because a message we queue from the foreground may cause the background to complete, exit, and tear down the AsyncTask, we have to block queue processing until we've finished our call to AsyncTask::send(). Broadening the scope of a mutex is scary, but I audited the code of our four implementations of AsyncTask and I don't see any way this could cause a deadlock.
  [android] - add FileSource activation/deactivation to MapSnapshotter, handle multiple deactivate scenario in FileSource (mapbox#10556)
  [android] - handle destroying activity programmatically as part of theme switching (mapbox#10589)
  [android] - use concurrent lists for camera change listeners (mapbox#10542)
  [android] - harden MarkerView integration by checking for null bitmap (mapbox#10532)
  [android] - activate filesource to list offline regions (mapbox#10531)
  [android] Enable map rendering when app is paused
  [ios, macos] Snapshot classes added to jazzy
  [android] remove unnecessary jar generation from gradle-publish.gradle (mapbox#10625)
  [ios, macos] Refactor snapshot attribution.
  [macos] Fixed logo view distortion on macOS High Sierra
  [ios, macos] Update changelogs.
  [ios, macos] Fix an issue that triggers didSelectAnnotations for MGLAnnotationImage based annotations.
  [ios] Fix minimumZoomLevel is not getting set.
  [android] - attribtuion anchor point calculation fix for short text with full logo on a MapSnapshot (mapbox#10558)
  [android] use location engine abstraction instead of location source (lost) in MyLocationView#init (mapbox#10579)
  [build] Added CircleCI macos-release-node{4,6} jobs
  [android] Set a larger limit for the HTTP dispatcher (mapbox#10567)
  ...

# Conflicts:
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/gradle-publish.gradle
#	platform/android/MapboxGLAndroidSDK/gradle.properties
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Android Mapbox Maps SDK for Android
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants