From fd1270dd11ac94d5068f6c0c09cecaaa6468b43a Mon Sep 17 00:00:00 2001 From: Helium314 Date: Sun, 10 Sep 2023 13:39:24 +0200 Subject: [PATCH] remove some unused code --- .../dictionarypack/DictionaryPackConstants.kt | 33 +- .../latin/BinaryDictionaryFileDumper.java | 365 ------------------ .../inputmethod/latin/DictionaryFactory.java | 44 +-- ...ictionaryPackInstallBroadcastReceiver.java | 17 - .../latin/utils/ExecutorUtils.java | 9 +- 5 files changed, 19 insertions(+), 449 deletions(-) delete mode 100644 app/src/main/java/org/dslul/openboard/inputmethod/latin/BinaryDictionaryFileDumper.java diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/DictionaryPackConstants.kt b/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/DictionaryPackConstants.kt index d44426530..fab561cc6 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/DictionaryPackConstants.kt +++ b/app/src/main/java/org/dslul/openboard/inputmethod/dictionarypack/DictionaryPackConstants.kt @@ -16,35 +16,14 @@ object DictionaryPackConstants { /** * Authority for the ContentProvider protocol. */ -// TODO: find some way to factorize this string with the one in the resources + // TODO: find some way to factorize this string with the one in the resources const val AUTHORITY = DICTIONARY_DOMAIN /** * The action of the intent for publishing that new dictionary data is available. */ -// TODO: make this different across different packages. A suggested course of action is -// to use the package name inside this string. -// NOTE: The appended string should be uppercase like all other actions, but it's not for -// historical reasons. + // TODO: make this different across different packages. A suggested course of action is + // to use the package name inside this string. + // NOTE: The appended string should be uppercase like all other actions, but it's not for + // historical reasons. const val NEW_DICTIONARY_INTENT_ACTION = "$DICTIONARY_DOMAIN.newdict" - /** - * The action of the intent sent by the dictionary pack to ask for a client to make - * itself known. This is used when the settings activity is brought up for a client the - * dictionary pack does not know about. - */ - const val UNKNOWN_DICTIONARY_PROVIDER_CLIENT = (DICTIONARY_DOMAIN - + ".UNKNOWN_CLIENT") - // In the above intents, the name of the string extra that contains the name of the client -// we want information about. - const val DICTIONARY_PROVIDER_CLIENT_EXTRA = "client" - /** - * The action of the intent to tell the dictionary provider to update now. - */ - const val UPDATE_NOW_INTENT_ACTION = (DICTIONARY_DOMAIN - + ".UPDATE_NOW") - /** - * The intent action to inform the dictionary provider to initialize the db - * and update now. - */ - const val INIT_AND_UPDATE_NOW_INTENT_ACTION = (DICTIONARY_DOMAIN - + ".INIT_AND_UPDATE_NOW") -} \ No newline at end of file +} diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/BinaryDictionaryFileDumper.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/BinaryDictionaryFileDumper.java deleted file mode 100644 index 3265081bb..000000000 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/BinaryDictionaryFileDumper.java +++ /dev/null @@ -1,365 +0,0 @@ -/* - * Copyright (C) 2011 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; - -import android.content.ContentProviderClient; -import android.content.ContentResolver; -import android.content.ContentValues; -import android.content.Context; -import android.content.res.AssetFileDescriptor; -import android.database.Cursor; -import android.net.Uri; -import android.os.RemoteException; -import android.text.TextUtils; -import android.util.Log; - -import org.dslul.openboard.inputmethod.dictionarypack.DictionaryPackConstants; -import org.dslul.openboard.inputmethod.latin.define.DecoderSpecificConstants; -import org.dslul.openboard.inputmethod.latin.utils.DictionaryInfoUtils; -import org.dslul.openboard.inputmethod.latin.utils.DictionaryInfoUtils.DictionaryInfo; -import org.dslul.openboard.inputmethod.latin.utils.MetadataFileUriGetter; - -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.Closeable; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Locale; - -/** - * Group class for static methods to help with creation and getting of the binary dictionary - * file from the dictionary provider - */ -public final class BinaryDictionaryFileDumper { - private static final String TAG = BinaryDictionaryFileDumper.class.getSimpleName(); - - /** - * The size of the temporary buffer to copy files. - */ - private static final int FILE_READ_BUFFER_SIZE = 8192; - // TODO: make the following data common with the native code - private static final byte[] MAGIC_NUMBER_VERSION_1 = - new byte[] { (byte)0x78, (byte)0xB1, (byte)0x00, (byte)0x00 }; - private static final byte[] MAGIC_NUMBER_VERSION_2 = - new byte[] { (byte)0x9B, (byte)0xC1, (byte)0x3A, (byte)0xFE }; - - private static final boolean SHOULD_VERIFY_MAGIC_NUMBER = DecoderSpecificConstants.SHOULD_VERIFY_MAGIC_NUMBER; - private static final boolean SHOULD_VERIFY_CHECKSUM = DecoderSpecificConstants.SHOULD_VERIFY_CHECKSUM; - - private static final String[] DICTIONARY_PROJECTION = {"id"}; - - private static final String QUERY_PARAMETER_MAY_PROMPT_USER = "mayPrompt"; - private static final String QUERY_PARAMETER_TRUE = "true"; - private static final String QUERY_PARAMETER_DELETE_RESULT = "result"; - private static final String QUERY_PARAMETER_SUCCESS = "success"; - private static final String QUERY_PARAMETER_FAILURE = "failure"; - - // Using protocol version 2 to communicate with the dictionary pack - private static final String QUERY_PARAMETER_PROTOCOL = "protocol"; - private static final String QUERY_PARAMETER_PROTOCOL_VALUE = "2"; - - // The path fragment to append after the client ID for dictionary info requests. - private static final String QUERY_PATH_DICT_INFO = "dict"; - // The path fragment to append after the client ID for dictionary datafile requests. - private static final String QUERY_PATH_DATAFILE = "datafile"; - // The path fragment to append after the client ID for updating the metadata URI. - private static final String QUERY_PATH_METADATA = "metadata"; - private static final String INSERT_METADATA_CLIENT_ID_COLUMN = "clientid"; - private static final String INSERT_METADATA_METADATA_URI_COLUMN = "uri"; - private static final String INSERT_METADATA_METADATA_ADDITIONAL_ID_COLUMN = "additionalid"; - - // Prevents this class to be accidentally instantiated. - private BinaryDictionaryFileDumper() { - } - - /** - * Returns a URI builder pointing to the dictionary pack. - * - * This creates a URI builder able to build a URI pointing to the dictionary - * pack content provider for a specific dictionary id. - */ - public static Uri.Builder getProviderUriBuilder(final String path) { - return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT) - .authority(DictionaryPackConstants.AUTHORITY).appendPath(path); - } - - /** - * Gets the content URI builder for a specified type. - * - * Supported types include QUERY_PATH_DICT_INFO, which takes the locale as - * the extraPath argument, and QUERY_PATH_DATAFILE, which needs a wordlist ID - * as the extraPath argument. - * - * @param clientId the clientId to use - * @param contentProviderClient the instance of content provider client - * @param queryPathType the path element encoding the type - * @param extraPath optional extra argument for this type (typically word list id) - * @return a builder that can build the URI for the best supported protocol version - * @throws RemoteException if the client can't be contacted - */ - private static Uri.Builder getContentUriBuilderForType(final String clientId, - final ContentProviderClient contentProviderClient, final String queryPathType, - final String extraPath) throws RemoteException { - // Check whether protocol v2 is supported by building a v2 URI and calling getType() - // on it. If this returns null, v2 is not supported. - final Uri.Builder uriV2Builder = getProviderUriBuilder(clientId); - uriV2Builder.appendPath(queryPathType); - uriV2Builder.appendPath(extraPath); - uriV2Builder.appendQueryParameter(QUERY_PARAMETER_PROTOCOL, - QUERY_PARAMETER_PROTOCOL_VALUE); - if (null != contentProviderClient.getType(uriV2Builder.build())) return uriV2Builder; - // Protocol v2 is not supported, so create and return the protocol v1 uri. - return getProviderUriBuilder(extraPath); - } - - /** - * Queries a content provider for the list of word lists for a specific locale - * available to copy into Latin IME. - */ - private static List getWordListWordListInfos(final Locale locale, - final Context context, final boolean hasDefaultWordList) { - final String clientId = context.getString(R.string.dictionary_pack_client_id); - final ContentProviderClient client = context.getContentResolver(). - acquireContentProviderClient(getProviderUriBuilder("").build()); - if (null == client) return Collections.emptyList(); - Cursor cursor = null; - try { - final Uri.Builder builder = getContentUriBuilderForType(clientId, client, - QUERY_PATH_DICT_INFO, locale.toString()); - if (!hasDefaultWordList) { - builder.appendQueryParameter(QUERY_PARAMETER_MAY_PROMPT_USER, - QUERY_PARAMETER_TRUE); - } - final Uri queryUri = builder.build(); - final boolean isProtocolV2 = (QUERY_PARAMETER_PROTOCOL_VALUE.equals( - queryUri.getQueryParameter(QUERY_PARAMETER_PROTOCOL))); - - cursor = client.query(queryUri, DICTIONARY_PROJECTION, null, null, null); - if (isProtocolV2 && null == cursor) { - reinitializeClientRecordInDictionaryContentProvider(context, client, clientId); - cursor = client.query(queryUri, DICTIONARY_PROJECTION, null, null, null); - } - if (null == cursor) return Collections.emptyList(); - if (cursor.getCount() <= 0 || !cursor.moveToFirst()) { - return Collections.emptyList(); - } - final ArrayList list = new ArrayList<>(); - do { - final String wordListId = cursor.getString(0); - final String wordListLocale = cursor.getString(1); - final String wordListRawChecksum = cursor.getString(2); - if (TextUtils.isEmpty(wordListId)) continue; - list.add(new WordListInfo(wordListId, wordListLocale, wordListRawChecksum)); - } while (cursor.moveToNext()); - return list; - } catch (RemoteException e) { - // The documentation is unclear as to in which cases this may happen, but it probably - // happens when the content provider got suddenly killed because it crashed or because - // the user disabled it through Settings. - Log.e(TAG, "RemoteException: communication with the dictionary pack cut", e); - return Collections.emptyList(); - } catch (Exception e) { - // A crash here is dangerous because crashing here would brick any encrypted device - - // we need the keyboard to be up and working to enter the password, so we don't want - // to die no matter what. So let's be as safe as possible. - Log.e(TAG, "Unexpected exception communicating with the dictionary pack", e); - return Collections.emptyList(); - } finally { - if (null != cursor) { - cursor.close(); - } - client.release(); - } - } - - - /** - * Helper method to encapsulate exception handling. - */ - private static AssetFileDescriptor openAssetFileDescriptor( - final ContentProviderClient providerClient, final Uri uri) { - try { - return providerClient.openAssetFile(uri, "r"); - } catch (FileNotFoundException e) { - // I don't want to log the word list URI here for security concerns. The exception - // contains the name of the file, so let's not pass it to Log.e here. - Log.e(TAG, "Could not find a word list from the dictionary provider." - /* intentionally don't pass the exception (see comment above) */); - return null; - } catch (RemoteException e) { - Log.e(TAG, "Can't communicate with the dictionary pack", e); - return null; - } - } - - public static boolean reportBrokenFileToDictionaryProvider( - final ContentProviderClient providerClient, final String clientId, - final String wordlistId) { - try { - final Uri.Builder wordListUriBuilder = getContentUriBuilderForType(clientId, - providerClient, QUERY_PATH_DATAFILE, wordlistId /* extraPath */); - wordListUriBuilder.appendQueryParameter(QUERY_PARAMETER_DELETE_RESULT, - QUERY_PARAMETER_FAILURE); - if (0 >= providerClient.delete(wordListUriBuilder.build(), null, null)) { - Log.e(TAG, "Unable to delete a word list."); - } - } catch (RemoteException e) { - Log.e(TAG, "Communication with the dictionary provider was cut", e); - return false; - } - return true; - } - - // Ideally the two following methods should be merged, but AssetFileDescriptor does not - // implement Closeable although it does implement #close(), and Java does not have - // structural typing. - private static void closeAssetFileDescriptorAndReportAnyException( - final AssetFileDescriptor file) { - try { - if (null != file) file.close(); - } catch (Exception e) { - Log.e(TAG, "Exception while closing a file", e); - } - } - - private static void closeCloseableAndReportAnyException(final Closeable file) { - try { - if (null != file) file.close(); - } catch (Exception e) { - Log.e(TAG, "Exception while closing a file", e); - } - } - - /** - * Copies the data in an input stream to a target file if the magic number matches. - * - * If the magic number does not match the expected value, this method throws an - * IOException. Other usual conditions for IOException or FileNotFoundException - * also apply. - * - * @param input the stream to be copied. - * @param output an output stream to copy the data to. - */ - public static void checkMagicAndCopyFileTo(final BufferedInputStream input, - final BufferedOutputStream output) throws IOException { - // Check the magic number - final int length = MAGIC_NUMBER_VERSION_2.length; - final byte[] magicNumberBuffer = new byte[length]; - final int readMagicNumberSize = input.read(magicNumberBuffer, 0, length); - if (readMagicNumberSize < length) { - throw new IOException("Less bytes to read than the magic number length"); - } - if (SHOULD_VERIFY_MAGIC_NUMBER) { - if (!Arrays.equals(MAGIC_NUMBER_VERSION_2, magicNumberBuffer)) { - if (!Arrays.equals(MAGIC_NUMBER_VERSION_1, magicNumberBuffer)) { - throw new IOException("Wrong magic number for downloaded file"); - } - } - } - output.write(magicNumberBuffer); - - // Actually copy the file - final byte[] buffer = new byte[FILE_READ_BUFFER_SIZE]; - for (int readBytes = input.read(buffer); readBytes >= 0; readBytes = input.read(buffer)) { - output.write(buffer, 0, readBytes); - } - input.close(); - } - - private static void reinitializeClientRecordInDictionaryContentProvider(final Context context, - final ContentProviderClient client, final String clientId) throws RemoteException { - final String metadataFileUri = MetadataFileUriGetter.getMetadataUri(context); - Log.i(TAG, "reinitializeClientRecordInDictionaryContentProvider() : MetadataFileUri = " - + metadataFileUri); - final String metadataAdditionalId = MetadataFileUriGetter.getMetadataAdditionalId(context); - // Tell the content provider to reset all information about this client id - final Uri metadataContentUri = getProviderUriBuilder(clientId) - .appendPath(QUERY_PATH_METADATA) - .appendQueryParameter(QUERY_PARAMETER_PROTOCOL, QUERY_PARAMETER_PROTOCOL_VALUE) - .build(); - client.delete(metadataContentUri, null, null); - // Update the metadata URI - final ContentValues metadataValues = new ContentValues(); - metadataValues.put(INSERT_METADATA_CLIENT_ID_COLUMN, clientId); - metadataValues.put(INSERT_METADATA_METADATA_URI_COLUMN, metadataFileUri); - metadataValues.put(INSERT_METADATA_METADATA_ADDITIONAL_ID_COLUMN, metadataAdditionalId); - client.insert(metadataContentUri, metadataValues); - - // Update the dictionary list. - final Uri dictionaryContentUriBase = getProviderUriBuilder(clientId) - .appendPath(QUERY_PATH_DICT_INFO) - .appendQueryParameter(QUERY_PARAMETER_PROTOCOL, QUERY_PARAMETER_PROTOCOL_VALUE) - .build(); - final ArrayList dictionaryList = - DictionaryInfoUtils.getCurrentDictionaryFileNameAndVersionInfo(context); - final int length = dictionaryList.size(); - for (int i = 0; i < length; ++i) { - final DictionaryInfo info = dictionaryList.get(i); - Log.i(TAG, "reinitializeClientRecordInDictionaryContentProvider() : Insert " + info); - client.insert(Uri.withAppendedPath(dictionaryContentUriBase, info.mId), - info.toContentValues()); - } - - // Read from metadata file in resources to get the baseline dictionary info. - // This ensures we start with a sane list of available dictionaries. - final int metadataResourceId = context.getResources().getIdentifier("metadata", - "raw", DictionaryInfoUtils.RESOURCE_PACKAGE_NAME); - if (metadataResourceId == 0) { - Log.w(TAG, "Missing metadata.json resource"); - return; - } - InputStream inputStream = null; - try { - inputStream = context.getResources().openRawResource(metadataResourceId); - } catch (Exception e) { - Log.w(TAG, "Failed to read metadata.json from resources", e); - } finally { - if (inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - Log.w(TAG, "Failed to close metadata.json", e); - } - } - } - } - - /** - * Initialize a client record with the dictionary content provider. - * - * This merely acquires the content provider and calls - * #reinitializeClientRecordInDictionaryContentProvider. - * - * @param context the context for resources and providers. - * @param clientId the client ID to use. - */ - public static void initializeClientRecordHelper(final Context context, final String clientId) { - try { - final ContentProviderClient client = context.getContentResolver(). - acquireContentProviderClient(getProviderUriBuilder("").build()); - if (null == client) return; - reinitializeClientRecordInDictionaryContentProvider(context, client, clientId); - } catch (RemoteException e) { - Log.e(TAG, "Cannot contact the dictionary content provider", e); - } - } -} diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/DictionaryFactory.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/DictionaryFactory.java index 334bac454..d9ca4048f 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/DictionaryFactory.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/DictionaryFactory.java @@ -16,10 +16,12 @@ package org.dslul.openboard.inputmethod.latin; -import android.content.ContentProviderClient; import android.content.Context; import android.content.res.AssetFileDescriptor; +import android.os.Handler; +import android.os.Looper; import android.util.Log; +import android.widget.Toast; import org.dslul.openboard.inputmethod.latin.utils.DictionaryInfoUtils; @@ -92,38 +94,14 @@ public final class DictionaryFactory { public static void killDictionary(final Context context, final AssetFileAddress f) { if (f.pointsToPhysicalFile()) { f.deleteUnderlyingFile(); - // Warn the dictionary provider if the dictionary came from there. - final ContentProviderClient providerClient; - try { - providerClient = context.getContentResolver().acquireContentProviderClient( - BinaryDictionaryFileDumper.getProviderUriBuilder("").build()); - } catch (final SecurityException e) { - Log.e(TAG, "No permission to communicate with the dictionary provider", e); - return; - } - if (null == providerClient) { - Log.e(TAG, "Can't establish communication with the dictionary provider"); - return; - } - final String wordlistId = - DictionaryInfoUtils.getWordListIdFromFileName(new File(f.mFilename).getName()); - // TODO: this is a reasonable last resort, but it is suboptimal. - // The following will remove the entry for this dictionary with the dictionary - // provider. When the metadata is downloaded again, we will try downloading it - // again. - // However, in the practice that will mean the user will find themselves without - // the new dictionary. That's fine for languages where it's included in the APK, - // but for other languages it will leave the user without a dictionary at all until - // the next update, which may be a few days away. - // Ideally, we would trigger a new download right away, and use increasing retry - // delays for this particular id/version combination. - // Then again, this is expected to only ever happen in case of human mistake. If - // the wrong file is on the server, the following is still doing the right thing. - // If it's a file left over from the last version however, it's not great. - BinaryDictionaryFileDumper.reportBrokenFileToDictionaryProvider( - providerClient, - context.getString(R.string.dictionary_pack_client_id), - wordlistId); + // notify the user + // todo: use an alertDialog to avoid the toast not showing up on Android 13+ + // but asyncTask doesn't work because android.view.WindowManager$BadTokenException: Unable to add window -- token null is not valid; is your activity running? + // https://stackoverflow.com/questions/7199014/show-an-alertdialog-from-a-background-thread-with-the-appcontext + final String wordlistId = DictionaryInfoUtils.getWordListIdFromFileName(new File(f.mFilename).getName()); + new Handler(Looper.getMainLooper()).post(() -> + Toast.makeText(context, "dictionary "+wordlistId+" is invalid, deleting", Toast.LENGTH_LONG).show() + ); } } diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/DictionaryPackInstallBroadcastReceiver.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/DictionaryPackInstallBroadcastReceiver.java index 8f353fc51..2041ceb25 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/DictionaryPackInstallBroadcastReceiver.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/DictionaryPackInstallBroadcastReceiver.java @@ -95,7 +95,6 @@ public final class DictionaryPackInstallBroadcastReceiver extends BroadcastRecei } // If we come here none of the authorities matched the one we searched for. // We can exit safely. - return; } else if (action.equals(Intent.ACTION_PACKAGE_REMOVED) && !intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) { if (null == mService) { @@ -120,22 +119,6 @@ public final class DictionaryPackInstallBroadcastReceiver extends BroadcastRecei return; } mService.resetSuggestMainDict(); - } else if (action.equals(DictionaryPackConstants.UNKNOWN_DICTIONARY_PROVIDER_CLIENT)) { - if (null != mService) { - // Careful! This is returning if the service is NOT null. This is because we - // should come here instantiated by the framework in reaction to a broadcast of - // the above action, so we should gave gone through the no-args constructor. - Log.e(TAG, "Called with intent " + action + " but we have a reference to the " - + "service: this should never happen"); - return; - } - // The dictionary provider does not know about some client. We check that it's really - // us that it needs to know about, and if it's the case, we register with the provider. - final String wantedClientId = - intent.getStringExtra(DictionaryPackConstants.DICTIONARY_PROVIDER_CLIENT_EXTRA); - final String myClientId = context.getString(R.string.dictionary_pack_client_id); - if (!wantedClientId.equals(myClientId)) return; // Not for us - BinaryDictionaryFileDumper.initializeClientRecordHelper(context, myClientId); } } } diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/ExecutorUtils.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/ExecutorUtils.java index 352418d69..55b535a61 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/ExecutorUtils.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/ExecutorUtils.java @@ -20,7 +20,6 @@ import android.util.Log; import org.dslul.openboard.inputmethod.annotations.UsedForTesting; -import java.lang.Thread.UncaughtExceptionHandler; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; @@ -53,12 +52,8 @@ public class ExecutorUtils { @Override public Thread newThread(final Runnable runnable) { Thread thread = new Thread(runnable, TAG); - thread.setUncaughtExceptionHandler(new UncaughtExceptionHandler() { - @Override - public void uncaughtException(Thread thread, Throwable ex) { - Log.w(mName + "-" + runnable.getClass().getSimpleName(), ex); - } - }); + thread.setUncaughtExceptionHandler((thread1, ex) -> + Log.w(mName + "-" + runnable.getClass().getSimpleName(), ex)); return thread; } }