From 22fe61b533dbd9055b9f13f43c05e504bbf6b451 Mon Sep 17 00:00:00 2001
From: "kr.angelov" <kr.angelov@gmail.com>
Date: Fri, 22 Nov 2013 13:37:12 +0000
Subject: [PATCH] fix in the GF keyboard for Android

---
 .../ui/android/TranslatorInputMethodService.java          | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java
index d961b228a..77a3015e5 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java
@@ -510,14 +510,18 @@ public class TranslatorInputMethodService extends InputMethodService
        	updateLanguageKeyboard(newSource);
        	mSymbolsKeyboard.updateLanguageKeyLabels();
         mSymbolsShiftedKeyboard.updateLanguageKeyLabels();
-        mInputView.setKeyboard(mCurKeyboard);
+        if (mInputView != null) {
+        	mInputView.setKeyboard(mCurKeyboard);
+        }
     }
 
     void handleChangeTargetLanguage(Language newTarget) {
     	mLanguageKeyboard.updateLanguageKeyLabels();
     	mSymbolsKeyboard.updateLanguageKeyLabels();
     	mSymbolsShiftedKeyboard.updateLanguageKeyLabels();
-    	mInputView.invalidateAllKeys();
+    	if (mInputView != null) {
+    		mInputView.invalidateAllKeys();
+    	}
     }
 
     void handleSwitchLanguages() {