diff --git a/android/src/main/java/com/unact/yandexmapkit/full/InitFull.java b/android/src/main/java/com/unact/yandexmapkit/full/InitFull.java index 8b4017e2..c23912f2 100644 --- a/android/src/main/java/com/unact/yandexmapkit/full/InitFull.java +++ b/android/src/main/java/com/unact/yandexmapkit/full/InitFull.java @@ -57,21 +57,30 @@ public void setupChannels(BinaryMessenger messenger, Context context) { pedestrianMethodChannel.setMethodCallHandler(yandexPedestrian); } - @SuppressWarnings({"ConstantConditions"}) public void teardownChannels() { - searchMethodChannel.setMethodCallHandler(null); - searchMethodChannel = null; - - suggestMethodChannel.setMethodCallHandler(null); - suggestMethodChannel = null; - - drivingMethodChannel.setMethodCallHandler(null); - drivingMethodChannel = null; - - bicycleMethodChannel.setMethodCallHandler(null); - bicycleMethodChannel = null; - - pedestrianMethodChannel.setMethodCallHandler(null); - pedestrianMethodChannel = null; + if (searchMethodChannel != null) { + searchMethodChannel.setMethodCallHandler(null); + searchMethodChannel = null; + } + + if (suggestMethodChannel != null) { + suggestMethodChannel.setMethodCallHandler(null); + suggestMethodChannel = null; + } + + if (drivingMethodChannel != null) { + drivingMethodChannel.setMethodCallHandler(null); + drivingMethodChannel = null; + } + + if (bicycleMethodChannel != null) { + bicycleMethodChannel.setMethodCallHandler(null); + bicycleMethodChannel = null; + } + + if (pedestrianMethodChannel != null) { + pedestrianMethodChannel.setMethodCallHandler(null); + pedestrianMethodChannel = null; + } } }