Skip to content

Commit 41070a1

Browse files
authored
Merge pull request #87 from v2er-app/bugfix/android-15-compliance
Fix build issues by removing unused Condom library
2 parents 9c63f3d + ab1cf2c commit 41070a1

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ dependencies {
120120
implementation 'com.github.bumptech.glide:okhttp3-integration:4.16.0'
121121
implementation 'pub.devrel:easypermissions:3.0.0'
122122
implementation 'org.greenrobot:eventbus:3.3.1'
123-
implementation 'com.github.oasisfeng:condom:2.5.0'
123+
// Temporarily disabled due to JitPack issues
124+
// implementation 'com.github.oasisfeng:condom:2.5.0'
124125
implementation 'org.slf4j:slf4j-nop:2.0.17'
125126
implementation 'androidx.core:core-splashscreen:1.0.1'
126127
}

app/src/main/java/me/ghui/v2er/general/App.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import androidx.annotation.Nullable;
66

7-
import com.oasisfeng.condom.CondomContext;
87
import com.orhanobut.logger.AndroidLogAdapter;
98
import com.orhanobut.logger.FormatStrategy;
109
import com.orhanobut.logger.Logger;

app/src/main/java/me/ghui/v2er/general/MyAppGllideModule.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,16 @@
2424

2525
@GlideModule
2626
public class MyAppGllideModule extends AppGlideModule {
27+
28+
@Override
29+
public boolean isManifestParsingEnabled() {
30+
return false;
31+
}
2732

2833
@Override
2934
public void registerComponents(Context context, Glide glide, Registry registry) {
3035
OkHttpUrlLoader.Factory factory = new OkHttpUrlLoader.Factory(APIService.httpClient());
31-
glide.getRegistry().replace(GlideUrl.class, InputStream.class, factory);
36+
registry.replace(GlideUrl.class, InputStream.class, factory);
3237
}
3338

3439
@Override

0 commit comments

Comments
 (0)