diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1ac68dc4..45252b37 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -231,6 +231,10 @@ + + + + = Build.VERSION_CODES.N_MR1) { ctx.getSystemService(ShortcutManager::class.java)?.let { sm -> - sm.pinnedShortcuts.mapNotNull { shortcutInfo -> - ShortcutInfo.Builder(ctx, shortcutInfo.id).apply { - shortcutInfo.intent?.let { - it.component?.let { component -> - setActivity(ComponentName(component.packageName, component.className)) + sm.pinnedShortcuts + .filterNot { it.isDeclaredInManifest } + .filterNot { Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && it.isImmutable } + .mapNotNull { shortcutInfo -> + ShortcutInfo.Builder(ctx, shortcutInfo.id).apply { + shortcutInfo.intent?.let { + it.component?.let { component -> + setActivity(ComponentName(component.packageName, component.className)) + } ?: run { + setActivity(ComponentName(ctx, ShortcutActivity::class.java)) + } + setIntent(it) } ?: run { setActivity(ComponentName(ctx, ShortcutActivity::class.java)) + setIntent(Intent(ctx, ShortcutActivity::class.java)) } - setIntent(it) - } ?: run { - setActivity(ComponentName(ctx, ShortcutActivity::class.java)) - setIntent(Intent(ctx, ShortcutActivity::class.java)) - } - (shortcutInfo.shortLabel ?: shortcutInfo.longLabel)?.let { - setShortLabel(it) - } - (shortcutInfo.longLabel ?: shortcutInfo.shortLabel)?.let { - setLongLabel(it) - } - }.build() - }.takeUnless { it.isEmpty() }?.let { toUpdate -> - sm.updateShortcuts(toUpdate) - } + (shortcutInfo.shortLabel ?: shortcutInfo.longLabel)?.let { + setShortLabel(it) + } + (shortcutInfo.longLabel ?: shortcutInfo.shortLabel)?.let { + setLongLabel(it) + } + }.build() + }.takeUnless { it.isEmpty() }?.let { toUpdate -> + sm.updateShortcuts(toUpdate) + } } } diff --git a/version.properties b/version.properties index 3644f7c1..97998922 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ -#Mon Jul 21 18:22:17 CST 2025 -BUILD_TIME=1753093337104 +#Wed Jul 23 14:44:12 CST 2025 +BUILD_TIME=1753253052464 COMPILE_SDK_VERSION=35 IMAGE_QUANT_CMAKE_VERSION=3.22.1 IMAGE_QUANT_NDK_VERSION=26.1.10909125 @@ -19,6 +19,6 @@ RAPID_OCR_OPENCV_MOBILE_LABEL_VERSION=13 RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3 TARGET_SDK_VERSION=35 TARGET_SDK_VERSION_INRT=29 -VERSION_BUILD=3336 +VERSION_BUILD=3337 VERSION_NAME=6.7.0 Alpha3 VSCODE_EXT_REQUIRED_VERSION=1.0.8