From db8a638a1b411248485b46547532edbdcc6d880e Mon Sep 17 00:00:00 2001
From: sspanak <doftor.livain@gmail.com>
Date: Mon, 11 Nov 2024 10:28:38 +0200
Subject: [PATCH] fixed a couple of NullPointerException-related crashes when
 switching to another keyboard

---
 .../io/github/sspanak/tt9/ime/MainViewHandler.java     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/MainViewHandler.java b/app/src/main/java/io/github/sspanak/tt9/ime/MainViewHandler.java
index 8abdd632..71334d60 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/MainViewHandler.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/MainViewHandler.java
@@ -26,9 +26,13 @@ abstract public class MainViewHandler extends HotkeyHandler {
 	}
 
 	protected void cleanUp() {
-		mainView.removeListeners();
-		orientationListener.stop();
-		orientationListener = null;
+		if (mainView != null) {
+			mainView.removeListeners();
+		}
+		if (orientationListener != null) {
+			orientationListener.stop();
+			orientationListener = null;
+		}
 	}
 
 	public int getTextCase() {