Small fixes + update dependencies

Author: Kaljurand

app/build.gradle

@@ -26,8 +26,8 @@ android {
         applicationId 'ee.ioc.phon.android.speak'
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 1754
-        versionName '1.7.54'
+        versionCode 1756
+        versionName '1.7.56'
         vectorDrawables.useSupportLibrary = true
         // Keep only en and et resources
         resConfigs "en", "et"

app/src/main/java/ee/ioc/phon/android/speak/service/SpeechInputMethodService.java

@@ -188,14 +188,16 @@ public void onStartInputView(EditorInfo editorInfo, boolean restarting) {
         InputConnection ic = getCurrentInputConnection();
         // InputConnectionCommandEditor cannot be called with a null InputConnection.
         // We do not expect this to happen, but Google Play crash reports show that it does.
+        // TODO: review, e.g. move to after restarting-check
         if (ic == null) {
             Toast.makeText(getApplicationContext(), R.string.errorFailedGetCurrentInputConnection, Toast.LENGTH_LONG).show();
-            switchToLastIme();
+            //switchToLastIme();
             return;
         }
         ((InputConnectionCommandEditor) mCommandEditor).setInputConnection(ic);
 
         // TODO: quick hack to add app to the matcher, not sure if we can access the class name of the app
+        // TODO: use getPackageName() or editorInfo.packageName, but not both
         String packageName = editorInfo.packageName;
         ComponentName app = new ComponentName(packageName, packageName);
 

app/src/main/java/ee/ioc/phon/android/speak/view/SpeechInputView.java

@@ -834,6 +834,7 @@ private void startListening(ServiceLanguageChooser slc) {
      * Note that SpeechRecognizer#destroy calls cancel first.
      */
     private void cancelOrDestroy() {
+        mBtnType = "Y";
         if (mRecognizer != null) {
             mRecognizer.destroy();
             mRecognizer = null;