diff options
author | Łukasz Paczos <lukas.paczos@gmail.com> | 2018-11-13 12:47:40 +0100 |
---|---|---|
committer | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2018-11-14 18:22:43 +0100 |
commit | 0df37421faeaffb83564a81a469faa099434b767 (patch) | |
tree | 43be20830dfe7ee34a555f2648b910402ef89d4e /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps | |
parent | 6afc63caf7650fb5870028ba77189387191bd1f9 (diff) | |
download | qtlocation-mapboxgl-0df37421faeaffb83564a81a469faa099434b767.tar.gz |
[android] catch and re-throw throwables thrown inside map state callbacks
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java index 3eaa381239..a12c6c7fb3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java @@ -1,6 +1,5 @@ package com.mapbox.mapboxsdk.maps; -import com.mapbox.mapboxsdk.MapStrictMode; import com.mapbox.mapboxsdk.log.Logger; import java.util.List; @@ -39,9 +38,9 @@ class MapChangeReceiver implements NativeMapView.StateCallback { onCameraWillChangeListener.onCameraWillChange(animated); } } - } catch (RuntimeException err) { + } catch (Throwable err) { Logger.e(TAG, "Exception in onCameraWillChange", err); - MapStrictMode.strictModeViolation(err); + throw err; } } @@ -53,9 +52,9 @@ class MapChangeReceiver implements NativeMapView.StateCallback { onCameraIsChangingListener.onCameraIsChanging(); } } - } catch (RuntimeException err) { + } catch (Throwable err) { Logger.e(TAG, "Exception in onCameraIsChanging", err); - MapStrictMode.strictModeViolation(err); + throw err; } } @@ -67,9 +66,9 @@ class MapChangeReceiver implements NativeMapView.StateCallback { onCameraDidChangeListener.onCameraDidChange(animated); } } - } catch (RuntimeException err) { + } catch (Throwable err) { Logger.e(TAG, "Exception in onCameraDidChange", err); - MapStrictMode.strictModeViolation(err); + throw err; } } @@ -81,9 +80,9 @@ class MapChangeReceiver implements NativeMapView.StateCallback { onWillStartLoadingMapListener.onWillStartLoadingMap(); } } - } catch (RuntimeException err) { + } catch (Throwable err) { Logger.e(TAG, "Exception in onWillStartLoadingMap", err); - MapStrictMode.strictModeViolation(err); + throw err; } } @@ -95,9 +94,9 @@ class MapChangeReceiver implements NativeMapView.StateCallback { onDidFinishLoadingMapListener.onDidFinishLoadingMap(); } } - } catch (RuntimeException err) { + } catch (Throwable err) { Logger.e(TAG, "Exception in onDidFinishLoadingMap", err); - MapStrictMode.strictModeViolation(err); + throw err; } } @@ -109,9 +108,9 @@ class MapChangeReceiver implements NativeMapView.StateCallback { onDidFailLoadingMapListener.onDidFailLoadingMap(error); } } - } catch (RuntimeException err) { + } catch (Throwable err) { Logger.e(TAG, "Exception in onDidFailLoadingMap", err); - MapStrictMode.strictModeViolation(err); + throw err; } } @@ -123,9 +122,9 @@ class MapChangeReceiver implements NativeMapView.StateCallback { listener.onWillStartRenderingFrame(); } } - } catch (RuntimeException err) { + } catch (Throwable err) { Logger.e(TAG, "Exception in onWillStartRenderingFrame", err); - MapStrictMode.strictModeViolation(err); + throw err; } } @@ -137,9 +136,9 @@ class MapChangeReceiver implements NativeMapView.StateCallback { listener.onDidFinishRenderingFrame(fully); } } - } catch (RuntimeException err) { + } catch (Throwable err) { Logger.e(TAG, "Exception in onDidFinishRenderingFrame", err); - MapStrictMode.strictModeViolation(err); + throw err; } } @@ -151,9 +150,9 @@ class MapChangeReceiver implements NativeMapView.StateCallback { listener.onWillStartRenderingMap(); } } - } catch (RuntimeException err) { + } catch (Throwable err) { Logger.e(TAG, "Exception in onWillStartRenderingMap", err); - MapStrictMode.strictModeViolation(err); + throw err; } } @@ -165,9 +164,9 @@ class MapChangeReceiver implements NativeMapView.StateCallback { listener.onDidFinishRenderingMap(fully); } } - } catch (RuntimeException err) { + } catch (Throwable err) { Logger.e(TAG, "Exception in onDidFinishRenderingMap", err); - MapStrictMode.strictModeViolation(err); + throw err; } } @@ -179,9 +178,9 @@ class MapChangeReceiver implements NativeMapView.StateCallback { listener.onDidFinishLoadingStyle(); } } - } catch (RuntimeException err) { + } catch (Throwable err) { Logger.e(TAG, "Exception in onDidFinishLoadingStyle", err); - MapStrictMode.strictModeViolation(err); + throw err; } } @@ -193,9 +192,9 @@ class MapChangeReceiver implements NativeMapView.StateCallback { onSourceChangedListener.onSourceChangedListener(sourceId); } } - } catch (RuntimeException err) { + } catch (Throwable err) { Logger.e(TAG, "Exception in onSourceChanged", err); - MapStrictMode.strictModeViolation(err); + throw err; } } |