diff --git a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt index 14b92f5edb..011c2b05cf 100644 --- a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt +++ b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt @@ -191,8 +191,7 @@ class LawnchairLauncher : QuickstepLauncher(), LifecycleOwner, lifecycleScope.launch { try { RootHelperManager.INSTANCE.get(this@LawnchairLauncher).getService() - } catch (e: RootNotAvailableException) { - // do nothing + } catch (_: RootNotAvailableException) { } } } @@ -418,10 +417,8 @@ class LawnchairLauncher : QuickstepLauncher(), LifecycleOwner, val Context.launcher: LawnchairLauncher get() = BaseActivity.fromContext(this) -val Context.launcherNullable: LawnchairLauncher? get() { - return try { - launcher - } catch (e: IllegalArgumentException) { - null - } +val Context.launcherNullable: LawnchairLauncher? get() = try { + launcher +} catch (_: IllegalArgumentException) { + null } diff --git a/lawnchair/src/app/lawnchair/LawnchairLayoutFactory.kt b/lawnchair/src/app/lawnchair/LawnchairLayoutFactory.kt index 8c38f6277d..8b49e396b0 100644 --- a/lawnchair/src/app/lawnchair/LawnchairLayoutFactory.kt +++ b/lawnchair/src/app/lawnchair/LawnchairLayoutFactory.kt @@ -28,11 +28,7 @@ class LawnchairLayoutFactory(context: Context) : LayoutInflater.Factory2 { ): View? { val view = constructorMap[name]?.let { it(context, attrs) } if (view is TextView) { - try { - fontManager.overrideFont(view, attrs) - } catch (_: Exception) { - - } + runCatching { fontManager.overrideFont(view, attrs) } } return view } diff --git a/lawnchair/src/app/lawnchair/NotificationManager.kt b/lawnchair/src/app/lawnchair/NotificationManager.kt index 4708092c3f..b84aa78e26 100644 --- a/lawnchair/src/app/lawnchair/NotificationManager.kt +++ b/lawnchair/src/app/lawnchair/NotificationManager.kt @@ -71,8 +71,7 @@ fun Context.getAppName(name: String): CharSequence { try { return packageManager.getApplicationLabel( packageManager.getApplicationInfo(name, PackageManager.GET_META_DATA)) - } catch (ignored: PackageManager.NameNotFoundException) { + } catch (_: PackageManager.NameNotFoundException) { } - return name } diff --git a/lawnchair/src/app/lawnchair/allapps/SearchResultIcon.kt b/lawnchair/src/app/lawnchair/allapps/SearchResultIcon.kt index 099a01d214..9d95b9126e 100644 --- a/lawnchair/src/app/lawnchair/allapps/SearchResultIcon.kt +++ b/lawnchair/src/app/lawnchair/allapps/SearchResultIcon.kt @@ -216,8 +216,7 @@ class SearchResultIcon(context: Context, attrs: AttributeSet?) : BubbleTextView( val bitmap = li.createIconBitmap(activityIcon, 1f, iconSize) val bitmapInfo = BitmapInfo.of(bitmap, packageIcon.color) info.bitmap = li.badgeBitmap(info.bitmap.icon, bitmapInfo) - } catch (ignore: PackageManager.NameNotFoundException) { - + } catch (_: PackageManager.NameNotFoundException) { } } else if (info.hasFlags(FLAG_BADGE_WITH_PACKAGE) && info.bitmap != packageIcon) { info.bitmap = li.badgeBitmap(info.bitmap.icon, packageIcon) diff --git a/lawnchair/src/app/lawnchair/backup/ui/CreateBackupScreen.kt b/lawnchair/src/app/lawnchair/backup/ui/CreateBackupScreen.kt index fe110d7854..05694487be 100644 --- a/lawnchair/src/app/lawnchair/backup/ui/CreateBackupScreen.kt +++ b/lawnchair/src/app/lawnchair/backup/ui/CreateBackupScreen.kt @@ -83,9 +83,7 @@ fun CreateBackupScreen(viewModel: CreateBackupViewModel) { } catch (t: Throwable) { Log.e("CreateBackupScreen", "failed to create backup", t) Toast.makeText(context, R.string.backup_create_error, Toast.LENGTH_SHORT).show() - try { - DocumentsContract.deleteDocument(context.contentResolver, uri) - } catch (ignore: Throwable) {} + runCatching { DocumentsContract.deleteDocument(context.contentResolver, uri) } } creatingBackup = false } diff --git a/lawnchair/src/app/lawnchair/font/FontCache.kt b/lawnchair/src/app/lawnchair/font/FontCache.kt index f45f6b4ea7..38c1672fde 100644 --- a/lawnchair/src/app/lawnchair/font/FontCache.kt +++ b/lawnchair/src/app/lawnchair/font/FontCache.kt @@ -238,13 +238,8 @@ class FontCache private constructor(private val context: Context) { companion object { - fun createTypeface(file: File): Typeface? { - return try { - Typeface.createFromFile(file) - } catch (e: Exception) { - null - } - } + fun createTypeface(file: File): Typeface? = + runCatching { Typeface.createFromFile(file) }.getOrNull() fun getFontsDir(context: Context): File { return File(context.filesDir, "customFonts").apply { mkdirs() } diff --git a/lawnchair/src/app/lawnchair/font/FontManager.kt b/lawnchair/src/app/lawnchair/font/FontManager.kt index 9aa6e39aaa..79b73fd6e7 100644 --- a/lawnchair/src/app/lawnchair/font/FontManager.kt +++ b/lawnchair/src/app/lawnchair/font/FontManager.kt @@ -58,8 +58,7 @@ class FontManager private constructor(private val context: Context) { if (fontType != -1) { setCustomFont(textView, fontType, fontWeight) } - } catch (e: Exception) { - // ignore + } catch (_: Exception) { } } diff --git a/lawnchair/src/app/lawnchair/gestures/DirectionalGestureListener.kt b/lawnchair/src/app/lawnchair/gestures/DirectionalGestureListener.kt index 1ae10abda1..cfd3e15605 100644 --- a/lawnchair/src/app/lawnchair/gestures/DirectionalGestureListener.kt +++ b/lawnchair/src/app/lawnchair/gestures/DirectionalGestureListener.kt @@ -45,8 +45,8 @@ open class DirectionalGestureListener(ctx: Context?) : OnTouchListener { } else -> false } - } catch (exception: Exception) { - exception.printStackTrace() + } catch (e: Exception) { + e.printStackTrace() false } } @@ -60,4 +60,4 @@ open class DirectionalGestureListener(ctx: Context?) : OnTouchListener { init { mGestureDetector = GestureDetector(ctx, GestureListener()) } -} \ No newline at end of file +} diff --git a/lawnchair/src/app/lawnchair/icons/CustomIconPack.kt b/lawnchair/src/app/lawnchair/icons/CustomIconPack.kt index f21194dc1b..882b218db1 100644 --- a/lawnchair/src/app/lawnchair/icons/CustomIconPack.kt +++ b/lawnchair/src/app/lawnchair/icons/CustomIconPack.kt @@ -53,7 +53,7 @@ class CustomIconPack(context: Context, packPackageName: String) : packResources.getDrawableForDensity(id, iconDpi, null), true ) - } catch (e: Resources.NotFoundException) { + } catch (_: Resources.NotFoundException) { null } } diff --git a/lawnchair/src/app/lawnchair/icons/IconPackProvider.kt b/lawnchair/src/app/lawnchair/icons/IconPackProvider.kt index 8fb876d340..7c379a3501 100644 --- a/lawnchair/src/app/lawnchair/icons/IconPackProvider.kt +++ b/lawnchair/src/app/lawnchair/icons/IconPackProvider.kt @@ -26,7 +26,7 @@ class IconPackProvider(private val context: Context) { return iconPacks.getOrPut(packageName) { try { CustomIconPack(context, packageName) - } catch (e: PackageManager.NameNotFoundException) { + } catch (_: PackageManager.NameNotFoundException) { null } } diff --git a/lawnchair/src/app/lawnchair/icons/shape/IconShape.kt b/lawnchair/src/app/lawnchair/icons/shape/IconShape.kt index 21a6298174..00e7e4653b 100644 --- a/lawnchair/src/app/lawnchair/icons/shape/IconShape.kt +++ b/lawnchair/src/app/lawnchair/icons/shape/IconShape.kt @@ -366,12 +366,7 @@ open class IconShape(val topLeft: Corner, "diamond" -> Diamond "egg" -> Egg "" -> null - else -> try { - parseCustomShape(value) - } catch (ex: Exception) { - Log.e("IconShape", "Error creating shape $value", ex) - null - } + else -> runCatching { parseCustomShape(value) }.getOrNull() } } @@ -391,8 +386,8 @@ open class IconShape(val topLeft: Corner, return try { parseCustomShape(iconShape.toString()) true - } catch (ex: Exception) { - Log.e("IconShape", "Error creating shape $iconShape", ex) + } catch (e: Exception) { + Log.e("IconShape", "Error creating shape $iconShape", e) false } } diff --git a/lawnchair/src/app/lawnchair/preferences/BasePreferenceManager.kt b/lawnchair/src/app/lawnchair/preferences/BasePreferenceManager.kt index 734fa77c4d..be0c077a17 100644 --- a/lawnchair/src/app/lawnchair/preferences/BasePreferenceManager.kt +++ b/lawnchair/src/app/lawnchair/preferences/BasePreferenceManager.kt @@ -202,7 +202,7 @@ abstract class BasePreferenceManager(private val context: Context) : SharedPrefe if (!loaded) { currentValue = try { sp.getInt(key, defaultValueInternal) - } catch (e: ClassCastException) { + } catch (_: ClassCastException) { sp.getFloat(key, defaultValueInternal.toFloat()).toInt() } loaded = true @@ -310,14 +310,9 @@ abstract class BasePreferenceManager(private val context: Context) : SharedPrefe primaryListener: ChangeListener? = null ) : StringBasedPref(key, defaultValue, primaryListener) { - override fun parse(stringValue: String): FontCache.Font { - try { - return FontCache.Font.fromJsonString(context, stringValue) - } catch (e: Exception) { - Log.e("FontPref", "Failed to load font $stringValue", e) - } - return defaultValue - } + override fun parse(stringValue: String): FontCache.Font = runCatching { + FontCache.Font.fromJsonString(context, stringValue) + }.getOrDefault(defaultValue) override fun stringify(value: FontCache.Font) = value.toJsonString() } diff --git a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt index 363c4a2b7c..a76c7c8d16 100644 --- a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt +++ b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt @@ -421,12 +421,7 @@ class PreferenceManager2(private val context: Context) : PreferenceManager { key = key, defaultValue = defaultValue, parse = { value -> - try { - return@preference Json.decodeFromString(value) - } catch (e: Throwable) { - Log.d("PreferenceManager2", "failed to parse preference $key=$value") - return@preference defaultValue - } + runCatching { Json.decodeFromString(value) }.getOrDefault(defaultValue) }, save = Json::encodeToString, ) diff --git a/lawnchair/src/app/lawnchair/qsb/providers/QsbSearchProvider.kt b/lawnchair/src/app/lawnchair/qsb/providers/QsbSearchProvider.kt index 73e2a52c7f..e36054a979 100644 --- a/lawnchair/src/app/lawnchair/qsb/providers/QsbSearchProvider.kt +++ b/lawnchair/src/app/lawnchair/qsb/providers/QsbSearchProvider.kt @@ -92,7 +92,7 @@ open class QsbSearchProvider( Uri.parse("market://details?id=$packageName") ) ) - } catch (e: ActivityNotFoundException) { + } catch (_: ActivityNotFoundException) { try { context.startActivity( Intent( @@ -100,7 +100,7 @@ open class QsbSearchProvider( Uri.parse("https://play.google.com/store/apps/details?id=$packageName") ) ) - } catch (e: Exception) { + } catch (_: Exception) { Toast.makeText( context, context.getString(R.string.error_no_market_or_browser_installed), diff --git a/lawnchair/src/app/lawnchair/smartspace/BcSmartSpaceUtil.kt b/lawnchair/src/app/lawnchair/smartspace/BcSmartSpaceUtil.kt index 82435887d5..d96a77aaa7 100644 --- a/lawnchair/src/app/lawnchair/smartspace/BcSmartSpaceUtil.kt +++ b/lawnchair/src/app/lawnchair/smartspace/BcSmartSpaceUtil.kt @@ -33,7 +33,7 @@ object BcSmartSpaceUtil { return } view.setOnClickListener { - try { + runCatching { if (action.intent != null) { view.context.startActivity(action.intent) } else if (action.pendingIntent != null) { @@ -42,8 +42,6 @@ object BcSmartSpaceUtil { action.onClick.run() } onClickListener?.onClick(view) - } catch (t: Throwable) { - Log.d("BcSmartspaceUtil", "onClick error", t) } } } diff --git a/lawnchair/src/app/lawnchair/smartspace/provider/BatteryStatusProvider.kt b/lawnchair/src/app/lawnchair/smartspace/provider/BatteryStatusProvider.kt index 98d1416a19..24d8e07046 100644 --- a/lawnchair/src/app/lawnchair/smartspace/provider/BatteryStatusProvider.kt +++ b/lawnchair/src/app/lawnchair/smartspace/provider/BatteryStatusProvider.kt @@ -62,10 +62,6 @@ class BatteryStatusProvider(context: Context) : SmartspaceDataSource( private fun computeChargeTimeRemaining(): Long { if (!Utilities.ATLEAST_P) return -1 - return try { - batteryManager?.computeChargeTimeRemaining() ?: -1 - } catch (t: Throwable) { - -1 - } + return runCatching { batteryManager?.computeChargeTimeRemaining() ?: -1 }.getOrDefault(-1) } } diff --git a/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceWidgetReader.kt b/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceWidgetReader.kt index 640b523925..3d876f8fc7 100644 --- a/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceWidgetReader.kt +++ b/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceWidgetReader.kt @@ -165,9 +165,9 @@ class SmartspaceWidgetReader(context: Context) : SmartspaceDataSource( temperature.contains("K") -> Temperature.Unit.Kelvin else -> throw IllegalArgumentException("only supports C, F and K") }), pendingIntent = intent) - } catch (e: NumberFormatException) { + } catch (_: NumberFormatException) { null - } catch (e: IllegalArgumentException) { + } catch (_: IllegalArgumentException) { null } } else { diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorOption.kt b/lawnchair/src/app/lawnchair/theme/color/ColorOption.kt index de54d3c734..faa00ce589 100644 --- a/lawnchair/src/app/lawnchair/theme/color/ColorOption.kt +++ b/lawnchair/src/app/lawnchair/theme/color/ColorOption.kt @@ -88,8 +88,7 @@ sealed class ColorOption { val color = Color.parseColor(stringValue.substring(7)) return CustomColor(color) } - } catch (e: IllegalArgumentException) { - // ignore + } catch (_: IllegalArgumentException) { } return when { Utilities.ATLEAST_S -> SystemAccent diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorConverter.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorConverter.kt index c23b49a1d1..43ec301993 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorConverter.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorConverter.kt @@ -1,21 +1,20 @@ package app.lawnchair.ui.preferences.components.colorpreference -import android.graphics.Color.colorToHSV import android.graphics.Color.HSVToColor +import android.graphics.Color.colorToHSV import android.graphics.Color.parseColor -fun intColorToHsvColorArray(color: Int) = +fun intColorToHsvColorArray(color: Int): FloatArray = FloatArray(size = 3).apply { colorToHSV(color, this) } fun hsvValuesToIntColor(hue: Float, saturation: Float, brightness: Float): Int = HSVToColor(floatArrayOf(hue, saturation, brightness)) -fun intColorToColorString(color: Int) = +fun intColorToColorString(color: Int): String = String.format("#%06X", 0xFFFFFF and color).removePrefix("#") -fun colorStringToIntColor(colorString: String): Int? = - try { - parseColor("#${colorString.removePrefix("#")}") - } catch (e: IllegalArgumentException) { - null - } +fun colorStringToIntColor(colorString: String): Int? = try { + parseColor("#${colorString.removePrefix("#")}") +} catch (_: IllegalArgumentException) { + null +} diff --git a/lawnchair/src/app/lawnchair/ui/theme/Color.kt b/lawnchair/src/app/lawnchair/ui/theme/Color.kt index 3294d680ee..e27c826ecb 100644 --- a/lawnchair/src/app/lawnchair/ui/theme/Color.kt +++ b/lawnchair/src/app/lawnchair/ui/theme/Color.kt @@ -51,8 +51,7 @@ fun Context.getSystemAccent(darkTheme: Boolean): Int { } try { return Color.parseColor(propertyValue) - } catch (e: IllegalArgumentException) { - // do nothing + } catch (_: IllegalArgumentException) { } } diff --git a/lawnchair/src/app/lawnchair/util/Compatibility.kt b/lawnchair/src/app/lawnchair/util/Compatibility.kt index 9895778c19..8810f9c3a5 100644 --- a/lawnchair/src/app/lawnchair/util/Compatibility.kt +++ b/lawnchair/src/app/lawnchair/util/Compatibility.kt @@ -31,7 +31,7 @@ fun getSystemProperty(property: String, defaultValue: String): String { if (!TextUtils.isEmpty(value)) { return value } - } catch (e: Exception) { + } catch (_: Exception) { Log.d(TAG, "Unable to read system properties") } return defaultValue diff --git a/lawnchair/src/app/lawnchair/util/DrawableUtils.kt b/lawnchair/src/app/lawnchair/util/DrawableUtils.kt index d312d6d531..586edcf90f 100644 --- a/lawnchair/src/app/lawnchair/util/DrawableUtils.kt +++ b/lawnchair/src/app/lawnchair/util/DrawableUtils.kt @@ -2,10 +2,8 @@ package app.lawnchair.util import android.graphics.drawable.GradientDrawable -fun GradientDrawable.getCornerRadiiCompat(): FloatArray? { - return try { - cornerRadii - } catch (e: NullPointerException) { - null - } +fun GradientDrawable.getCornerRadiiCompat(): FloatArray? = try { + cornerRadii +} catch (_: NullPointerException) { + null } diff --git a/lawnchair/src/app/lawnchair/util/PackageManagerExtensions.kt b/lawnchair/src/app/lawnchair/util/PackageManagerExtensions.kt index 4737b62194..be7c2d2410 100644 --- a/lawnchair/src/app/lawnchair/util/PackageManagerExtensions.kt +++ b/lawnchair/src/app/lawnchair/util/PackageManagerExtensions.kt @@ -3,28 +3,27 @@ package app.lawnchair.util import android.content.pm.PackageManager import com.android.launcher3.Utilities -fun PackageManager.isPackageInstalled(packageName: String) = +fun PackageManager.isPackageInstalled(packageName: String): Boolean = try { getPackageInfo(packageName, 0) true - } catch (e: PackageManager.NameNotFoundException) { + } catch (_: PackageManager.NameNotFoundException) { false } -fun PackageManager.getPackageVersionCode(packageName: String) = +fun PackageManager.getPackageVersionCode(packageName: String): Long = try { val info = getPackageInfo(packageName, 0) when { Utilities.ATLEAST_P -> info.longVersionCode else -> info.versionCode.toLong() } - } catch (e: PackageManager.NameNotFoundException) { + } catch (_: PackageManager.NameNotFoundException) { -1L } -fun PackageManager.isPackageInstalledAndEnabled(packageName: String) = - try { - getApplicationInfo(packageName, 0).enabled - } catch (e: PackageManager.NameNotFoundException) { - false - } +fun PackageManager.isPackageInstalledAndEnabled(packageName: String) = try { + getApplicationInfo(packageName, 0).enabled +} catch (_: PackageManager.NameNotFoundException) { + false +}