Merge pull request #604 from AnySoftKeyboard/relinker

Relinker - Issue #589

7 files changed, 9 insertions, 99 deletions

diff --git a/src/main/java/com/anysoftkeyboard/dictionaries/DictionaryAddOnAndBuilder.java b/src/main/java/com/anysoftkeyboard/dictionaries/DictionaryAddOnAndBuilder.java
index 48eb50cef..fb20bb419 100644
--- a/src/main/java/com/anysoftkeyboard/dictionaries/DictionaryAddOnAndBuilder.java
+++ b/src/main/java/com/anysoftkeyboard/dictionaries/DictionaryAddOnAndBuilder.java
@@ -22,6 +22,7 @@ import com.anysoftkeyboard.base.dictionaries.Dictionary;
 import com.anysoftkeyboard.dictionaries.jni.BinaryDictionary;
 import com.anysoftkeyboard.dictionaries.jni.ResourceBinaryDictionary;
 import com.anysoftkeyboard.utils.Log;
+import com.menny.android.anysoftkeyboard.BuildConfig;
 
 import java.util.Arrays;
 import java.util.List;
@@ -71,9 +72,9 @@ public class DictionaryAddOnAndBuilder extends AddOnImpl {
 
     public Dictionary createDictionary() throws Exception {
         if (mDictionaryResId == INVALID_RES_ID)
-            return new BinaryDictionary(getName(), getPackageContext().getAssets().openFd(mAssetsFilename));
+            return new BinaryDictionary(getPackageContext(), getName(), getPackageContext().getAssets().openFd(mAssetsFilename), BuildConfig.DEBUG);
         else
-            return new ResourceBinaryDictionary(getName(), getPackageContext(), mDictionaryResId);
+            return new ResourceBinaryDictionary(getName(), getPackageContext(), mDictionaryResId, BuildConfig.DEBUG);
     }
 
     public AutoText createAutoText() {
diff --git a/src/main/java/com/anysoftkeyboard/dictionaries/Suggest.java b/src/main/java/com/anysoftkeyboard/dictionaries/Suggest.java
index 5fbb75aae..9eab6b276 100644
--- a/src/main/java/com/anysoftkeyboard/dictionaries/Suggest.java
+++ b/src/main/java/com/anysoftkeyboard/dictionaries/Suggest.java
@@ -24,7 +24,7 @@ import android.text.TextUtils;
 import com.anysoftkeyboard.base.dictionaries.Dictionary;
 import com.anysoftkeyboard.base.dictionaries.WordComposer;
 import com.anysoftkeyboard.dictionaries.sqlite.AbbreviationsDictionary;
-import com.anysoftkeyboard.utils.CompatUtils;
+import com.anysoftkeyboard.base.utils.CompatUtils;
 import com.anysoftkeyboard.utils.IMEUtil;
 import com.anysoftkeyboard.utils.Log;
 import com.menny.android.anysoftkeyboard.BuildConfig;
diff --git a/src/main/java/com/anysoftkeyboard/keyboards/ExternalAnyKeyboard.java b/src/main/java/com/anysoftkeyboard/keyboards/ExternalAnyKeyboard.java
index 50aa95fc8..9c9088af5 100644
--- a/src/main/java/com/anysoftkeyboard/keyboards/ExternalAnyKeyboard.java
+++ b/src/main/java/com/anysoftkeyboard/keyboards/ExternalAnyKeyboard.java
@@ -29,7 +29,7 @@ import com.anysoftkeyboard.api.KeyCodes;
 import com.anysoftkeyboard.keyboardextensions.KeyboardExtension;
 import com.anysoftkeyboard.keyboardextensions.KeyboardExtensionFactory;
 import com.anysoftkeyboard.keyboards.AnyKeyboard.HardKeyboardTranslator;
-import com.anysoftkeyboard.utils.CompatUtils;
+import com.anysoftkeyboard.base.utils.CompatUtils;
 import com.anysoftkeyboard.utils.Log;
 import com.menny.android.anysoftkeyboard.BuildConfig;
 
diff --git a/src/main/java/com/anysoftkeyboard/keyboards/views/AnyKeyboardBaseView.java b/src/main/java/com/anysoftkeyboard/keyboards/views/AnyKeyboardBaseView.java
index 6a3f35620..856050e12 100644
--- a/src/main/java/com/anysoftkeyboard/keyboards/views/AnyKeyboardBaseView.java
+++ b/src/main/java/com/anysoftkeyboard/keyboards/views/AnyKeyboardBaseView.java
@@ -74,7 +74,7 @@ import com.anysoftkeyboard.keyboards.views.preview.PreviewPopupTheme;
 import com.anysoftkeyboard.quicktextkeys.ui.QuickTextViewFactory;
 import com.anysoftkeyboard.theme.KeyboardTheme;
 import com.anysoftkeyboard.theme.KeyboardThemeFactory;
-import com.anysoftkeyboard.utils.CompatUtils;
+import com.anysoftkeyboard.base.utils.CompatUtils;
 import com.anysoftkeyboard.utils.Log;
 import com.menny.android.anysoftkeyboard.AnyApplication;
 import com.menny.android.anysoftkeyboard.BuildConfig;
diff --git a/src/main/java/com/anysoftkeyboard/keyboards/views/preview/PreviewPopup.java b/src/main/java/com/anysoftkeyboard/keyboards/views/preview/PreviewPopup.java
index a7d841743..336f4d48c 100644
--- a/src/main/java/com/anysoftkeyboard/keyboards/views/preview/PreviewPopup.java
+++ b/src/main/java/com/anysoftkeyboard/keyboards/views/preview/PreviewPopup.java
@@ -15,7 +15,7 @@ import android.widget.TextView;
 
 import com.anysoftkeyboard.AskPrefs;
 import com.anysoftkeyboard.keyboards.Keyboard;
-import com.anysoftkeyboard.utils.CompatUtils;
+import com.anysoftkeyboard.base.utils.CompatUtils;
 import com.menny.android.anysoftkeyboard.AnyApplication;
 import com.menny.android.anysoftkeyboard.R;
 
diff --git a/src/main/java/com/anysoftkeyboard/utils/ArraysCompatUtils.java b/src/main/java/com/anysoftkeyboard/utils/ArraysCompatUtils.java
index 3c261adca..1407e7a50 100644
--- a/src/main/java/com/anysoftkeyboard/utils/ArraysCompatUtils.java
+++ b/src/main/java/com/anysoftkeyboard/utils/ArraysCompatUtils.java
@@ -16,6 +16,8 @@
 
 package com.anysoftkeyboard.utils;
 
+import com.anysoftkeyboard.base.utils.CompatUtils;
+
 import java.lang.reflect.Method;
 import java.util.Arrays;
 
diff --git a/src/main/java/com/anysoftkeyboard/utils/CompatUtils.java b/src/main/java/com/anysoftkeyboard/utils/CompatUtils.java
deleted file mode 100644
index 6d6d9f38f..000000000
--- a/src/main/java/com/anysoftkeyboard/utils/CompatUtils.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2013 Menny Even-Danan
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.anysoftkeyboard.utils;
-
-import android.annotation.TargetApi;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.PopupWindow;
-
-import java.lang.reflect.Method;
-import java.util.Locale;
-
-public class CompatUtils {
-    private static final String TAG = "ASK CompatUtils";
-
-    public static Method getMethod(Class<?> targetClass, String name,
-                                   Class<?>... parameterTypes) {
-        if (targetClass == null || TextUtils.isEmpty(name)) return null;
-        try {
-            return targetClass.getMethod(name, parameterTypes);
-        } catch (SecurityException e) {
-            // ignore
-        } catch (NoSuchMethodException e) {
-            // ignore
-        }
-        return null;
-    }
-
-    public static Object invoke(Object receiver, Object defaultValue, Method method, Object... args) {
-        if (method == null) return defaultValue;
-        try {
-            return method.invoke(receiver, args);
-        } catch (Exception e) {
-            Log.e(TAG, "Exception in invoke: " + e.getClass().getSimpleName());
-        }
-        return defaultValue;
-    }
-
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public static Locale getLocaleForLanguageTag(@Nullable String locale) {
-        Locale parsedLocale = Locale.getDefault();
-        if (!TextUtils.isEmpty(locale)) {
-            try {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    parsedLocale = Locale.forLanguageTag(locale);
-                } else {
-                    parsedLocale = new Locale(locale);
-                }
-            } catch (Exception e) {
-                Log.d(TAG, "Failed to parse locale '%s'. Defaulting to %s", parsedLocale);
-            }
-        }
-        return parsedLocale;
-    }
-
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-    public static void setViewBackgroundDrawable(View view, Drawable drawable) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            view.setBackground(drawable);
-        } else {
-            //noinspection deprecation
-            view.setBackgroundDrawable(drawable);
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1)
-    public static void setPopupUnattachedToDecod(PopupWindow popupWindow) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-            popupWindow.setAttachedInDecor(false);
-        }
-    }
-
-    public static void unbindDrawable(Drawable d) {
-        if (d != null) d.setCallback(null);
-    }
-}