update nextcloud SSO

Author: zorgluf

app/build.gradle

@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.0'
+        classpath 'com.android.tools.build:gradle:8.5.2'
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
     }
 }
@@ -37,6 +37,7 @@ android {
     compileOptions {
         targetCompatibility 1.8
         sourceCompatibility 1.8
+        coreLibraryDesugaringEnabled true
     }
     lint {
         abortOnError false
@@ -61,7 +62,7 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.16.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
 
-    implementation "com.github.nextcloud:Android-SingleSignOn:0.6.1"
+    implementation "com.github.nextcloud:Android-SingleSignOn:1.3.2"
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
 
     def nav_version = '2.7.7'
@@ -72,10 +73,11 @@ dependencies {
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.preference:preference:1.2.1'
 
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.3'
 }
 
 buildscript {
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.0'
+        classpath 'com.android.tools.build:gradle:8.5.2'
     }
 }

app/src/main/java/fr/nuage/souvenirs/SettingsActivity.java

@@ -104,7 +104,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
 
             try {
                 AccountImporter.onActivityResult(requestCode, resultCode, data, this, account -> {
-                    SingleAccountHelper.setCurrentAccount(getActivity(), account.name);
+                    SingleAccountHelper.commitCurrentAccount(getActivity(), account.name);
                     SingleSignOnAccount ssoAccount = null;
                     try {
                         ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(getContext());

app/src/main/java/fr/nuage/souvenirs/model/nc/Utils.java

@@ -36,7 +36,7 @@ public static boolean downloadFile(String remotePath, String localFolderPath, St
             OutputStream outputStream = null;
             try {
                 byte[] fileReader = new byte[4096];
-                inputStream = APIProvider.getNextcloudApi().performNetworkRequest(nextcloudRequest);
+                inputStream = APIProvider.getNextcloudApi().performNetworkRequestV2(nextcloudRequest).getBody();
                 outputStream = new FileOutputStream(new File(localFolderPath,localFileName));
                 while (true) {
                     int read = inputStream.read(fileReader);
@@ -72,7 +72,7 @@ public static boolean uploadFile(String remoteFile, String localPath) {
                     .setUrl(Uri.encode("/remote.php/webdav/"+remoteFile,"/"))
                     .setRequestBodyAsStream(inputStream)
                     .build();
-            APIProvider.getNextcloudApi().performNetworkRequest(nextcloudRequest);
+            APIProvider.getNextcloudApi().performNetworkRequestV2(nextcloudRequest);
             return true;
         } catch (Exception e) {
             Log.w("Download file",e);

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.0'
+        classpath 'com.android.tools.build:gradle:8.5.2'
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
 
         // NOTE: Do not place your application dependencies here; they belong