fix: remove legacy pre-sdk19 credentials basic function

Signed-off-by: Andy Scherzinger <[email protected]>
nextcloud · Nov 14, 2024 · 03355fb · 03355fb
1 parent 5641357
commit 03355fb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 37 deletions.
diff --git a/library/src/main/java/com/nextcloud/common/OkHttpCredentialsUtil.kt b/library/src/main/java/com/nextcloud/common/OkHttpCredentialsUtil.kt
diff --git a/library/src/main/java/com/owncloud/android/lib/common/OwnCloudAnonymousCredentials.java b/library/src/main/java/com/owncloud/android/lib/common/OwnCloudAnonymousCredentials.java
@@ -10,7 +10,9 @@
 
 import android.os.Parcel;
 
-import com.nextcloud.common.OkHttpCredentialsUtil;
+import java.nio.charset.StandardCharsets;
+
+import okhttp3.Credentials;
 
 public class OwnCloudAnonymousCredentials implements OwnCloudCredentials {
 
@@ -35,7 +37,7 @@ public boolean authTokenExpires() {
 
     @Override
     public String toOkHttpCredentials() {
-        return OkHttpCredentialsUtil.basic(getUsername(), getAuthToken());
+        return Credentials.basic(getUsername(), getAuthToken(), StandardCharsets.UTF_8);
     }
 
     @Override

diff --git a/library/src/main/java/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java b/library/src/main/java/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java
@@ -14,15 +14,16 @@
 
 import android.os.Parcel;
 
-import com.nextcloud.common.OkHttpCredentialsUtil;
-
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.auth.AuthPolicy;
 import org.apache.commons.httpclient.auth.AuthScope;
 
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
+import okhttp3.Credentials;
+
 public class OwnCloudBasicCredentials implements OwnCloudCredentials {
 
     private String username;
@@ -59,11 +60,9 @@ public boolean authTokenExpires() {
 
     @Override
     public String toOkHttpCredentials() {
-        return OkHttpCredentialsUtil.basic(username, authToken);
+        return Credentials.basic(username, authToken, StandardCharsets.UTF_8);
     }
 
-
-
     /*
      * Autogenerated Parcelable interface
      */

diff --git a/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClientFactory.java b/library/src/main/java/com/owncloud/android/lib/common/OwnCloudClientFactory.java
@@ -23,7 +23,6 @@
 import android.os.Bundle;
 
 import com.nextcloud.common.NextcloudClient;
-import com.nextcloud.common.OkHttpCredentialsUtil;
 import com.nextcloud.common.User;
 import com.owncloud.android.lib.common.accounts.AccountTypeUtils;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
@@ -32,8 +31,11 @@
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 
+import okhttp3.Credentials;
+
 public class OwnCloudClientFactory {
 
     final private static String TAG = OwnCloudClientFactory.class.getSimpleName();
@@ -223,7 +225,7 @@ public static NextcloudClient createNextcloudClient(Account account, Context app
 
         return createNextcloudClient(baseUri,
                                      userId,
-                                     OkHttpCredentialsUtil.basic(username, password),
+                                     Credentials.basic(username, password, StandardCharsets.UTF_8),
                                      appContext,
                                      true);
     }