diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a95a0ad..a25b871 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -40,7 +40,6 @@ android { versionName = "1.0.6" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - setProperty("archivesBaseName", "${getAppNameFromStringsFile()}-$versionName($versionCode)-${timestamp}") } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index ba09a0d..a82bd3c 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -32,13 +32,6 @@ -dontwarn com.yalantis.ucrop** -keep class com.yalantis.ucrop** { *; } -keep interface com.yalantis.ucrop** { *; } -# 禁用 JPXDecode(JPEG2000),避免调用 JP2Decoder --assumenosideeffects class com.tom_roush.pdfbox.filter.JPXFilter { - *; -} -# 防止缺少 gemalto 的 JP2Decoder 报错 --dontwarn com.gemalto.jp2.** --dontwarn com.tom_roush.pdfbox.filter.JPXFilter # 保留所有 Parcelable 类 -keep class * implements android.os.Parcelable { *; } @@ -47,3 +40,14 @@ public static final android.os.Parcelable$Creator *; } +# ===== PDFBox 全保留 ===== +-keep class com.tom_roush.pdfbox.** { *; } + +# 防止缺少 gemalto 的 JP2Decoder 报错 +-dontwarn com.tom_roush.pdfbox.filter.JPXFilter +-dontwarn com.gemalto.jp2.** + +# ===== 属性 ===== +-keepattributes *Annotation* +-keepattributes Signature +-keepattributes InnerClasses diff --git a/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PdfToImageActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PdfToImageActivity.kt index f36f864..d48c0a5 100644 --- a/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PdfToImageActivity.kt +++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PdfToImageActivity.kt @@ -166,13 +166,6 @@ class PdfToImageActivity : BaseActivity() { inputFile = file, password = password, onError = { e -> - runOnUiThread { - ToastUtils.show( - this@PdfToImageActivity, - getString(R.string.file_not_pdf_or_corrupted) - ) - finish() - } } ).collect { pageItem -> diff --git a/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/SplitPdfActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/SplitPdfActivity.kt index 518a523..ac8a627 100644 --- a/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/SplitPdfActivity.kt +++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/SplitPdfActivity.kt @@ -201,13 +201,6 @@ class SplitPdfActivity : BaseActivity() { inputFile = file, password = password, onError = { e -> - runOnUiThread { - ToastUtils.show( - this@SplitPdfActivity, - getString(R.string.file_not_pdf_or_corrupted) - ) - finish() - } } ).collect { pageItem -> logDebug("splitPdfToPageItemsFlow pageItem->$pageItem")