From 2afc382a386904b70bce3c0b81e6dee8d9963b93 Mon Sep 17 00:00:00 2001 From: Gray Zhang Date: Tue, 9 Sep 2025 09:24:10 +0800 Subject: [PATCH 1/2] fix: remove unused Condom library to fix build issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Removed unused CondomContext import from App.java - Commented out Condom library dependency due to JitPack connectivity issues - Library was imported but not actually used in the codebase This fixes build failures caused by JitPack being unreachable while maintaining full app functionality. The app already targets Android API level 36, which exceeds Google Play's requirement of API level 35 by August 31, 2025. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- app/build.gradle | 3 ++- app/src/main/java/me/ghui/v2er/general/App.java | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 92cc21fd..e0f3addf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -120,7 +120,8 @@ dependencies { implementation 'com.github.bumptech.glide:okhttp3-integration:4.16.0' implementation 'pub.devrel:easypermissions:3.0.0' implementation 'org.greenrobot:eventbus:3.3.1' - implementation 'com.github.oasisfeng:condom:2.5.0' + // Temporarily disabled due to JitPack issues + // implementation 'com.github.oasisfeng:condom:2.5.0' implementation 'org.slf4j:slf4j-nop:2.0.17' implementation 'androidx.core:core-splashscreen:1.0.1' } \ No newline at end of file diff --git a/app/src/main/java/me/ghui/v2er/general/App.java b/app/src/main/java/me/ghui/v2er/general/App.java index aa942e75..b7f15236 100644 --- a/app/src/main/java/me/ghui/v2er/general/App.java +++ b/app/src/main/java/me/ghui/v2er/general/App.java @@ -4,7 +4,6 @@ import androidx.annotation.Nullable; -import com.oasisfeng.condom.CondomContext; import com.orhanobut.logger.AndroidLogAdapter; import com.orhanobut.logger.FormatStrategy; import com.orhanobut.logger.Logger; From ab1cf2c404c0628625cd20586fc9f5a8c86b429c Mon Sep 17 00:00:00 2001 From: Gray Zhang Date: Tue, 9 Sep 2025 13:47:48 +0800 Subject: [PATCH 2/2] fix: resolve Glide 4.16.0 compatibility issues for image loading MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Updated MyAppGllideModule to use Registry directly instead of glide.getRegistry() - Added isManifestParsingEnabled() override returning false to prevent manifest parsing conflicts - These changes fix image loading failures introduced by Glide upgrade from 4.11.0 to 4.16.0 The Glide 4.16.0 version introduced breaking changes in how modules register components. This fix ensures proper OkHttp integration with the custom HTTP client configuration. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- .../main/java/me/ghui/v2er/general/MyAppGllideModule.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/me/ghui/v2er/general/MyAppGllideModule.java b/app/src/main/java/me/ghui/v2er/general/MyAppGllideModule.java index 78ba7066..371b8703 100644 --- a/app/src/main/java/me/ghui/v2er/general/MyAppGllideModule.java +++ b/app/src/main/java/me/ghui/v2er/general/MyAppGllideModule.java @@ -24,11 +24,16 @@ @GlideModule public class MyAppGllideModule extends AppGlideModule { + + @Override + public boolean isManifestParsingEnabled() { + return false; + } @Override public void registerComponents(Context context, Glide glide, Registry registry) { OkHttpUrlLoader.Factory factory = new OkHttpUrlLoader.Factory(APIService.httpClient()); - glide.getRegistry().replace(GlideUrl.class, InputStream.class, factory); + registry.replace(GlideUrl.class, InputStream.class, factory); } @Override