Fix #666 Glide does not use SSO network stack

Use new nextcloud-commons library for SSO Glide integration Signed-off-by: stefan-niedermann <info@niedermann.it>
nextcloud · Feb 12, 2020 · 58eaaa8 · 58eaaa8
1 parent 9560552
commit 58eaaa8
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 201 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -33,7 +33,8 @@ android {
 }
 
 dependencies {
-    implementation "com.github.nextcloud:Android-SingleSignOn:0.5.0-rc1"
+    implementation "com.github.nextcloud:Android-SingleSignOn:0.5.0-rc2"
+    implementation 'com.github.stefan-niedermann:nextcloud-commons:6250e5fe73'
 
     implementation 'com.yydcdut:markdown-processor:0.1.3'
     implementation 'com.yydcdut:rxmarkdown-wrapper:0.1.3'

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/CustomAppGlideModule.java b/app/src/main/java/it/niedermann/owncloud/notes/util/CustomAppGlideModule.java
@@ -0,0 +1,18 @@
+package it.niedermann.owncloud.notes.util;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.Registry;
+import com.bumptech.glide.annotation.GlideModule;
+import com.bumptech.glide.module.AppGlideModule;
+
+@GlideModule
+public class CustomAppGlideModule extends AppGlideModule {
+  @Override
+  public void registerComponents(@NonNull Context context, @NonNull Glide glide, @NonNull Registry registry) {
+    super.registerComponents(context, glide, registry);
+  }
+}
diff --git a/...src/main/java/it/niedermann/owncloud/notes/util/glide/SingleSignOnLibraryGlideModule.java b/...src/main/java/it/niedermann/owncloud/notes/util/glide/SingleSignOnLibraryGlideModule.java
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/glide/SingleSignOnStreamFetcher.java b/app/src/main/java/it/niedermann/owncloud/notes/util/glide/SingleSignOnStreamFetcher.java
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/glide/SingleSignOnUrlLoader.java b/app/src/main/java/it/niedermann/owncloud/notes/util/glide/SingleSignOnUrlLoader.java
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1 @@
-include ':app'
-include ':cert4android'
+include ':app'