diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/compat/ConnectivityManagerCompatUtils.java b/app/src/main/java/org/dslul/openboard/inputmethod/compat/ConnectivityManagerCompatUtils.java deleted file mode 100644 index 59b871f71..000000000 --- a/app/src/main/java/org/dslul/openboard/inputmethod/compat/ConnectivityManagerCompatUtils.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * 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 org.dslul.openboard.inputmethod.compat; - -import android.net.ConnectivityManager; - -import java.lang.reflect.Method; - -public final class ConnectivityManagerCompatUtils { - // ConnectivityManager#isActiveNetworkMetered() has been introduced - // in API level 16 (Build.VERSION_CODES.JELLY_BEAN). - private static final Method METHOD_isActiveNetworkMetered = CompatUtils.getMethod( - ConnectivityManager.class, "isActiveNetworkMetered"); - - public static boolean isActiveNetworkMetered(final ConnectivityManager manager) { - return (Boolean)CompatUtils.invoke(manager, - // If the API telling whether the network is metered or not is not available, - // then the closest thing is "if it's a mobile connection". - manager.getActiveNetworkInfo().getType() == ConnectivityManager.TYPE_MOBILE, - METHOD_isActiveNetworkMetered); - } -} diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/ContactsBinaryDictionary.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/ContactsBinaryDictionary.java index 4e23c021f..aa0854240 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/ContactsBinaryDictionary.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/ContactsBinaryDictionary.java @@ -27,11 +27,9 @@ import org.dslul.openboard.inputmethod.annotations.ExternallyReferenced; import org.dslul.openboard.inputmethod.latin.ContactsManager.ContactsChangedListener; import org.dslul.openboard.inputmethod.latin.common.StringUtils; import org.dslul.openboard.inputmethod.latin.permissions.PermissionsUtil; -import org.dslul.openboard.inputmethod.latin.personalization.AccountUtils; import java.io.File; import java.util.ArrayList; -import java.util.List; import java.util.Locale; import javax.annotation.Nullable; @@ -80,34 +78,11 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary */ @Override public void loadInitialContentsLocked() { - loadDeviceAccountsEmailAddressesLocked(); loadDictionaryForUriLocked(ContactsContract.Profile.CONTENT_URI); // TODO: Switch this URL to the newer ContactsContract too loadDictionaryForUriLocked(Contacts.CONTENT_URI); } - /** - * Loads device accounts to the dictionary. - */ - private void loadDeviceAccountsEmailAddressesLocked() { - final List accountVocabulary = - AccountUtils.getDeviceAccountsEmailAddresses(mContext); - if (accountVocabulary == null || accountVocabulary.isEmpty()) { - return; - } - for (String word : accountVocabulary) { - if (DEBUG) { - Log.d(TAG, "loadAccountVocabulary: " + word); - } - runGCIfRequiredLocked(true /* mindsBlockByGC */); - addUnigramLocked(word, ContactsDictionaryConstants.FREQUENCY_FOR_CONTACTS, - null /* shortcut */, - 0 /* shortcutFreq */, - false /* isNotAWord */, false /* isPossiblyOffensive */, - BinaryDictionary.NOT_A_VALID_TIMESTAMP); - } - } - /** * Loads data within content providers to the dictionary. */ diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/personalization/AccountUtils.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/personalization/AccountUtils.java deleted file mode 100644 index e85abbf13..000000000 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/personalization/AccountUtils.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * 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 org.dslul.openboard.inputmethod.latin.personalization; - -import android.accounts.Account; -import android.accounts.AccountManager; -import android.content.Context; -import android.util.Patterns; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - -public class AccountUtils { - private AccountUtils() { - // This utility class is not publicly instantiable. - } - - private static Account[] getAccounts(final Context context) { - return AccountManager.get(context).getAccounts(); - } - - public static List getDeviceAccountsEmailAddresses(final Context context) { - final ArrayList retval = new ArrayList<>(); - for (final Account account : getAccounts(context)) { - final String name = account.name; - if (Patterns.EMAIL_ADDRESS.matcher(name).matches()) { - retval.add(name); - retval.add(name.split("@")[0]); - } - } - return retval; - } - - /** - * Get all device accounts having specified domain name. - * @param context application context - * @param domain domain name used for filtering - * @return List of account names that contain the specified domain name - */ - public static List getDeviceAccountsWithDomain( - final Context context, final String domain) { - final ArrayList retval = new ArrayList<>(); - final String atDomain = "@" + domain.toLowerCase(Locale.ROOT); - for (final Account account : getAccounts(context)) { - if (account.name.toLowerCase(Locale.ROOT).endsWith(atDomain)) { - retval.add(account.name); - } - } - return retval; - } -}