filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix potential access to null value

Browse Source
This commit is contained in:
Maxime NATUREL 2022-05-23 17:19:29 +02:00
parent c07bc0890f
commit 8145049315
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
View File

@ -33,10 +33,10 @@ import com.mapbox.mapboxsdk.maps.MapboxMap
import com.mapbox.mapboxsdk.maps.MapboxMapOptions import com.mapbox.mapboxsdk.maps.MapboxMapOptions
import com.mapbox.mapboxsdk.maps.Style import com.mapbox.mapboxsdk.maps.Style
import com.mapbox.mapboxsdk.maps.SupportMapFragment import com.mapbox.mapboxsdk.maps.SupportMapFragment
import dagger.hilt.android.AndroidEntryPoint
import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager
import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
import com.mapbox.mapboxsdk.style.layers.Property import com.mapbox.mapboxsdk.style.layers.Property
import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.R import im.vector.app.R
import im.vector.app.core.extensions.addChildFragment import im.vector.app.core.extensions.addChildFragment
import im.vector.app.core.platform.VectorBaseFragment import im.vector.app.core.platform.VectorBaseFragment
@ -44,6 +44,7 @@ import im.vector.app.databinding.FragmentSimpleContainerBinding
import im.vector.app.features.location.UrlMapProvider import im.vector.app.features.location.UrlMapProvider
import im.vector.app.features.location.zoomToBounds import im.vector.app.features.location.zoomToBounds
import im.vector.app.features.location.zoomToLocation import im.vector.app.features.location.zoomToLocation
import timber.log.Timber
import java.lang.ref.WeakReference import java.lang.ref.WeakReference
import javax.inject.Inject import javax.inject.Inject
@ -155,10 +156,13 @@ class LocationLiveMapViewFragment : VectorBaseFragment<FragmentSimpleContainerBi
.mapNotNull { userId -> .mapNotNull { userId ->
removeUserPinFromMapStyle(userId) removeUserPinFromMapStyle(userId)
viewModel.mapSymbolIds[userId] viewModel.mapSymbolIds[userId]
viewModel.mapSymbolIds.remove(userId)
} }
.forEach { symbolId -> .forEach { symbolId ->
val symbol = symbolManager.annotations.get(symbolId) Timber.d("trying to delete symbol with id: $symbolId")
symbolManager.delete(symbol) symbolManager.annotations.get(symbolId)?.let {
symbolManager.delete(it)
}
} }
} }