Move Glide-SSO integration into a separate module

14 files changed, 68 insertions, 9 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 4e8c1d4e..d6857e49 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -65,6 +65,7 @@ dependencies {
     // Glide
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+    implementation project(path: ':glide-sso-integration')
 
     // Android X
     implementation "androidx.appcompat:appcompat:1.1.0"
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherViewHolder.java
index eb27dd39..1196d878 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherViewHolder.java
@@ -10,9 +10,9 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 
+import it.niedermann.android.glidesso.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.databinding.ItemAccountChooseBinding;
-import it.niedermann.owncloud.notes.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.model.LocalAccount;
 
 public class AccountSwitcherViewHolder extends RecyclerView.ViewHolder {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/AccountChooserAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/AccountChooserAdapter.java
index 0b4cdea7..800660b5 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/AccountChooserAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/AccountChooserAdapter.java
@@ -13,9 +13,9 @@ import com.bumptech.glide.request.RequestOptions;
 
 import java.util.List;
 
+import it.niedermann.android.glidesso.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.databinding.ItemAccountChooseBinding;
-import it.niedermann.owncloud.notes.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.model.LocalAccount;
 
 import static it.niedermann.owncloud.notes.android.fragment.AccountChooserAdapter.AccountChooserViewHolder;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountViewHolder.java
index 9016cd95..39ae6891 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountViewHolder.java
@@ -12,9 +12,9 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 
+import it.niedermann.android.glidesso.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.databinding.ItemAccountChooseBinding;
-import it.niedermann.owncloud.notes.glide.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.model.LocalAccount;
 
 import static android.view.View.GONE;
diff --git a/glide-sso-integration/.gitignore b/glide-sso-integration/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/glide-sso-integration/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/glide-sso-integration/build.gradle b/glide-sso-integration/build.gradle
new file mode 100644
index 00000000..1f8cddf5
--- /dev/null
+++ b/glide-sso-integration/build.gradle
@@ -0,0 +1,34 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    // Nextcloud SSO
+    implementation "com.github.nextcloud:Android-SingleSignOn:0.5.1"
+
+    // Glide
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+}
\ No newline at end of file
diff --git a/glide-sso-integration/consumer-rules.pro b/glide-sso-integration/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/glide-sso-integration/consumer-rules.pro
diff --git a/glide-sso-integration/proguard-rules.pro b/glide-sso-integration/proguard-rules.pro
new file mode 100644
index 00000000..481bb434
--- /dev/null
+++ b/glide-sso-integration/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/glide-sso-integration/src/main/AndroidManifest.xml b/glide-sso-integration/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..2c83d574
--- /dev/null
+++ b/glide-sso-integration/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="it.niedermann.android.glidesso" />
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/glide/SingleSignOnLibraryGlideModule.java b/glide-sso-integration/src/main/java/it/niedermann/android/glidesso/SingleSignOnLibraryGlideModule.java
index 61730dd9..6669d5da 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/glide/SingleSignOnLibraryGlideModule.java
+++ b/glide-sso-integration/src/main/java/it/niedermann/android/glidesso/SingleSignOnLibraryGlideModule.java
@@ -1,4 +1,4 @@
-package it.niedermann.owncloud.notes.glide;
+package it.niedermann.android.glidesso;
 
 import android.content.Context;
 import android.util.Log;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/glide/SingleSignOnStreamFetcher.java b/glide-sso-integration/src/main/java/it/niedermann/android/glidesso/SingleSignOnStreamFetcher.java
index 9daf3aec..10f70889 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/glide/SingleSignOnStreamFetcher.java
+++ b/glide-sso-integration/src/main/java/it/niedermann/android/glidesso/SingleSignOnStreamFetcher.java
@@ -1,4 +1,4 @@
-package it.niedermann.owncloud.notes.glide;
+package it.niedermann.android.glidesso;
 
 import android.content.Context;
 import android.util.Log;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/glide/SingleSignOnUrl.java b/glide-sso-integration/src/main/java/it/niedermann/android/glidesso/SingleSignOnUrl.java
index f1ad12fe..b8f35975 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/glide/SingleSignOnUrl.java
+++ b/glide-sso-integration/src/main/java/it/niedermann/android/glidesso/SingleSignOnUrl.java
@@ -1,4 +1,4 @@
-package it.niedermann.owncloud.notes.glide;
+package it.niedermann.android.glidesso;
 
 import android.content.Context;
 
@@ -14,7 +14,7 @@ import com.nextcloud.android.sso.model.SingleSignOnAccount;
 import java.net.URL;
 import java.util.Map;
 
-import static it.niedermann.owncloud.notes.glide.SingleSignOnStreamFetcher.X_HEADER_SSO_ACCOUNT_NAME;
+import static it.niedermann.android.glidesso.SingleSignOnStreamFetcher.X_HEADER_SSO_ACCOUNT_NAME;
 
 /**
  * Use this as kind of {@link GlideUrl} if you want to do a {@link Glide} request from a {@link SingleSignOnAccount} which is not set by {@link SingleAccountHelper#setCurrentAccount(Context, String)}.
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/glide/SingleSignOnUrlLoader.java b/glide-sso-integration/src/main/java/it/niedermann/android/glidesso/SingleSignOnUrlLoader.java
index 864918a9..10f990b3 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/glide/SingleSignOnUrlLoader.java
+++ b/glide-sso-integration/src/main/java/it/niedermann/android/glidesso/SingleSignOnUrlLoader.java
@@ -1,4 +1,4 @@
-package it.niedermann.owncloud.notes.glide;
+package it.niedermann.android.glidesso;
 
 import android.content.Context;
 
diff --git a/settings.gradle b/settings.gradle
index 9d495b34..7bbc674c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
-include ':app'
\ No newline at end of file
+include ':app'
+include ':glide-sso-integration'