fix issue #7

README.md

@@ -47,9 +47,8 @@ __Standard installation via ADB__
 
 ### Donation:
 If you want to support my developments you are welcome to buy me a cup of coffee :)
- * BTC: 1JAT5VVWarVBkpVbNDn8UA8HXNdrukuBSx
- * WMZ: Z375157140784
- * WMU: U449339012933
+ * [__PrivatBank (Ukraine)__](https://privatbank.ua/ru/sendmoney?payment=5fcdddf53e3d491d63fcb050e6e2e05f2f2678c2)
+ * __BTC__: 1JAT5VVWarVBkpVbNDn8UA8HXNdrukuBSx
 
 ### Screens:
 ![Screenshot of LeanKeyKeyboard](img/leankeykeyboard_screenshot_01.png "Screenshot of LeanKeyKeyboard")

leankeykeyboard/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.liskovsoft.leankeykeyboard.pro"
         minSdkVersion project.properties.minSdkVersion
         targetSdkVersion project.properties.targetSdkVersion
-        versionCode 76
-        versionName "4.3.26"
+        versionCode 77
+        versionName "4.3.27"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

leankeykeyboard/src/main/java/com/google/android/leanback/ime/LeanbackKeyboardContainer.java

@@ -1132,7 +1132,7 @@ public class LeanbackKeyboardContainer {
     }
 
     public void updateAddonKeyboard() {
-        mKeyboardManager = new KeyboardManager(mContext, mAbcKeyboard);
+        mKeyboardManager = new KeyboardManager(mContext);
         switchToNextKeyboard();
     }
 

leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/KeyboardManager.java

@@ -8,7 +8,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class KeyboardManager {
-    private final Keyboard mEnglishKeyboard;
     private final Context mContext;
     private final KeyboardStateManager mStateManager;
     private List<? extends KeyboardBuilder> mKeyboardBuilders;
@@ -17,13 +16,8 @@ public class KeyboardManager {
 
     private int mKeyboardIndex = 0;
 
-    public KeyboardManager(Context ctx, int keyboardResId) {
-        this(ctx, new Keyboard(ctx, keyboardResId));
-    }
-
-    public KeyboardManager(Context ctx, Keyboard englishKeyboard) {
+    public KeyboardManager(Context ctx) {
         mContext = ctx;
-        mEnglishKeyboard = englishKeyboard;
         mStateManager = new KeyboardStateManager(mContext, this);
         mStateManager.restore();
         init();
@@ -37,7 +31,6 @@ public class KeyboardManager {
 
     private List<Keyboard> buildAllKeyboards() {
         List<Keyboard> keyboards = new ArrayList<>();
-        keyboards.add(mEnglishKeyboard);
         if (!mKeyboardBuilders.isEmpty()) {
             for (KeyboardBuilder builder : mKeyboardBuilders) {
                 keyboards.add(builder.createKeyboard());

leankeykeyboard/src/main/java/com/liskovsoft/keyboardaddons/reskbdfactory/ResKeyboardFactory.java

@@ -21,26 +21,37 @@ public class ResKeyboardFactory implements KeyboardFactory {
     @Override
     public List<? extends KeyboardBuilder> getAllAvailableKeyboards(Context context) {
         List<KeyboardBuilder> result = new ArrayList<>();
-
         List<KeyboardInfo> infos = ResKeyboardInfo.getAllKeyboardInfos(context);
-        final Resources resources = mContext.getResources();
 
         for (final KeyboardInfo info : infos) {
             if (!info.isEnabled()) {
                 continue;
             }
 
-            result.add(new KeyboardBuilder() {
-                @Nullable
-                @Override
-                public Keyboard createKeyboard() {
-                    return new Keyboard(mContext, resources.getIdentifier("qwerty_" + info.getLangCode(), "xml", mContext.getPackageName()));
-                }
-            });
+            result.add(createKeyboard(info.getLangCode()));
         }
+
+        // at least one kbd should be enabled
+        if (result.isEmpty()) {
+            KeyboardInfo firstKbd = infos.get(0);
+            result.add(createKeyboard(firstKbd.getLangCode()));
+            firstKbd.setEnabled(true);
+            ResKeyboardInfo.updateAllKeyboardInfos(mContext, infos);
+        }
+
         return result;
     }
 
+    private KeyboardBuilder createKeyboard(final String langCode) {
+        return new KeyboardBuilder() {
+            @Nullable
+            @Override
+            public Keyboard createKeyboard() {
+                return new Keyboard(mContext, mContext.getResources().getIdentifier("qwerty_" + langCode, "xml", mContext.getPackageName()));
+            }
+        };
+    }
+
     @Override
     public boolean needUpdate() {
         return ResKeyboardInfo.needUpdate();

leankeykeyboard/src/main/res/values/languages.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="additional_languages">
-        <item>Swedish|sv</item>
+        <item>English|us</item>
         <item>Arabic|ar</item>
         <item>Bulgarian|bg</item>
         <item>Dutch|nl</item>
@@ -13,6 +13,7 @@
         <item>Italian|it</item>
         <item>Persian|fa</item>
         <item>Russian|ru</item>
+        <item>Swedish|sv</item>
         <item>Thai|th</item>
         <item>Turkish|tr</item>
         <item>Ukrainian|uk</item>